Merge pull request #9 from illusional/patch-1

Add prompt for S3 bucket naming conventions to CloudFormation template

Author: wleepang

src/templates/aws-genomics-root-novpc.template.yaml

@@ -55,8 +55,13 @@ Parameters:
     Type: List<AWS::EC2::Subnet::Id>
     Description: 'Subnets you want your batch compute environment to launch in. We recommend private subnets. NOTE: Must be from the VPC provided.'
   S3BucketName:
-    Description: A S3 bucket name for storing analysis results
+    Description: >-
+      A S3 bucket name for storing analysis results.
+      The bucket name must respect the S3 bucket naming conventions 
+      (can contain lowercase letters, numbers, periods and hyphens).
     Type: String
+    AllowedPattern: "(?=^.{3,63}$)(?!^(\\d+\\.)+\\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])$)"
+    ConstraintDescription: "Must respect AWS naming conventions"
   ExistingBucket:
     Description: Does this bucket already exist?
     Type: String

src/templates/aws-genomics-s3.template.yaml

@@ -16,6 +16,13 @@ Mappings:
 Parameters:
   S3BucketName:
     Type: String
+    Description: >-
+      A S3 bucket name for storing analysis results.
+      The bucket name must respect the S3 bucket naming conventions 
+      (can contain lowercase letters, numbers, periods and hyphens).
+    Type: String
+    AllowedPattern: "(?=^.{3,63}$)(?!^(\\d+\\.)+\\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])$)"
+    ConstraintDescription: "Must respect AWS naming conventions"
   ExistingBucket:
     Type: String
     Description: Does this bucket already exist? If not, it will be created.

src/templates/cromwell/cromwell-aio.template.yaml

@@ -66,8 +66,13 @@ Parameters:
     Description: "Choose the two Availability Zones to deploy instances for AWS Batch."
     Type: List<AWS::EC2::AvailabilityZone::Name>
   S3BucketName:
-    Description: A S3 bucket name for storing analysis results
+    Description: >-
+      A S3 bucket name for storing analysis results. 
+      The bucket name must respect the S3 bucket naming conventions 
+      (can contain lowercase letters, numbers, periods and hyphens).
     Type: String
+    AllowedPattern: "(?=^.{3,63}$)(?!^(\\d+\\.)+\\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])$)"
+    ConstraintDescription: "Must respect S3 bucket naming conventions"
   ExistingBucket:
     Description: Does this bucket already exist?
     Type: String
@@ -218,4 +223,4 @@ Outputs:
     Value: !GetAtt 'GenomicsWorkflowStack.Outputs.GenomicsEnvHighPriorityJobQueueArn'
     Description: >-
       AWS Batch job queue for high priority workflow jobs, based on EC2 On-Demand
-      instances
+      instances