fix S3 HTTP URL pattern

aws-samples · Oct 25, 2020 · b5471f9 · b5471f9
1 parent fe8e1b4
commit b5471f9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/templates/gwfcore/gwfcore-root.template.yaml b/src/templates/gwfcore/gwfcore-root.template.yaml
@@ -114,7 +114,7 @@ Parameters:
     Default: https://aws-genomics-workflows.s3.amazonaws.com/templates  # dist: pin_version
     ConstraintDescription: >-
       Must be a valid S3 HTTP URL
-    AllowedPattern: "https://[a-z0-9-./]{0,}s3(-[a-z0-9]+)*\\.amazonaws\\.com/[a-z0-9-./]{3,}"
+    AllowedPattern: "https://[a-z0-9-./]{0,}s3([a-z0-9-.]+)*\\.amazonaws\\.com/[a-z0-9-./]{3,}"
 
 Conditions:
   NoNamespace: !Equals [ !Ref Namespace, "" ]

diff --git a/src/templates/nextflow/nextflow-resources.template.yaml b/src/templates/nextflow/nextflow-resources.template.yaml
@@ -91,7 +91,7 @@ Parameters:
     Default: https://aws-genomics-workflows.s3.amazonaws.com/templates  # dist: pin_version
     ConstraintDescription: >-
       Must be a valid S3 HTTP URL
-    AllowedPattern: "https://[a-z0-9-./]{0,}s3(-[a-z0-9]+)*\\.amazonaws\\.com/[a-z0-9-./]{3,}"
+    AllowedPattern: "https://[a-z0-9-./]{0,}s3([a-z0-9-.]+)*\\.amazonaws\\.com/[a-z0-9-./]{3,}"
 
 Conditions:
   UseLatestNextflowVersion:

diff --git a/src/templates/step-functions/sfn-resources.template.yaml b/src/templates/step-functions/sfn-resources.template.yaml
@@ -45,7 +45,7 @@ Parameters:
     Default: https://aws-genomics-workflows.s3.amazonaws.com/templates  # dist: pin_version
     ConstraintDescription: >-
       Must be a valid S3 HTTP URL
-    AllowedPattern: "https://[a-z0-9-./]{0,}s3(-[a-z0-9]+)*\\.amazonaws\\.com/[a-z0-9-./]{3,}"
+    AllowedPattern: "https://[a-z0-9-./]{0,}s3([a-z0-9-.]+)*\\.amazonaws\\.com/[a-z0-9-./]{3,}"
 
 Conditions:
   NoNamespace: !Equals [ !Ref Namespace, "" ]