feat(pipelines): revised version of the API

packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts

@@ -479,7 +479,7 @@ export class Pipeline extends PipelineBase {
   }
 
   /** @internal */
-  public _attachActionToPipeline(stage: Stage, action: IAction, actionScope: CoreConstruct): FullActionDescriptor {
+  public _attachActionToPipeline(stage: Stage, action: IAction, actionScope: Construct): FullActionDescriptor {
     const richAction = new RichAction(action, this);
 
     // handle cross-region actions here
@@ -491,8 +491,8 @@ export class Pipeline extends PipelineBase {
     // // CodePipeline Variables
     validateNamespaceName(richAction.actionProperties.variablesNamespace);
 
-    // bind the Action
-    const actionConfig = richAction.bind(actionScope, stage, {
+    // bind the Action (type h4x)
+    const actionConfig = richAction.bind(actionScope as CoreConstruct, stage, {
       role: actionRole ? actionRole : this.role,
       bucket: crossRegionInfo.artifactBucket,
     });

packages/@aws-cdk/aws-codepipeline/lib/private/stage.ts

@@ -1,5 +1,6 @@
 import * as events from '@aws-cdk/aws-events';
 import * as cdk from '@aws-cdk/core';
+import { Construct, Node } from 'constructs';
 import { IAction, IPipeline, IStage } from '../action';
 import { Artifact } from '../artifact';
 import { CfnPipeline } from '../codepipeline.generated';
@@ -137,7 +138,15 @@ export class Stage implements IStage {
 
   private attachActionToPipeline(action: IAction): FullActionDescriptor {
     // notify the Pipeline of the new Action
-    const actionScope = new cdk.Construct(this.scope, action.actionProperties.actionName);
+    //
+    // It may be that a construct already exists with the given action name (CDK Pipelines
+    // may do this to maintain construct tree compatibility between versions).
+    //
+    // If so, we simply reuse it.
+    let actionScope = Node.of(this.scope).tryFindChild(action.actionProperties.actionName) as Construct | undefined;
+    if (!actionScope) {
+      actionScope = new cdk.Construct(this.scope, action.actionProperties.actionName);
+    }
     return this._pipeline._attachActionToPipeline(this, action, actionScope);
   }
 

packages/@aws-cdk/pipelines/lib/blueprint/asset-type.ts

@@ -0,0 +1,15 @@
+/**
+ * Type of the asset that is being published
+ */
+export enum AssetType {
+  /**
+   * A file
+   */
+  FILE = 'file',
+
+  /**
+   * A Docker image
+   */
+  DOCKER_IMAGE = 'docker-image',
+}
+

packages/@aws-cdk/pipelines/lib/blueprint/blueprint.ts

@@ -0,0 +1,93 @@
+import * as cdk from '@aws-cdk/core';
+import { Step } from './step';
+import { AddStageOpts, Wave } from './wave';
+
+/**
+ * Construction properties for a `Blueprint`.
+ */
+export interface BlueprintProps {
+  /**
+   * The build step that produces the CDK Cloud Assembly
+   *
+   * The primary output of this step needs to be the `cdk.out` directory
+   * generated by the `cdk synth` command.
+   *
+   * If you use `SynthStep`, the output directory will automatically be
+   * configured correctly; if you use a different kind of `Step`, you
+   * may need to configure it explicitly.
+   */
+  readonly synthStep: Step;
+}
+
+/**
+ * A description of a set of application deployments
+ *
+ * You don't need to create an instance of `Blueprint` yourself;
+ * one will be automatically created for you when you instantiate
+ * a `Pipeline`.
+ */
+export class Blueprint {
+  /**
+   * The build step that produces the CDK Cloud Assembly
+   */
+  public readonly synthStep: Step;
+
+  /**
+   * The waves in this pipeline
+   */
+  public readonly waves: Wave[];
+
+  constructor(props: BlueprintProps) {
+    this.synthStep = props.synthStep;
+    this.waves = [];
+  }
+
+  /**
+   * Add a Wave to the pipeline, for deploying multiple Stages in parallel
+   *
+   * Use the return object of this method to deploy multiple stages in parallel.
+   *
+   * Example:
+   *
+   * ```ts
+   * const wave = pipeline.addWave('MyWave');
+   * wave.addStage(new MyStage('Stage1', ...));
+   * wave.addStage(new MyStage('Stage2', ...));
+   * ```
+   */
+  public addWave(id: string, options: AddWaveOptions = {}) {
+    const wave = new Wave(id, options);
+    this.waves.push(wave);
+    return wave;
+  }
+
+  /**
+   * Deploy a single Stage by itself
+   *
+   * Add a Stage to the pipeline, to be deployed in sequence with other
+   * Stages added to the pipeline. All Stacks in the stage will be deployed
+   * in an order automatically determined by their relative dependencies.
+   */
+  public addStage(stage: cdk.Stage, options: AddStageOpts = {}) {
+    return this.addWave(stage.stageName).addStage(stage, options);
+  }
+}
+
+/**
+ * Options to pass to `addWave`
+ */
+export interface AddWaveOptions {
+  /**
+   * Additional steps to run before any of the stages in the wave
+   *
+   * @default - No additional steps
+   */
+  readonly pre?: Step[];
+
+  /**
+   * Additional steps to run after all of the stages in the wave
+   *
+   * @default - No additional steps
+   */
+  readonly post?: Step[];
+}

packages/@aws-cdk/pipelines/lib/blueprint/file-set.ts

@@ -0,0 +1,66 @@
+import { Step } from './step';
+
+/**
+ * A set of files traveling through the deployment pipeline
+ *
+ * Individual steps in the pipeline produce or consume
+ * `FileSet`s.
+ */
+export class FileSet implements IFileSetProducer {
+  /**
+   * The primary output of a file set producer
+   *
+   * The primary output of a FileSet is itself.
+   */
+  public readonly primaryOutput?: FileSet = this;
+  private _producer?: Step;
+
+  constructor(
+    /** Identifier for this file set */
+    public readonly id: string, producer?: Step) {
+    this._producer = producer;
+  }
+
+  /**
+   * The Step that produces this FileSet
+   */
+  public get producer() {
+    if (!this._producer) {
+      throw new Error(`FileSet '${this.id}' doesn\'t have a producer; call 'fileSet.producedBy()'`);
+    }
+    return this._producer;
+  }
+
+  /**
+   * Mark the given Step as the producer for this FileSet
+   *
+   * This method can only be called once.
+   */
+  public producedBy(producer?: Step) {
+    if (this._producer) {
+      throw new Error(`FileSet '${this.id}' already has a producer (${this._producer}) while setting producer: ${producer}`);
+    }
+    this._producer = producer;
+  }
+
+  /**
+   * Return a string representation of this FileSet
+   */
+  public toString() {
+    return `FileSet(${this.id})`;
+  }
+}
+
+/**
+ * Any class that produces, or is itself, a `FileSet`
+ *
+ * Steps implicitly produce a primary FileSet as an output.
+ */
+export interface IFileSetProducer {
+  /**
+   * The `FileSet` produced by this file set producer
+   *
+   * @default - This producer doesn't produce any file set
+   */
+  readonly primaryOutput?: FileSet;
+}

packages/@aws-cdk/pipelines/lib/blueprint/index.ts

@@ -0,0 +1,11 @@
+export * from './asset-type';
+export * from './blueprint';
+export * from '../helpers-internal/blueprint-queries';
+export * from './file-set';
+export * from './script-step';
+export * from './stack-deployment';
+export * from './stage-deployment';
+export * from './step';
+export * from './synth-step';
+export * from './wave';
+export * from './manual-approval';

packages/@aws-cdk/pipelines/lib/blueprint/manual-approval.ts

@@ -0,0 +1,40 @@
+import { FileSet } from './file-set';
+import { Step } from './step';
+
+/**
+ * Construction properties for a `ManualApprovalStep`
+ */
+export interface ManualApprovalStepProps {
+  /**
+   * The comment to display with this manual approval
+   *
+   * @default - No comment
+   */
+  readonly comment?: string;
+}
+
+/**
+ * A manual approval step
+ *
+ * If this step is added to a Pipeline, the Pipeline will
+ * be paused waiting for a human to resume it
+ *
+ * Only engines that support pausing the deployment will
+ * support this step type.
+ */
+export class ManualApprovalStep extends Step {
+  public readonly primaryOutput?: FileSet | undefined;
+
+  /**
+   * The comment associated with this manual approval
+   *
+   * @default - No comment
+   */
+  public readonly comment?: string;
+
+  constructor(id: string, props: ManualApprovalStepProps = {}) {
+    super(id);
+
+    this.comment = props.comment;
+  }
+}