Format message for ECS Exec (#134)

https://ucsc-cgl.atlassian.net/browse/SEAB-4501
dockstore · Aug 9, 2022 · 189aa70 · 189aa70
2 parents 7e6e52c + 6b03c62
commit 189aa70
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/cloud-watch-to-slack-testing/deployment/index.js b/cloud-watch-to-slack-testing/deployment/index.js
@@ -57,7 +57,7 @@ function getInstanceNameAndSendMsgToSlack(
         var tagInstanceNameKey =
           instance && instance.Tags.find((tag) => "Name" === tag.Key);
         if (tagInstanceNameKey) {
-          var tagInstanceName = tagInstanceNameKey.Value || "unknown";
+          var tagInstanceName = tagInstanceNameKey.Value || null;
           return callback(
             slackChannel,
             messageText,
@@ -73,7 +73,7 @@ function getInstanceNameAndSendMsgToSlack(
     return callback(
       slackChannel,
       messageText,
-      "unknown",
+      null,
       targetInstanceId,
       processEventCallback
     );
@@ -88,8 +88,12 @@ function constructMsgAndSendToSlack(
   callback
 ) {
   console.info(`Found instance name:${targetInstanceName}`);
-  messageText =
-    messageText + ` to target: ${targetInstanceName} (${targetInstanceId})`;
+  if (targetInstanceName) {
+    messageText =
+      messageText + ` to target: ${targetInstanceName} (${targetInstanceId})`;
+  } else {
+    messageText = messageText + ` to target: ${targetInstanceId}`;
+  }
 
   sendMessageToSlack(slackChannel, messageText, callback);
 }
@@ -188,8 +192,18 @@ function ssmOrSigninMessageText(message) {
 
   let messageText = `uninitialized message text`;
   if (message.source === "aws.ssm") {
-    const userName = message.detail.userIdentity.userName;
-    messageText = `${userName} initiated AWS Systems Manager (SSM) event ${eventName}`;
+    let user;
+    if (message.detail.userIdentity.type === "IAMUser") {
+      user = message.detail.userIdentity.userName;
+    } else if (message.detail.userIdentity.type === "AssumedRole") {
+      const accountId = message.detail.userIdentity.accountId;
+      // Don't display account ID
+      user = message.detail.userIdentity.arn.replace(
+        accountId,
+        "X".repeat(accountId.length)
+      );
+    }
+    messageText = `${user} initiated AWS Systems Manager (SSM) event ${eventName}`;
   } else if (message.source === "aws.signin") {
     const userType = message.detail.userIdentity.type;
     messageText = `A user initiated AWS sign-in event ${eventName} as ${userType}`;