@flit/cdk-pipeline 1.5.0 → 2.1.0

package/src/segment.ts

@@ -6,32 +6,32 @@ import { Artifact } from "./artifact";
 import { Pipeline } from "./pipeline";
 
 export interface SegmentProps {
-  readonly input?: Artifact | Artifact[];
-  readonly output?: Artifact | Artifact[];
+	readonly input?: Artifact | Artifact[];
+	readonly output?: Artifact | Artifact[];
 }
 
 export abstract class Segment {
-  readonly isSource: boolean = false;
-  readonly isPipeline: boolean = false;
-  readonly dependencies?: Stack[];
-  readonly inputs: Artifact[] = [];
-  readonly outputs: Artifact[] = [];
-  constructor(props: SegmentProps) {
-    if (props.input) {
-      this.inputs = Array.isArray(props.input) ? props.input : [props.input];
-      this.inputs.forEach((artifact) => artifact.consume(this), this);
-    }
-    if (props.output) {
-      this.outputs = Array.isArray(props.output)
-        ? props.output
-        : [props.output];
-      this.outputs.forEach((artifact) => artifact.produce(this), this);
-    }
-  }
-  abstract construct(scope: Pipeline): SegmentConstructed;
+	readonly isSource: boolean = false;
+	readonly isPipeline: boolean = false;
+	readonly dependencies?: Stack[];
+	readonly inputs: Artifact[] = [];
+	readonly outputs: Artifact[] = [];
+	constructor(props: SegmentProps) {
+		if (props.input) {
+			this.inputs = Array.isArray(props.input) ? props.input : [props.input];
+			this.inputs.forEach((artifact) => artifact.consume(this), this);
+		}
+		if (props.output) {
+			this.outputs = Array.isArray(props.output)
+				? props.output
+				: [props.output];
+			this.outputs.forEach((artifact) => artifact.produce(this), this);
+		}
+	}
+	abstract construct(scope: Pipeline): SegmentConstructed;
 }
 
 export abstract class SegmentConstructed extends Construct {
-  readonly name: string = "";
-  readonly actions: IAction[] = [];
+	readonly name: string = "";
+	readonly actions: IAction[] = [];
 }

package/src/source-segment.ts

@@ -2,13 +2,13 @@ import { Artifact } from "./artifact";
 import { Segment } from "./segment";
 
 export interface SourceSegmentProps {
-  readonly output: Artifact;
+	readonly output: Artifact;
 }
 
 export abstract class SourceSegment extends Segment {
-  readonly isSource = true;
+	readonly isSource = true;
 }
 
 export function isSource(item: Segment): item is SourceSegment {
-  return item.isSource;
+	return item.isSource;
 }

package/src/stack-segment.ts

@@ -86,7 +86,7 @@ export class StackSegment extends Segment {
 	construct(scope: Pipeline): SegmentConstructed {
 		return new StackSegmentConstructed(
 			scope,
-			`Deploy${this.props.stack.stackName}`,
+			`Deploy${this.props.stack.node.id}`,
 			{
 				...this.props,
 				input: this.inputs[0],
@@ -120,7 +120,7 @@ export class StackSegmentConstructed extends SegmentConstructed {
 	) {
 		super(scope, id);
 
-		this.name = props.stack.stackName;
+		this.name = props.stack.node.id;
 
 		const buildArtifact = props.project
 			? props.buildOutput || new Artifact()
@@ -130,67 +130,77 @@ export class StackSegmentConstructed extends SegmentConstructed {
 			...props.project,
 			buildSpec: props.project?.buildSpec
 				? mergeBuildSpecs(
-					props.project.buildSpec,
-					BuildSpec.fromObject({
+						props.project.buildSpec,
+						BuildSpec.fromObject({
+							artifacts: {
+								files: [path.join(scope.buildDir, "**/*")],
+							},
+						}),
+				  )
+				: BuildSpec.fromObject({
 						artifacts: {
 							files: [path.join(scope.buildDir, "**/*")],
 						},
-					}),
-				)
-				: BuildSpec.fromObject({
-					artifacts: {
-						files: [path.join(scope.buildDir, "**/*")],
-					},
-				}),
-		})
+				  }),
+		});
 
-		Object.entries(props.project?.environment?.environmentVariables || []).forEach(([, v]) => {
+		Object.entries(
+			props.project?.environment?.environmentVariables || [],
+		).forEach(([, v]) => {
 			switch (v.type) {
 				case BuildEnvironmentVariableType.PARAMETER_STORE:
-					codeBuildProject.addToRolePolicy(new PolicyStatement({
-						actions: [
-							"ssm:GetParameter",
-							"ssm:GetParameters",
-							"ssm:GetParametersByPath",
-						],
-						resources: [
-							`arn:aws:ssm:*:${Stack.of(this).account}:parameter/${v.value}`
-						],
-					}));
+					codeBuildProject.addToRolePolicy(
+						new PolicyStatement({
+							actions: [
+								"ssm:GetParameter",
+								"ssm:GetParameters",
+								"ssm:GetParametersByPath",
+							],
+							resources: [
+								`arn:aws:ssm:*:${Stack.of(this).account}:parameter/${v.value}`,
+							],
+						}),
+					);
 					break;
 				case BuildEnvironmentVariableType.SECRETS_MANAGER:
-					codeBuildProject.addToRolePolicy(new PolicyStatement({
-						actions: [
-							"secretsmanager:GetSecretValue",
-							"secretsmanager:DescribeSecret",
-						],
-						resources: [(v.value as string).startsWith("arn:") ?
-							v.value.split(":").slice(0, 7).join(":") :
-							`arn:aws:secretsmanager:*:${Stack.of(this).account}:secret:${v.value}-*`],
-					}));
+					codeBuildProject.addToRolePolicy(
+						new PolicyStatement({
+							actions: [
+								"secretsmanager:GetSecretValue",
+								"secretsmanager:DescribeSecret",
+							],
+							resources: [
+								(v.value as string).startsWith("arn:")
+									? v.value.split(":").slice(0, 7).join(":")
+									: `arn:aws:secretsmanager:*:${
+											Stack.of(this).account
+									  }:secret:${v.value}-*`,
+							],
+						}),
+					);
 					break;
 			}
-		})
+		});
 
 		this.actions = [
 			...(buildArtifact
 				? [
-					new CodeBuildAction({
-						actionName: `${this.name}Build`,
-						runOrder: 1,
-						input: props.input,
-						extraInputs: props.extraInputs,
-						outputs: [buildArtifact],
-						environmentVariables: props.environmentVariables,
-						project: codeBuildProject,
-					}),
-					new PublishAssetsAction(this, "PublishAssets", {
-						actionName: `${this.name}PublishAssets`,
-						runOrder: 2,
-						input: buildArtifact,
-						manifestPath: scope.buildDir,
-					}),
-				]
+						new CodeBuildAction({
+							actionName: `${this.name}Build`,
+							runOrder: 1,
+							input: props.input,
+							extraInputs: props.extraInputs,
+							outputs: [buildArtifact],
+							environmentVariables: props.environmentVariables,
+							project: codeBuildProject,
+						}),
+						new PublishAssetsAction(this, "PublishAssets", {
+							actionName: `${this.name}PublishAssets`,
+							runOrder: 2,
+							input: buildArtifact,
+							manifestPath: scope.buildDir,
+						}),
+				  ]
 				: []),
 			new CloudFormationCreateReplaceChangeSetAction({
 				actionName: `${this.name}PrepareChanges`,
@@ -198,7 +208,7 @@ export class StackSegmentConstructed extends SegmentConstructed {
 				stackName: props.stackName ? props.stackName : props.stack.stackName,
 				account: props.stack.account,
 				region: props.stack.region,
-				changeSetName: `${props.stack.stackName}Changes`,
+				changeSetName: `${this.name}Changes`,
 				adminPermissions: true,
 				templatePath: (buildArtifact ? buildArtifact : props.input).atPath(
 					path.join(scope.buildDir, props.stack.templateFile),
@@ -206,11 +216,11 @@ export class StackSegmentConstructed extends SegmentConstructed {
 			}),
 			...(props.manualApproval
 				? [
-					new ManualApprovalAction({
-						actionName: `${this.name}ApproveChanges`,
-						runOrder: buildArtifact ? 4 : 2,
-					}),
-				]
+						new ManualApprovalAction({
+							actionName: `${this.name}ApproveChanges`,
+							runOrder: buildArtifact ? 4 : 2,
+						}),
+				  ]
 				: []),
 			new CloudFormationExecuteChangeSetAction({
 				actionName: `${this.name}ExecuteChanges`,
@@ -219,18 +229,18 @@ export class StackSegmentConstructed extends SegmentConstructed {
 						? 5
 						: 3
 					: buildArtifact
-						? 4
-						: 2,
+					  ? 4
+					  : 2,
 				stackName: props.stackName ? props.stackName : props.stack.stackName,
 				account: props.stack.account,
 				region: props.stack.region,
-				changeSetName: `${props.stack.stackName}Changes`,
+				changeSetName: `${this.name}Changes`,
 				output: props.stackOutput,
 				outputFileName: props.outputFileName
 					? props.outputFileName
 					: props.stackOutput
-						? "artifact.json"
-						: undefined,
+					  ? "artifact.json"
+					  : undefined,
 			}),
 		];
 	}