@flit/cdk-pipeline 1.2.3 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flit/cdk-pipeline",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "A highly customizable and extensible CI/CD pipeline intended as alternative to CDK's native CodePipeline",
   "keywords": [
     "aws",

package/src/code-commit-source-segment.ts

@@ -27,16 +27,12 @@ export class CodeCommitSourceSegment extends SourceSegment {
     this.props = props;
   }
   construct(scope: Pipeline): SegmentConstructed {
-    const name = `${this.props.repository}/${this.props.branch || "master"}`;
+    const name = `${this.props.repository}-${this.props.branch || "master"}`;
 
-    return new CodeCommitSourceSegmentConstructed(
-      scope,
-      name.replace("/", "-"),
-      {
-        ...this.props,
-        actionName: name,
-      },
-    );
+    return new CodeCommitSourceSegmentConstructed(scope, name, {
+      ...this.props,
+      actionName: name,
+    });
   }
 }
 

package/src/code-star-source-segment.ts

@@ -9,7 +9,7 @@ import { SourceSegment, SourceSegmentProps } from "./source-segment";
 export interface CodeStarSourceSegmentProps extends SourceSegmentProps {
   /**
    * The owning user or organization of the repository.
-   * @example `"aws"`
+   * @example "aws"
    */
   readonly owner: string;
   /**
@@ -21,12 +21,12 @@ export interface CodeStarSourceSegmentProps extends SourceSegmentProps {
   readonly connectionArn: string;
   /**
    * The name of the repository.
-   * @example `"aws-cdk"`
+   * @example "aws-cdk"
    */
   readonly repository: string;
   /**
    * The branch to build.
-   * @default `"master"`
+   * @default "master"
    */
   readonly branch?: string;
   readonly triggerOnPush?: boolean;
@@ -43,11 +43,11 @@ export class CodeStarSourceSegment extends SourceSegment {
     this.props = props;
   }
   construct(scope: Pipeline): SegmentConstructed {
-    const name = `${this.props.owner}/${this.props.repository}/${
+    const name = `${this.props.owner}-${this.props.repository}-${
       this.props.branch || "master"
     }`;
 
-    return new CodeStarSourceSegmentConstructed(scope, name.replace("/", "-"), {
+    return new CodeStarSourceSegmentConstructed(scope, name, {
       ...this.props,
       actionName: name,
       repo: this.props.repository,

package/src/git-hub-source-segment.ts

@@ -14,17 +14,17 @@ export interface GitHubSourceSegmentProps extends SourceSegmentProps {
   readonly oauthToken: SecretValue;
   /**
    * The owning user or organization of the repository.
-   * @example `"aws"`
+   * @example "aws"
    */
   readonly owner: string;
   /**
    * The name of the repository.
-   * @example `"aws-cdk"`
+   * @example "aws-cdk"
    */
   readonly repository: string;
   /**
    * The branch to build.
-   * @default `"master"`
+   * @default "master"
    */
   readonly branch?: string;
   readonly trigger?: GitHubTrigger;
@@ -41,11 +41,11 @@ export class GitHubSourceSegment extends SourceSegment {
     this.props = props;
   }
   construct(scope: Pipeline): SegmentConstructed {
-    const name = `${this.props.owner}/${this.props.repository}/${
+    const name = `${this.props.owner}-${this.props.repository}-${
       this.props.branch || "master"
     }`;
 
-    return new GitHubSourceSegmentConstructed(scope, name.replace("/", "-"), {
+    return new GitHubSourceSegmentConstructed(scope, name, {
       ...this.props,
       actionName: name,
       repo: this.props.repository,

package/src/pipeline.ts

@@ -20,7 +20,7 @@ export interface PipelineProps extends StackProps {
   /**
    * The path to the cdk projects root directory containing the cdk.json file
    * relative to the asset root
-   * @default `"."`
+   * @default "."
    */
   readonly rootDir?: string;
   /**

package/src/s3-source-segment.ts

@@ -29,9 +29,9 @@ export class S3SourceSegment extends SourceSegment {
     this.props = props;
   }
   construct(scope: Pipeline): SegmentConstructed {
-    const name = `${this.props.bucket}/${this.props.bucketKey}`;
+    const name = `${this.props.bucket}-${this.props.bucketKey}`;
 
-    return new S3SourceSegmentConstructed(scope, name.replace("/", "-"), {
+    return new S3SourceSegmentConstructed(scope, name, {
       ...this.props,
       actionName: name,
     });

package/src/stack-segment.ts

@@ -48,18 +48,22 @@ export interface StackSegmentProps {
    * @default The name of the given stack.
    */
   readonly stackName?: string;
+  /**
+   * The artifact to hold the output of the build if this stack includes a build.
+   */
+  readonly buildOutput?: Artifact;
   /**
    * The artifact to hold the stack deployment output file.
    */
-  readonly output?: Artifact;
+  readonly stackOutput?: Artifact;
   /**
    * The filename for the file in the output artifact
-   * @default `"artifact.json"`
+   * @default "artifact.json"
    */
   readonly outputFileName?: string;
   /**
    * Does this stage require manual approval of the change set?
-   * @default `false`
+   * @default false
    */
   readonly manualApproval?: Boolean;
 }
@@ -71,7 +75,10 @@ export class StackSegment extends Segment {
   readonly props: StackSegmentProps;
 
   constructor(props: StackSegmentProps) {
-    super(props);
+    super({
+      ...props,
+      output: [props.buildOutput, props.stackOutput].filter((a) => !!a),
+    });
     this.props = props;
   }
 
@@ -95,7 +102,8 @@ export interface StackSegmentConstructedProps {
   readonly stackName?: string;
   readonly input: Artifact;
   readonly extraInputs?: Artifact[];
-  readonly output?: Artifact;
+  readonly buildOutput?: Artifact;
+  readonly stackOutput?: Artifact;
   readonly outputFileName?: string;
   readonly manualApproval?: Boolean;
 }
@@ -113,7 +121,9 @@ export class StackSegmentConstructed extends SegmentConstructed {
 
     this.name = props.stack.stackName;
 
-    const buildArtifact = props.project ? new Artifact() : undefined;
+    const buildArtifact = props.project
+      ? props.buildOutput || new Artifact()
+      : undefined;
 
     this.actions = [
       ...(buildArtifact
@@ -184,11 +194,11 @@ export class StackSegmentConstructed extends SegmentConstructed {
         account: props.stack.account,
         region: props.stack.region,
         changeSetName: `${props.stack.stackName}Changes`,
-        output: props.output,
+        output: props.stackOutput,
         outputFileName: props.outputFileName
           ? props.outputFileName
-          : props.output
-            ? `artifact.json`
+          : props.stackOutput
+            ? "artifact.json"
             : undefined,
       }),
     ];