From b5471f9fdb5f6ccbb5fe9e43c8af9e133c5c3dce Mon Sep 17 00:00:00 2001 From: "W. Lee Pang" Date: Sun, 25 Oct 2020 15:37:08 -0700 Subject: [PATCH] fix S3 HTTP URL pattern --- src/templates/gwfcore/gwfcore-root.template.yaml | 2 +- src/templates/nextflow/nextflow-resources.template.yaml | 2 +- src/templates/step-functions/sfn-resources.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/templates/gwfcore/gwfcore-root.template.yaml b/src/templates/gwfcore/gwfcore-root.template.yaml index 30e852057..08973d76f 100644 --- 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 index acc4d150d..6037a015e 100644 --- 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 index cd8cd78b3..06714e1d2 100644 --- 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, "" ]