fix(app-delivery): could not use PipelineDeployStackAction more than …

…once in a Stage (#8217)

The PipelineDeployStackAction class hard-coded the names of the CloudFormation
actions it created for preparing and executing the ChangeSet.
Which meant this composite action could never be used more than once in the same stage
(as that would result in errors saying the action names were duplicated).
Allow overriding the names of the actions to make it possible to be used
more than once in the same CodePipeline stage.

Fixes #3984
Fixes #8183

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts

@@ -32,13 +32,27 @@ export interface PipelineDeployStackActionProps {
    */
   readonly createChangeSetRunOrder?: number;
 
+  /**
+   * The name of the CodePipeline action creating the ChangeSet.
+   *
+   * @default 'ChangeSet'
+   */
+  readonly createChangeSetActionName?: string;
+
   /**
    * The runOrder for the CodePipeline action executing the ChangeSet.
    *
    * @default ``createChangeSetRunOrder + 1``
    */
   readonly executeChangeSetRunOrder?: number;
 
+  /**
+   * The name of the CodePipeline action creating the ChangeSet.
+   *
+   * @default 'Execute'
+   */
+  readonly executeChangeSetActionName?: string;
+
   /**
    * IAM role to assume when deploying changes.
    *
@@ -116,7 +130,7 @@ export class PipelineDeployStackAction implements codepipeline.IAction {
     const changeSetName = props.changeSetName || 'CDK-CodePipeline-ChangeSet';
     const capabilities = cfnCapabilities(props.adminPermissions, props.capabilities);
     this.prepareChangeSetAction = new cpactions.CloudFormationCreateReplaceChangeSetAction({
-      actionName: 'ChangeSet',
+      actionName: props.createChangeSetActionName ?? 'ChangeSet',
       changeSetName,
       runOrder: createChangeSetRunOrder,
       stackName: props.stack.stackName,
@@ -126,7 +140,7 @@ export class PipelineDeployStackAction implements codepipeline.IAction {
       capabilities,
     });
     this.executeChangeSetAction = new cpactions.CloudFormationExecuteChangeSetAction({
-      actionName: 'Execute',
+      actionName: props.executeChangeSetActionName ?? 'Execute',
       changeSetName,
       runOrder: executeChangeSetRunOrder,
       stackName: this.stack.stackName,

packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts

@@ -1,4 +1,4 @@
-import { expect, haveResource, isSuperObject } from '@aws-cdk/assert';
+import { expect, haveResource, haveResourceLike, isSuperObject } from '@aws-cdk/assert';
 import * as cfn from '@aws-cdk/aws-cloudformation';
 import * as codebuild from '@aws-cdk/aws-codebuild';
 import * as codepipeline from '@aws-cdk/aws-codepipeline';
@@ -406,6 +406,43 @@ export = nodeunit.testCase({
     );
     test.done();
   },
+
+  'allows overriding the ChangeSet and Execute action names'(test: nodeunit.Test) {
+    const stack = getTestStack();
+    const selfUpdatingPipeline = createSelfUpdatingStack(stack);
+    selfUpdatingPipeline.pipeline.addStage({
+      stageName: 'Deploy',
+      actions: [
+        new PipelineDeployStackAction({
+          input: selfUpdatingPipeline.synthesizedApp,
+          adminPermissions: true,
+          stack,
+          createChangeSetActionName: 'Prepare',
+          executeChangeSetActionName: 'Deploy',
+        }),
+      ],
+    });
+
+    expect(stack).to(haveResourceLike('AWS::CodePipeline::Pipeline', {
+      Stages: [
+        {},
+        {},
+        {
+          Name: 'Deploy',
+          Actions: [
+            {
+              Name: 'Prepare',
+            },
+            {
+              Name: 'Deploy',
+            },
+          ],
+        },
+      ],
+    }));
+
+    test.done();
+  },
 });
 
 class FakeAction implements codepipeline.IAction {