Fix bucket naming

Author: chrisqm-dev

formatting-test-template-updated.yaml

@@ -13,7 +13,7 @@ Resources:
   TestBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: !Sub "${BucketPrefix}-${Environment}-${AWS::AccountId}"
+      BucketName: !Sub "${BucketPrefix}-${Environment}-${AWS::StackName}"
       VersioningConfiguration:
         Status: Enabled
       Tags:
@@ -36,7 +36,7 @@ Resources:
   TestRole:
     Type: AWS::IAM::Role
     Properties:
-      RoleName: !Sub "formatting-test-role-${Environment}-${AWS::StackName}"
+      RoleName: !Sub "formatting-test-role-${Environment}-${AWS::StackName}-${AWS::AccountId}"
       AssumeRolePolicyDocument:
         Version: '2012-10-17'
         Statement:

formatting-test-template.yaml

@@ -13,7 +13,7 @@ Resources:
   TestBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: !Sub "${BucketPrefix}-${Environment}-${AWS::AccountId}"
+      BucketName: !Sub "${BucketPrefix}-${Environment}-${AWS::StackName}"
       Tags:
         - Key: Environment
           Value: !Ref Environment
@@ -30,7 +30,7 @@ Resources:
   TestRole:
     Type: AWS::IAM::Role
     Properties:
-      RoleName: !Sub "formatting-test-role-${Environment}-${AWS::StackName}"
+      RoleName: !Sub "formatting-test-role-${Environment}-${AWS::StackName}-${AWS::AccountId}"
       AssumeRolePolicyDocument:
         Version: '2012-10-17'
         Statement:

markdown-test-template.yaml

@@ -10,7 +10,7 @@ Resources:
   MarkdownTestBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: !Sub "markdown-test-${Environment}-${AWS::AccountId}"
+      BucketName: !Sub "markdown-test-${Environment}-${AWS::StackName}"
       PublicAccessBlockConfiguration:
         BlockPublicAcls: true
         BlockPublicPolicy: true

simple-stack.yaml

@@ -10,7 +10,7 @@ Resources:
   SimpleTestBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: !Sub "simple-test-${Environment}-${AWS::AccountId}-${AWS::StackName}"
+      BucketName: !Sub "simple-test-${Environment}-${AWS::StackName}"
 
   SimpleTestParameter:
     Type: AWS::SSM::Parameter

stack.yaml

@@ -14,4 +14,4 @@ Resources:
   TestBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: !Sub 'cfn-action-test-${AWS::StackName}-${AWS::AccountId}'
+      BucketName: !Sub 'cfn-action-test-${AWS::StackName}'