From 501ece970679783dafbdd3277d43a2aa06fec946 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@gameonsports.com.au>
Date: Thu, 13 Jun 2019 17:27:26 +1000
Subject: [PATCH] feat(aws-codepipeline-actions): Add CAPABILITY_AUTO_EXPAND
 (#2851)

Properly handle CloudFormationCapabilities.None
---
 .../lib/cloudformation/pipeline-actions.ts    |  3 +-
 .../test.cloudformation-pipeline-actions.ts   | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts
index a6dd58ef7d1a2..ec6080a93ad89 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts
+++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts
@@ -545,7 +545,8 @@ function parseCapabilities(capabilities: any): any {
   if (capabilities === undefined) {
     return undefined;
   } else if (capabilities.length === 1) {
-    return capabilities.toString();
+    const capability = capabilities.toString();
+    return (capability === '') ? undefined : capability;
   } else if (capabilities.length > 1) {
     return capabilities.join(',');
   }
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts
index 7c0e00e77aa68..da392b2761c6a 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts
+++ b/packages/@aws-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts
@@ -504,6 +504,48 @@ export = {
 
   test.done();
   },
+
+  'Empty capabilities is not passed to template'(test: Test) {
+  // GIVEN
+  const stack = new TestFixture();
+
+  // WHEN
+  stack.deployStage.addAction(new cpactions.CloudFormationCreateUpdateStackAction({
+    actionName: 'CreateUpdate',
+    stackName: 'MyStack',
+    templatePath: stack.sourceOutput.atPath('template.yaml'),
+    adminPermissions: false,
+    capabilities: [
+      CloudFormationCapabilities.None
+    ]
+  }));
+
+  const roleId = "PipelineDeployCreateUpdateRole515CB7D4";
+
+  // THEN: Action in Pipeline has no capabilities
+  expect(stack).to(haveResourceLike('AWS::CodePipeline::Pipeline', {
+    "Stages": [
+    { "Name": "Source" /* don't care about the rest */ },
+    {
+      "Name": "Deploy",
+      "Actions": [
+      {
+        "Configuration": {
+        "RoleArn": { "Fn::GetAtt": [ roleId, "Arn" ] },
+        "ActionMode": "CREATE_UPDATE",
+        "StackName": "MyStack",
+        "TemplatePath": "SourceArtifact::template.yaml"
+        },
+        "InputArtifacts": [{"Name": "SourceArtifact"}],
+        "Name": "CreateUpdate",
+      },
+      ],
+    }
+    ]
+  }));
+
+  test.done();
+  },
 };
 
 /**