fix(codepipeline): allow providing Tokens as the physical name of the…

… Pipeline. (#1800) Fixes #1788
aws · Feb 20, 2019 · f6aea1b · f6aea1b
1 parent 5dec01a
commit f6aea1b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/packages/@aws-cdk/aws-codepipeline-api/lib/validation.ts b/packages/@aws-cdk/aws-codepipeline-api/lib/validation.ts
@@ -1,3 +1,4 @@
+import cdk = require('@aws-cdk/cdk');
 import { ActionCategory } from "./action";
 import { Artifact } from "./artifact";
 
@@ -44,6 +45,11 @@ const VALID_IDENTIFIER_REGEX = /^[a-zA-Z0-9.@_-]{1,100}$/;
  * This can be used to validate the name of all components of a pipeline.
  */
 export function validateName(thing: string, name: string | undefined) {
+  // name could be a Token - in that case, skip validation altogether
+  if (cdk.unresolved(name)) {
+    return;
+  }
+
   if (name !== undefined && !VALID_IDENTIFIER_REGEX.test(name)) {
     throw new Error(`${thing} name must match regular expression: ${VALID_IDENTIFIER_REGEX.toString()}, got '${name}'`);
   }

diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts b/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts
@@ -50,6 +50,22 @@ export = {
     test.done();
   },
 
+  'Tokens can be used as physical names of the Pipeline'(test: Test) {
+    const stack = new cdk.Stack(undefined, 'StackName');
+
+    new codepipeline.Pipeline(stack, 'Pipeline', {
+      pipelineName: stack.stackName,
+    });
+
+    expect(stack, true).to(haveResourceLike('AWS::CodePipeline::Pipeline', {
+      "Name": {
+        "Ref": "AWS::StackName",
+      },
+    }));
+
+    test.done();
+  },
+
   'github action uses ThirdParty owner'(test: Test) {
     const stack = new cdk.Stack();