feat(wip): replace deprecated apis

capralifecycle · Jan 14, 2022 · 462150c · 462150c
1 parent 894a54f
commit 462150c
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 209 deletions.
diff --git a/__snapshots__/app/cdk-pipeline-cdk-source.template.json b/__snapshots__/app/cdk-pipeline-cdk-source.template.json
diff --git a/__snapshots__/app/cdk-pipeline-cloud-assembly.template.json b/__snapshots__/app/cdk-pipeline-cloud-assembly.template.json
diff --git a/__snapshots__/app/manifest.json b/__snapshots__/app/manifest.json
diff --git a/examples/cdk-pipelines.ts b/examples/cdk-pipelines.ts
@@ -35,7 +35,7 @@ export class LifligCdkPipelineCdkSourceStack extends Stack {
       sourceType: "cdk-source",
     })
 
-    pipeline.cdkPipeline.addApplicationStage(new ExampleStage(this, "example"))
+    pipeline.cdkPipeline.addStage(new ExampleStage(this, "example"))
   }
 }
 
@@ -48,6 +48,6 @@ export class LifligCdkPipelineCloudAssemblyStack extends Stack {
       sourceType: "cloud-assembly",
     })
 
-    pipeline.cdkPipeline.addApplicationStage(new ExampleStage(this, "example"))
+    pipeline.cdkPipeline.addStage(new ExampleStage(this, "example"))
   }
 }
