Add DeploymentRegion as a cfn input parameter

Author: brianloyal

README.md

@@ -54,7 +54,7 @@ This repository includes the CloudFormation template, Jupyter Notebook, and supp
     | us-east-1 | [![Launch Stack](imgs/LaunchStack.jpg)](https://us-east-1.console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://5d1a4b76751b4c8a994ce96bafd91ec9-us-east-1.s3.amazonaws.com/main/batch-protein-folding-cfn-packaged.yaml) |
     | us-west-2 | [![Launch Stack](imgs/LaunchStack.jpg)](https://us-west-2.console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://5d1a4b76751b4c8a994ce96bafd91ec9-us-west-2.s3.amazonaws.com/main/batch-protein-folding-cfn-packaged.yaml) |
 
-2. For **Stack Name**, enter a value unique to your account and region. Leave the other parameters as their default values and select **Next**.  
+2. For **Stack Name**, enter a value unique to your account and region. Also update the *DeploymentRegion** parameter with the name of your current AWS region. Leave the other parameters as their default values and select **Next**.  
     ![Provide a stack name](imgs/name.png)  
 3. Select **I acknowledge that AWS CloudFormation might create IAM resources with custom names**.  
 4. Choose **Create stack**.  

infrastructure/cloudformation/batch-protein-folding-cfn-root.yaml

@@ -7,8 +7,13 @@ Description: >-
 
 Parameters:
   ApplicationName:
+    Description: Name for your application stack
     Type: String
     Default: BatchProteinFolding
+  DeploymentRegion:
+    Description: AWS region name for deployment. If deploying using the AWS console, this should match the region currently selected in the header menu.
+    Type: String
+    AllowedValues: ["ap-southeast-1", "eu-central-1", "eu-west-1", "eu-west-2", "us-east-1", "us-west-2"]
   LaunchSageMakerNotebook:
     Type: String
     Default: Y
@@ -66,6 +71,7 @@ Parameters:
     Description: Timestamp for the cfn deployment
     Type: Number
     Default: 9999999999
+  
 
 Conditions:
   CreateFileSystem:
@@ -184,7 +190,7 @@ Resources:
           Ref: DownloadFsxData
         S3BucketARN:
           "Fn::GetAtt": BatchFoldS3Bucket.Arn
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         Timestamp: !Ref Timestamp
 
   BatchEnvironment:
@@ -371,7 +377,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -390,7 +396,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -409,7 +415,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -428,7 +434,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -447,7 +453,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -466,7 +472,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -485,7 +491,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn:
@@ -504,7 +510,7 @@ Resources:
       Parameters:
         ApplicationName:
           Ref: ApplicationName
-        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${AWS::Region}"
+        CodeRepoS3BucketName: !Sub "${CodeRepoS3BucketRootName}-${DeploymentRegion}"
         CodeBuildEncryptionKey:
           "Fn::GetAtt": Container.Outputs.CodeBuildEncryptionKey
         CodeBuildRoleArn: