unique username

elastic · Apr 8, 2024 · a8a292c · a8a292c
1 parent b4e63c8
commit a8a292c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/deploy/cloudformation/elastic-agent-direct-access-key-cspm-organization.yml b/deploy/cloudformation/elastic-agent-direct-access-key-cspm-organization.yml
@@ -35,7 +35,7 @@ Resources:
     Properties:
       UserName: !Join
         - '-'
-        - - "elasticagent-user-cspm"
+        - - 'elasticagent-user-cspm'
           - !Select
             - 2
             - !Split

diff --git a/deploy/cloudformation/elastic-agent-direct-access-key-cspm.yml b/deploy/cloudformation/elastic-agent-direct-access-key-cspm.yml
@@ -1,5 +1,4 @@
 AWSTemplateFormatVersion: "2010-09-09"
-
 Description: Creates elastic-agent cspm user, role, and access key, and outputs the access key
 
 Parameters: {}
@@ -8,7 +7,14 @@ Resources:
   ElasticCSPMUser:
     Type: "AWS::IAM::User"
     Properties:
-      UserName: "elasticagent-cspm"
+      UserName: !Join
+        - '-'
+        - - 'elasticagent-user-cspm'
+          - !Select
+            - 2
+            - !Split
+              - /
+              - !Ref AWS::StackId
       ManagedPolicyArns:
         - 'arn:aws:iam::aws:policy/SecurityAudit'