@@ -57,7 +57,7 @@ function getInstanceNameAndSendMsgToSlack(
57
57
var tagInstanceNameKey =
58
58
instance && instance . Tags . find ( ( tag ) => "Name" === tag . Key ) ;
59
59
if ( tagInstanceNameKey ) {
60
- var tagInstanceName = tagInstanceNameKey . Value || "unknown" ;
60
+ var tagInstanceName = tagInstanceNameKey . Value || null ;
61
61
return callback (
62
62
slackChannel ,
63
63
messageText ,
@@ -73,7 +73,7 @@ function getInstanceNameAndSendMsgToSlack(
73
73
return callback (
74
74
slackChannel ,
75
75
messageText ,
76
- "unknown" ,
76
+ null ,
77
77
targetInstanceId ,
78
78
processEventCallback
79
79
) ;
@@ -88,8 +88,12 @@ function constructMsgAndSendToSlack(
88
88
callback
89
89
) {
90
90
console . info ( `Found instance name:${ targetInstanceName } ` ) ;
91
- messageText =
92
- messageText + ` to target: ${ targetInstanceName } (${ targetInstanceId } )` ;
91
+ if ( targetInstanceName ) {
92
+ messageText =
93
+ messageText + ` to target: ${ targetInstanceName } (${ targetInstanceId } )` ;
94
+ } else {
95
+ messageText = messageText + ` to target: ${ targetInstanceId } ` ;
96
+ }
93
97
94
98
sendMessageToSlack ( slackChannel , messageText , callback ) ;
95
99
}
@@ -188,8 +192,18 @@ function ssmOrSigninMessageText(message) {
188
192
189
193
let messageText = `uninitialized message text` ;
190
194
if ( message . source === "aws.ssm" ) {
191
- const userName = message . detail . userIdentity . userName ;
192
- messageText = `${ userName } initiated AWS Systems Manager (SSM) event ${ eventName } ` ;
195
+ let user ;
196
+ if ( message . detail . userIdentity . type === "IAMUser" ) {
197
+ user = message . detail . userIdentity . userName ;
198
+ } else if ( message . detail . userIdentity . type === "AssumedRole" ) {
199
+ const accountId = message . detail . userIdentity . accountId ;
200
+ // Don't display account ID
201
+ user = message . detail . userIdentity . arn . replace (
202
+ accountId ,
203
+ "X" . repeat ( accountId . length )
204
+ ) ;
205
+ }
206
+ messageText = `${ user } initiated AWS Systems Manager (SSM) event ${ eventName } ` ;
193
207
} else if ( message . source === "aws.signin" ) {
194
208
const userType = message . detail . userIdentity . type ;
195
209
messageText = `A user initiated AWS sign-in event ${ eventName } as ${ userType } ` ;
0 commit comments