diff --git a/src/alarms/service-alarms.ts b/src/alarms/service-alarms.ts
@@ -87,7 +87,7 @@ export class ServiceAlarms extends cdk.Construct {
       namespace: "AWS/ApplicationELB",
       statistic: "Average",
       period: cdk.Duration.seconds(60),
-      dimensions: {
+      dimensionsMap: {
         TargetGroup: props.targetGroupFullName,
         LoadBalancer: props.loadBalancerFullName,
       },
@@ -108,7 +108,7 @@ export class ServiceAlarms extends cdk.Construct {
       namespace: "AWS/ApplicationELB",
       statistic: "Sum",
       period: cdk.Duration.seconds(60),
-      dimensions: {
+      dimensionsMap: {
         TargetGroup: props.targetGroupFullName,
         LoadBalancer: props.loadBalancerFullName,
       },

diff --git a/src/cdk-pipelines/__tests__/slack-notification.test.ts b/src/cdk-pipelines/__tests__/slack-notification.test.ts
@@ -22,7 +22,7 @@ test("slack-notification", () => {
     sourceType: "cloud-assembly",
   })
 
-  pipeline.cdkPipeline.addApplicationStage(stage)
+  pipeline.cdkPipeline.addStage(stage)
 
   pipeline.addSlackNotification({
     slackWebhookUrl: "https://hooks.slack.com/services/abc",

diff --git a/src/cdk-pipelines/liflig-cdk-pipeline.ts b/src/cdk-pipelines/liflig-cdk-pipeline.ts
@@ -116,7 +116,7 @@ export class LifligCdkPipeline extends cdk.Construct {
     return `pipelines/${pipelineName}/trigger`
   }
 
-  public readonly cdkPipeline: pipelines.CdkPipeline
+  public readonly cdkPipeline: pipelines.CodePipeline
   public readonly codePipeline: codepipeline.Pipeline
 
   constructor(scope: cdk.Construct, id: string, props: LifligCdkPipelineProps) {
@@ -127,23 +127,28 @@ export class LifligCdkPipeline extends cdk.Construct {
 
     const cloudAssemblyArtifact = new codepipeline.Artifact()
 
+    let synth: pipelines.IFileSetProducer
     let stages: codepipeline.StageProps[]
 
     switch (props.sourceType) {
       case "cloud-assembly":
-        stages = this.cloudAssemblyStage(
+        const cloudAssembly = this.cloudAssemblyStage(
           cloudAssemblyArtifact,
           artifactsBucket,
           props.pipelineName,
         )
+        synth = cloudAssembly.synth
+        stages = cloudAssembly.stages
         break
       case "cdk-source":
-        stages = this.cdkSourceStage(
+        const cdkSource = this.cdkSourceStage(
           cloudAssemblyArtifact,
           artifactsBucket,
           props.pipelineName,
           props.parametersNamespace ?? "default",
         )
+        synth = cdkSource.synth
+        stages = cdkSource.stages
         break
     }
 
@@ -170,8 +175,8 @@ export class LifligCdkPipeline extends cdk.Construct {
       restartExecutionOnUpdate: true,
     })
 
-    this.cdkPipeline = new pipelines.CdkPipeline(this, "CdkPipeline", {
-      cloudAssemblyArtifact: cloudAssemblyArtifact,
+    this.cdkPipeline = new pipelines.CodePipeline(this, "CdkPipeline", {
+      synth,
       codePipeline: this.codePipeline,
     })
   }
@@ -198,7 +203,7 @@ export class LifligCdkPipeline extends cdk.Construct {
     cloudAssemblyArtifact: codepipeline.Artifact,
     cdkBucket: s3.IBucket,
     pipelineName: string,
-  ): codepipeline.StageProps[] {
+  ): { stages: codepipeline.StageProps[]; synth: pipelines.IFileSetProducer } {
     const cloudAssemblyLookupFn = new lambda.Function(
       this,
       "CloudAssemblyLookupFn",
@@ -220,7 +225,11 @@ export class LifligCdkPipeline extends cdk.Construct {
       objectKey: `pipelines/${pipelineName}/cloud-assembly.json`,
     }
 
-    return [
+    const synth = pipelines.CodePipelineFileSet.fromArtifact(
+      cloudAssemblyArtifact,
+    )
+
+    const stages = [
       {
         stageName: "PrepareCloudAssembly",
         actions: [
@@ -233,14 +242,15 @@ export class LifligCdkPipeline extends cdk.Construct {
         ],
       },
     ]
+    return { stages, synth }
   }
 
   private cdkSourceStage(
     cloudAssemblyArtifact: codepipeline.Artifact,
     cdkBucket: s3.IBucket,
     pipelineName: string,
     parametersNamespace: string,
-  ): codepipeline.StageProps[] {
+  ): { stages: codepipeline.StageProps[]; synth: pipelines.IFileSetProducer } {
     const prepareCdkSourceFn = new lambda.Function(this, "PrepareCdkSourceFn", {
       code: lambda.Code.fromAsset(
         path.join(__dirname, "../../assets/prepare-cdk-source-lambda"),
@@ -274,7 +284,12 @@ export class LifligCdkPipeline extends cdk.Construct {
       parametersNamespace: parametersNamespace,
     }
 
-    return [
+    const synth = new pipelines.ShellStep("GenerateCloudAssembly", {
+      input: pipelines.CodePipelineFileSet.fromArtifact(cdkSourceArtifact),
+      installCommands: ["npm ci"],
+      commands: ["npx cdk synth"],
+    })
+    const stages = [
       {
         stageName: "PrepareCdkSource",
         actions: [
@@ -286,16 +301,8 @@ export class LifligCdkPipeline extends cdk.Construct {
           }),
         ],
       },
-      {
-        stageName: "GenerateCloudAssembly",
-        actions: [
-          pipelines.SimpleSynthAction.standardNpmSynth({
-            cloudAssemblyArtifact,
-            sourceArtifact: cdkSourceArtifact,
-          }),
-        ],
-      },
     ]
+    return { stages, synth }
   }
 
   addSlackNotification(props: Omit<SlackNotificationProps, "pipeline">): void {

diff --git a/src/ecs/fargate-service.ts b/src/ecs/fargate-service.ts
@@ -123,7 +123,7 @@ export class FargateService extends cdk.Construct {
       healthCheckGracePeriod: props.healthCheckGracePeriod,
       desiredCount: props.desiredCount,
       assignPublicIp: true,
-      securityGroup: this.securityGroup,
+      securityGroups: [this.securityGroup],
       platformVersion: ecs.FargatePlatformVersion.VERSION1_4,
       enableExecuteCommand: true,
       ...props.overrideFargateServiceProps,