feat: migrate amplify-category-api to CDK v2 #883
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| import * as ec2 from 'aws-cdk-lib/aws-ec2'; | ||
| import * as ecr from 'aws-cdk-lib/aws-ecr'; | ||
| import * as ecs from 'aws-cdk-lib/aws-ecs'; | ||
| import * as iam from 'aws-cdk-lib/aws-iam'; | ||
| import { CfnFunction } from 'aws-cdk-lib/aws-lambda'; | ||
| import * as logs from 'aws-cdk-lib/aws-logs'; | ||
| import * as s3 from 'aws-cdk-lib/aws-s3'; | ||
| import * as ssm from 'aws-cdk-lib/aws-secretsmanager'; | ||
| import * as cloudmap from 'aws-cdk-lib/aws-servicediscovery'; | ||
| import * as cdk from 'aws-cdk-lib'; | ||
| import { Construct } from 'constructs'; | ||
| import { prepareApp } from 'aws-cdk-lib/core/lib/private/prepare-app'; | ||
|
There was a problem hiding this comment. I think we can remove this import if its just building one cfn file There was a problem hiding this comment. Adding follow up for this https://app.asana.com/0/1202389680978480/1203186729774450/f . We should revisit this when e2e tests are green. |
||
| import { NETWORK_STACK_LOGICAL_ID } from '../../category-constants'; | ||
| import Container from './docker-compose/ecs-objects/container'; | ||
| import { GitHubSourceActionInfo, PipelineWithAwaiter } from './pipeline-with-awaiter'; | ||
|
|
@@ -74,7 +75,7 @@ export abstract class ContainersStack extends cdk.Stack { | |
| protected readonly deploymentBucketName: string; | ||
| protected readonly awaiterS3Key: string; | ||
|
|
||
| constructor(scope: Construct, id: string, private readonly props: ContainersStackProps) { | ||
| super(scope, id); | ||
|
|
||
| const { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import * as cdk from 'aws-cdk-lib'; | ||
| import { | ||
| $TSContext, | ||
| $TSObject, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| import * as codebuild from 'aws-cdk-lib/aws-codebuild'; | ||
| import * as codepipeline from 'aws-cdk-lib/aws-codepipeline'; | ||
| import * as codepipelineactions from 'aws-cdk-lib/aws-codepipeline-actions'; | ||
| import * as ecr from 'aws-cdk-lib/aws-ecr'; | ||
| import * as ecs from 'aws-cdk-lib/aws-ecs'; | ||
| import * as iam from 'aws-cdk-lib/aws-iam'; | ||
| import * as lambda from 'aws-cdk-lib/aws-lambda'; | ||
| import * as s3 from 'aws-cdk-lib/aws-s3'; | ||
| import * as cdk from 'aws-cdk-lib'; | ||
| import * as custom from 'aws-cdk-lib/custom-resources'; | ||
| import { Construct } from 'constructs'; | ||
| import * as fs from 'fs-extra'; | ||
| import * as path from 'path'; | ||
| import { DEPLOYMENT_MECHANISM } from './base-api-stack'; | ||
|
|
@@ -30,8 +31,8 @@ const lambdaRuntimeNodeVersion = lambda.Runtime.NODEJS_12_X; | |
|
|
||
| const lambdasDir = path.resolve(__dirname, '../../../resources/awscloudformation/lambdas'); | ||
|
|
||
| class PipelineAwaiter extends Construct { | ||
| constructor(scope: Construct, id: string, props: PipelineAwaiterProps) { | ||
| const { pipeline, artifactBucketName, artifactKey, deploymentMechanism } = props; | ||
|
|
||
| const { pipelineArn, pipelineName } = pipeline; | ||
|
|
@@ -90,10 +91,10 @@ class PipelineAwaiter extends cdk.Construct { | |
| } | ||
| } | ||
|
|
||
| export class PipelineWithAwaiter extends Construct { | ||
| pipelineName: string; | ||
| constructor( | ||
| scope: Construct, | ||
| id: string, | ||
| { | ||
| skipWait = false, | ||
|
|
@@ -246,11 +247,17 @@ export class PipelineWithAwaiter extends cdk.Construct { | |
| actions: [ | ||
| new codepipelineactions.EcsDeployAction({ | ||
| actionName: 'Deploy', | ||
| service: new (class extends Construct implements ecs.IBaseService { | ||
| // eslint-disable-next-line class-methods-use-this | ||
| applyRemovalPolicy(_: cdk.RemovalPolicy): void { | ||
| // NO-OP | ||
| } | ||
|
|
||
|
Comment on lines
+250
to
+255
There was a problem hiding this comment. This is forced upon us by |
||
| cluster = { | ||
| clusterName: service.cluster, | ||
| env: {}, | ||
| } as ecs.ICluster; | ||
|
|
||
| serviceArn = cdk.Fn.ref(service.attrServiceArn); | ||
| serviceName = service.serviceName; | ||
| stack = cdk.Stack.of(this); | ||
|
|
@@ -292,7 +299,7 @@ export class PipelineWithAwaiter extends cdk.Construct { | |
| } | ||
|
|
||
| function createPreBuildStages( | ||
| scope: Construct, | ||
| { | ||
| bucket, | ||
| s3SourceActionKey, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { Duration, Expiration } from 'aws-cdk-lib'; | ||
| import { | ||
| $TSContext, | ||
| $TSObject, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because of Because of https://app.circleci.com/pipelines/github/aws-amplify/amplify-category-api/1548/workflows/86e8aeb5-342e-4526-9370-2b7789e24d18/jobs/40319 .
I .
Borrowed from https://github.com/aws-amplify/amplify-cli/blob/015187a8b714b96fbb87331383a92664aa6e6f35/.circleci/config.base.yml#L134-L148