Merge pull request #193 from getlift/update-cdk-to-v2

Update CDK to v2

.github/workflows/ci.yml

@@ -14,10 +14,9 @@ jobs:
         strategy:
             matrix:
                 node:
-                    - "12.13.0"
                     - 14
                     - 16
-                    - 17
+                    - 18
                 serverless:
                     - "2.36.0"
                     - "2"

package.json

@@ -5,26 +5,13 @@
   "repository": "https://github.com/getlift/lift",
   "description": "Lift",
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2": "^1.138",
-    "@aws-cdk/aws-apigatewayv2-integrations": "^1.138",
-    "@aws-cdk/aws-certificatemanager": "^1.138",
-    "@aws-cdk/aws-cloudfront": "^1.138",
-    "@aws-cdk/aws-cloudfront-origins": "^1.138",
-    "@aws-cdk/aws-cloudwatch": "^1.138",
-    "@aws-cdk/aws-dynamodb": "^1.138",
-    "@aws-cdk/aws-ec2": "^1.138",
-    "@aws-cdk/aws-events": "^1.138",
-    "@aws-cdk/aws-iam": "^1.138",
-    "@aws-cdk/aws-kms": "^1.138",
-    "@aws-cdk/aws-lambda": "^1.138",
-    "@aws-cdk/aws-s3": "^1.138",
-    "@aws-cdk/aws-sns": "^1.138",
-    "@aws-cdk/aws-sqs": "^1.138",
-    "@aws-cdk/core": "^1.138",
+    "@aws-cdk/aws-apigatewayv2-alpha": "^2.21.1-alpha.0",
+    "aws-cdk-lib": "^2.21.1",
     "aws-sdk": "^2.942.0",
     "chalk": "^4.1.1",
     "change-case": "^4.1.2",
     "cidr-split": "^0.1.2",
+    "constructs": "^10.0.127",
     "inquirer": "^7.3.3",
     "js-yaml": "^3.14.1",
     "lodash": "^4.17.21",
