Merge pull request #35 from holt-calder/main

Modifying s3 bucket for regional buckets in aws-quickstart
aws-quickstart · Feb 25, 2021 · 4ca95b3 · 4ca95b3
2 parents 57a4cd8 + bf2881d
commit 4ca95b3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/templates/sagemaker-for-tableau-workload.template b/templates/sagemaker-for-tableau-workload.template
@@ -107,6 +107,7 @@ Conditions:
   LaunchToVpc: !Equals
     - !Ref LaunchToVpc
     - 'Yes'
+  UsingDefaultBucket: !Equals [!Ref QSS3BucketName, 'aws-quickstart']
 
 Resources:
   VPCEndpoint:
@@ -183,7 +184,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri:
-        Bucket: !Ref QSS3BucketName
+        Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
         Key: !Sub "${QSS3KeyPrefix}scripts/Info/Info.zip"
       Handler: lambda_function.lambda_handler
       Events:
@@ -202,7 +203,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri:
-        Bucket: !Ref QSS3BucketName
+        Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
         Key: !Sub "${QSS3KeyPrefix}scripts/Evaluate/Evaluate.zip"
       Handler: lambda_function.lambda_handler
       Policies:
@@ -319,7 +320,7 @@ Resources:
       Type: AWS::Serverless::Function
       Properties:
         CodeUri:
-          Bucket: !Ref QSS3BucketName
+          Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
           Key: !Sub "${QSS3KeyPrefix}scripts/Authorizer/Authorizer.zip"
 
         Handler: lambda_function.lambda_handler