[slurmdbd] Use region and account id in bucket name

The hash doesn't work because it is generated before the CloudFormation template is deployed.

Signed-off-by: Hanwen <hanwenli@amazon.com>

Author: hanwen-cluster

cloudformation/external-slurmdbd/external-slurmdbd.json

@@ -229,7 +229,14 @@
        {
         "Ref": "AWS::StackName"
        },
-       "-cf55004ab3dc0560"
+       "-",
+       {
+        "Ref": "AWS::AccountId"
+       },
+       "-",
+       {
+        "Ref": "AWS::Region"
+       }
       ]
      ]
     },
@@ -506,7 +513,15 @@
            {
             "Ref": "AWS::StackName"
            },
-           "-cf55004ab3dc0560\", \"cluster\": {\"region\": \"",
+           "-",
+           {
+            "Ref": "AWS::AccountId"
+           },
+           "-",
+           {
+            "Ref": "AWS::Region"
+           },
+           "\", \"cluster\": {\"region\": \"",
            {
             "Ref": "AWS::Region"
            },
@@ -599,7 +614,14 @@
       {
        "Ref": "AWS::StackName"
       },
-      "-cf55004ab3dc0560"
+      "-",
+      {
+       "Ref": "AWS::AccountId"
+      },
+      "-",
+      {
+       "Ref": "AWS::Region"
+      }
      ]
     ]
    }

cloudformation/external-slurmdbd/external_slurmdbd/external_slurmdbd_stack.py

@@ -1,4 +1,3 @@
-import hashlib
 import json
 
 import pkg_resources
@@ -420,7 +419,7 @@ def _add_s3_bucket(self):
         return s3.CfnBucket(
             self,
             id="ExternalSlurmdbdS3Bucket",
-            bucket_name=Aws.STACK_NAME + "-" + hashlib.sha256((self.account + self.region).encode()).hexdigest()[0:16],
+            bucket_name=Aws.STACK_NAME + "-" + Aws.ACCOUNT_ID + "-" + Aws.REGION,
             public_access_block_configuration=s3.CfnBucket.PublicAccessBlockConfigurationProperty(
                 block_public_acls=True,
                 block_public_policy=True,