@@ -67,7 +54,7 @@
     "typescript": "^4.3.4"
   },
   "engines": {
-    "node": ">=12.13 <18"
+    "node": ">=14.15.0 <19"
   },
   "files": [
     "/dist"

src/CloudFormation.ts

@@ -1,6 +1,6 @@
 import type { DescribeStacksInput, DescribeStacksOutput } from "aws-sdk/clients/cloudformation";
-import type { CfnOutput } from "@aws-cdk/core";
-import { Stack } from "@aws-cdk/core";
+import type { CfnOutput } from "aws-cdk-lib";
+import { Stack } from "aws-cdk-lib";
 import type { AwsProvider } from "@lift/providers";
 import { getUtils } from "./utils/logger";
 

src/constructs/abstracts/AwsConstruct.ts

@@ -1,4 +1,4 @@
-import { Construct as CdkConstruct } from "@aws-cdk/core";
+import { Construct as CdkConstruct } from "constructs";
 import type { AwsProvider } from "@lift/providers";
 import type { ConstructInterface } from "@lift/constructs";
 

src/constructs/aws/DatabaseDynamoDBSingleTable.ts

@@ -1,6 +1,6 @@
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
-import { CfnOutput, Fn, Stack } from "@aws-cdk/core";
-import { AttributeType, BillingMode, StreamViewType, Table } from "@aws-cdk/aws-dynamodb";
+import type { Construct as CdkConstruct } from "constructs";
+import { CfnOutput, Fn, Stack } from "aws-cdk-lib";
+import { AttributeType, BillingMode, StreamViewType, Table } from "aws-cdk-lib/aws-dynamodb";
 import type { FromSchema } from "json-schema-to-ts";
 import type { AwsProvider } from "@lift/providers";
 import { AwsConstruct } from "@lift/constructs/abstracts";

src/constructs/aws/Queue.ts

@@ -1,11 +1,11 @@
-import { Key } from "@aws-cdk/aws-kms";
-import { Queue as CdkQueue, QueueEncryption } from "@aws-cdk/aws-sqs";
+import { Key } from "aws-cdk-lib/aws-kms";
+import { Queue as CdkQueue, QueueEncryption } from "aws-cdk-lib/aws-sqs";
 import type { FromSchema } from "json-schema-to-ts";
-import { Alarm, ComparisonOperator, Metric } from "@aws-cdk/aws-cloudwatch";
-import { Subscription, SubscriptionProtocol, Topic } from "@aws-cdk/aws-sns";
-import type { AlarmActionConfig } from "@aws-cdk/aws-cloudwatch/lib/alarm-action";
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
-import { CfnOutput, Duration } from "@aws-cdk/core";
+import { Alarm, ComparisonOperator, Metric } from "aws-cdk-lib/aws-cloudwatch";
+import { Subscription, SubscriptionProtocol, Topic } from "aws-cdk-lib/aws-sns";
+import type { AlarmActionConfig } from "aws-cdk-lib/aws-cloudwatch/lib/alarm-action";
+import type { Construct as CdkConstruct } from "constructs";
+import { CfnOutput, Duration } from "aws-cdk-lib";
 import chalk from "chalk";
 import type { PurgeQueueRequest, SendMessageRequest } from "aws-sdk/clients/sqs";
 import { isNil } from "lodash";
@@ -221,7 +221,7 @@ export class Queue extends AwsConstruct {
                 metric: new Metric({
                     namespace: "AWS/SQS",
                     metricName: "ApproximateNumberOfMessagesVisible",
-                    dimensions: {
+                    dimensionsMap: {
                         QueueName: dlq.queueName,
                     },
                     statistic: "Sum",

src/constructs/aws/ServerSideWebsite.ts

@@ -1,4 +1,4 @@
-import { Bucket } from "@aws-cdk/aws-s3";
+import { Bucket } from "aws-cdk-lib/aws-s3";
 import {
     AllowedMethods,
     CacheHeaderBehavior,
@@ -12,17 +12,17 @@ import {
     OriginRequestPolicy,
     OriginRequestQueryStringBehavior,
     ViewerProtocolPolicy,
-} from "@aws-cdk/aws-cloudfront";
-import type { Construct } from "@aws-cdk/core";
-import { CfnOutput, Duration, Fn, RemovalPolicy } from "@aws-cdk/core";
+} from "aws-cdk-lib/aws-cloudfront";
+import type { Construct } from "constructs";
+import { CfnOutput, Duration, Fn, RemovalPolicy } from "aws-cdk-lib";
 import type { FromSchema } from "json-schema-to-ts";
-import { HttpOrigin, S3Origin } from "@aws-cdk/aws-cloudfront-origins";
-import * as acm from "@aws-cdk/aws-certificatemanager";
-import type { BehaviorOptions, ErrorResponse } from "@aws-cdk/aws-cloudfront/lib/distribution";
+import { HttpOrigin, S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
+import * as acm from "aws-cdk-lib/aws-certificatemanager";
+import type { BehaviorOptions, ErrorResponse } from "aws-cdk-lib/aws-cloudfront/lib/distribution";
 import * as path from "path";
 import * as fs from "fs";
 import { flatten } from "lodash";
-import * as cloudfront from "@aws-cdk/aws-cloudfront";
+import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import { AwsConstruct } from "@lift/constructs/abstracts";
 import type { ConstructCommands } from "@lift/constructs";
 import type { AwsProvider } from "@lift/providers";

src/constructs/aws/SinglePageApp.ts

@@ -1,6 +1,6 @@
-import * as cloudfront from "@aws-cdk/aws-cloudfront";
-import { FunctionEventType } from "@aws-cdk/aws-cloudfront";
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
+import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
+import { FunctionEventType } from "aws-cdk-lib/aws-cloudfront";
+import type { Construct as CdkConstruct } from "constructs";
 import type { AwsProvider } from "@lift/providers";
 import { redirectToMainDomain } from "../../classes/cloudfrontFunctions";
 import { getCfnFunctionAssociations } from "../../utils/getDefaultCfnFunctionAssociations";

src/constructs/aws/StaticWebsite.ts

@@ -1,6 +1,6 @@
-import * as cloudfront from "@aws-cdk/aws-cloudfront";
-import { FunctionEventType } from "@aws-cdk/aws-cloudfront";
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
+import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
+import { FunctionEventType } from "aws-cdk-lib/aws-cloudfront";
+import type { Construct as CdkConstruct } from "constructs";
 import type { AwsProvider } from "@lift/providers";
 import { redirectToMainDomain } from "../../classes/cloudfrontFunctions";
 import { getCfnFunctionAssociations } from "../../utils/getDefaultCfnFunctionAssociations";

src/constructs/aws/Storage.ts

@@ -1,6 +1,6 @@
-import { BlockPublicAccess, Bucket, BucketEncryption, StorageClass } from "@aws-cdk/aws-s3";
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
-import { CfnOutput, Duration, Fn, Stack } from "@aws-cdk/core";
+import { BlockPublicAccess, Bucket, BucketEncryption, StorageClass } from "aws-cdk-lib/aws-s3";
+import type { Construct as CdkConstruct } from "constructs";
+import { CfnOutput, Duration, Fn, Stack } from "aws-cdk-lib";
 import type { FromSchema } from "json-schema-to-ts";
 import type { AwsProvider } from "@lift/providers";
 import { AwsConstruct } from "@lift/constructs/abstracts";

src/constructs/aws/Vpc.ts

@@ -1,5 +1,5 @@
-import { Vpc as CdkVpc, Peer, Port, SecurityGroup } from "@aws-cdk/aws-ec2";
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
+import { Vpc as CdkVpc, Peer, Port, SecurityGroup } from "aws-cdk-lib/aws-ec2";
+import type { Construct as CdkConstruct } from "constructs";
 import type { FromSchema } from "json-schema-to-ts";
 import type { AwsProvider } from "@lift/providers";
 import type { ConstructInterface } from "@lift/constructs";
@@ -39,7 +39,7 @@ export class Vpc extends CdkVpc implements ConstructInterface {
 
         // Auto-register the VPC
         provider.setVpcConfig(
-            [this.appSecurityGroup.securityGroupName],
+            [this.appSecurityGroup.securityGroupId],
             this.privateSubnets.map((subnet) => subnet.subnetId)
         );
     }

src/constructs/aws/Webhook.ts

@@ -1,10 +1,11 @@
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
-import { CfnOutput, Fn } from "@aws-cdk/core";
-import { CfnAuthorizer, CfnIntegration, CfnRoute, HttpApi } from "@aws-cdk/aws-apigatewayv2";
-import { Function } from "@aws-cdk/aws-lambda";
-import { EventBus } from "@aws-cdk/aws-events";
+import type { Construct as CdkConstruct } from "constructs";
+import { CfnOutput, Fn } from "aws-cdk-lib";
+import { CfnAuthorizer, CfnIntegration, CfnRoute } from "aws-cdk-lib/aws-apigatewayv2";
+import { HttpApi } from "@aws-cdk/aws-apigatewayv2-alpha";
+import { Function } from "aws-cdk-lib/aws-lambda";
+import { EventBus } from "aws-cdk-lib/aws-events";
 import type { FromSchema } from "json-schema-to-ts";
-import { PolicyDocument, PolicyStatement, Role, ServicePrincipal } from "@aws-cdk/aws-iam";
+import { PolicyDocument, PolicyStatement, Role, ServicePrincipal } from "aws-cdk-lib/aws-iam";
 import type { AwsProvider } from "@lift/providers";
 import { AwsConstruct } from "@lift/constructs/abstracts";
 import ServerlessError from "../../utils/error";

src/constructs/aws/abstracts/StaticWebsiteAbstract.ts

@@ -1,19 +1,19 @@
-import * as acm from "@aws-cdk/aws-certificatemanager";
-import * as cloudfront from "@aws-cdk/aws-cloudfront";
-import type { ErrorResponse } from "@aws-cdk/aws-cloudfront";
+import * as acm from "aws-cdk-lib/aws-certificatemanager";
+import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
+import type { ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
 import {
     AllowedMethods,
     CachePolicy,
     Distribution,
     FunctionEventType,
     HttpVersion,
     ViewerProtocolPolicy,
-} from "@aws-cdk/aws-cloudfront";
-import { S3Origin } from "@aws-cdk/aws-cloudfront-origins";
-import { Bucket } from "@aws-cdk/aws-s3";
-import type { Construct as CdkConstruct } from "@aws-cdk/core";
-import { Duration } from "@aws-cdk/core";
-import { CfnOutput, RemovalPolicy } from "@aws-cdk/core";
+} from "aws-cdk-lib/aws-cloudfront";
+import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
+import { Bucket } from "aws-cdk-lib/aws-s3";
+import type { Construct as CdkConstruct } from "constructs";
+import { Duration } from "aws-cdk-lib";
+import { CfnOutput, RemovalPolicy } from "aws-cdk-lib";
 import type { ConstructCommands } from "@lift/constructs";
 import { AwsConstruct } from "@lift/constructs/abstracts";
 import type { AwsProvider } from "@lift/providers";

src/plugin.ts

@@ -3,7 +3,7 @@ import type { AwsIamPolicyStatements } from "@serverless/typescript";
 import * as path from "path";
 import { readFileSync } from "fs";
 import { dump } from "js-yaml";
-import { DefaultTokenResolver, Lazy, StringConcat, Tokenization } from "@aws-cdk/core";
+import { DefaultTokenResolver, Lazy, StringConcat, Tokenization } from "aws-cdk-lib";
 import type { FromSchema } from "json-schema-to-ts";
 import type { ProviderInterface, StaticProviderInterface } from "@lift/providers";
 import { AwsProvider, StripeProvider } from "@lift/providers";

src/providers/AwsProvider.ts

@@ -1,5 +1,5 @@
-import type { CfnOutput } from "@aws-cdk/core";
-import { App, Stack } from "@aws-cdk/core";
+import type { CfnOutput } from "aws-cdk-lib";
+import { App, DefaultStackSynthesizer, Stack } from "aws-cdk-lib";
 import { get, merge } from "lodash";
 import type { AwsCfInstruction, AwsLambdaVpcConfig } from "@serverless/typescript";
 import type { ProviderInterface } from "@lift/providers";
@@ -69,7 +69,11 @@ export class AwsProvider implements ProviderInterface {
     constructor(private readonly serverless: Serverless) {
         this.stackName = serverless.getProvider("aws").naming.getStackName();
         this.app = new App();
-        this.stack = new Stack(this.app);
+        this.stack = new Stack(this.app, undefined, {
+            synthesizer: new DefaultStackSynthesizer({
+                generateBootstrapVersionRule: false,
+            }),
+        });
         this.legacyProvider = serverless.getProvider("aws");
         this.naming = this.legacyProvider.naming;
         this.region = serverless.getProvider("aws").getRegion();

src/types/serverless.ts

@@ -1,5 +1,5 @@
 import type { AWS } from "@serverless/typescript";
-import type { Stack } from "@aws-cdk/core";
+import type { Stack } from "aws-cdk-lib";
 
 export type Hook = () => void | Promise<void>;
 

src/utils/getDefaultCfnFunctionAssociations.ts

@@ -1,4 +1,4 @@
-import type { CfnDistribution } from "@aws-cdk/aws-cloudfront";
+import type { CfnDistribution } from "aws-cdk-lib/aws-cloudfront";
 
 interface CfnFunctionAssociation {
     EventType: string;

test/unit/serverSideWebsite.test.ts

@@ -337,7 +337,7 @@ describe("server-side website", () => {
                     ViewerCertificate: {
                         AcmCertificateArn:
                             "arn:aws:acm:us-east-1:123456615250:certificate/0a28e63d-d3a9-4578-9f8b-14347bfe8123",
-                        MinimumProtocolVersion: "TLSv1.2_2019",
+                        MinimumProtocolVersion: "TLSv1.2_2021",
                         SslSupportMethod: "sni-only",
                     },
                 },

test/unit/staticWebsites.test.ts

@@ -192,7 +192,7 @@ describe("static websites", () => {
                     ViewerCertificate: {
                         AcmCertificateArn:
                             "arn:aws:acm:us-east-1:123456615250:certificate/0a28e63d-d3a9-4578-9f8b-14347bfe8123",
-                        MinimumProtocolVersion: "TLSv1.2_2019",
+                        MinimumProtocolVersion: "TLSv1.2_2021",
                         SslSupportMethod: "sni-only",
                     },
                 },

test/unit/vpc.test.ts

@@ -17,7 +17,7 @@ describe("vpc", () => {
         >;
         expect(vpcConfig).toHaveProperty("SecurityGroupIds");
         expect((vpcConfig.SecurityGroupIds as AwsCfInstruction[])[0]).toMatchObject({
-            Ref: computeLogicalId("vpc", "AppSecurityGroup"),
+            "Fn::GetAtt": [computeLogicalId("vpc", "AppSecurityGroup"), "GroupId"],
         });
         expect(vpcConfig).toHaveProperty("SubnetIds");
         expect(vpcConfig.SubnetIds).toContainEqual({

test/utils/runServerless.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import { Names } from "@aws-cdk/core";
+import { Names } from "aws-cdk-lib";
 import type originalRunServerless from "@serverless/test/run-serverless";
 import setupRunServerlessFixturesEngine from "@serverless/test/setup-run-serverless-fixtures-engine";
 import type { AWS } from "@serverless/typescript";