Merge pull request #42 from modoodalvi/feature/cdkv2

Migrate to CDK v2

Author: roman-boiko

cdk/.gitignore

@@ -9,3 +9,6 @@ cdk.out
 
 # Parcel default cache directory
 .parcel-cache
+
+# IDEs
+.idea

cdk/bin/cdk.ts

@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: MIT-0
 
 import "source-map-support/register";
-import * as cdk from "@aws-cdk/core";
+import { App } from "aws-cdk-lib";
 import { ApiStack } from "../lib/api-stack";
 import { SsrStack } from "../lib/srr-stack";
 
 const demoEnv = { region: "us-east-1" };
-const app = new cdk.App();
+const app = new App();
 new ApiStack(app, "SSRApiStack", { env: demoEnv });
 new SsrStack(app, "SSRAppStack", { env: demoEnv });

cdk/cdk.json

@@ -1,8 +1,5 @@
 {
   "app": "npx ts-node bin/cdk.ts",
   "context": {
-    "@aws-cdk/core:enableStackNameDuplicates": "true",
-    "aws-cdk:enableDiffNoFail": "true",
-    "@aws-cdk/core:stackRelativeExports": "true"
   }
 }

cdk/lib/api-stack.ts

@@ -1,31 +1,31 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
 
-import * as cdk from "@aws-cdk/core";
-import { Duration } from "@aws-cdk/core";
-import * as lambda from "@aws-cdk/aws-lambda";
-import * as apigw from "@aws-cdk/aws-apigateway";
+import { Duration, CfnOutput, Stack, StackProps } from "aws-cdk-lib";
+import * as lambda from "aws-cdk-lib/aws-lambda";
+import * as apigw from "aws-cdk-lib/aws-apigateway";
+import { Construct } from "constructs";
 
-export class ApiStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
+export class ApiStack extends Stack {
+  constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
     const apiFunction = new lambda.Function(this, "apiHandler", {
       runtime: lambda.Runtime.NODEJS_12_X,
       code: lambda.Code.fromAsset("../simple-ssr/api"),
       memorySize: 128,
       timeout: Duration.seconds(5),
-      handler: "index.handler"
+      handler: "index.handler",
     });
 
     const api = new apigw.LambdaRestApi(this, "apiEndpoint", {
       handler: apiFunction,
       defaultCorsPreflightOptions: {
         allowOrigins: apigw.Cors.ALL_ORIGINS,
-        allowMethods: apigw.Cors.ALL_METHODS
-      }
+        allowMethods: apigw.Cors.ALL_METHODS,
+      },
     });
 
-    new cdk.CfnOutput(this, "apiurl", { value: api.url });
+    new CfnOutput(this, "apiurl", { value: api.url });
   }
 }

cdk/lib/srr-stack.ts

@@ -1,32 +1,32 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
 
-import * as cdk from "@aws-cdk/core";
-import { CfnParameter, Duration } from "@aws-cdk/core";
-import * as s3 from "@aws-cdk/aws-s3";
-import * as s3deploy from "@aws-cdk/aws-s3-deployment";
-import * as cloudfront from "@aws-cdk/aws-cloudfront";
-import * as lambda from "@aws-cdk/aws-lambda";
-import * as apigw from "@aws-cdk/aws-apigateway";
+import {
+  Duration,
+  CfnOutput,
+  Stack,
+  StackProps,
+  RemovalPolicy,
+} from "aws-cdk-lib";
+import * as s3 from "aws-cdk-lib/aws-s3";
+import * as s3deploy from "aws-cdk-lib/aws-s3-deployment";
+import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
+import * as lambda from "aws-cdk-lib/aws-lambda";
+import * as apigw from "aws-cdk-lib/aws-apigateway";
+import { Construct } from "constructs";
 
-export class SsrStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
+export class SsrStack extends Stack {
+  constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
-    const mySiteBucketName = new CfnParameter(this, "mySiteBucketName", {
-      type: "String",
-      description: "The name of S3 bucket to upload react application"
-    });
-
     const mySiteBucket = new s3.Bucket(this, "ssr-site", {
-      bucketName: mySiteBucketName.valueAsString,
       websiteIndexDocument: "index.html",
       websiteErrorDocument: "error.html",
       publicReadAccess: false,
       //only for demo not to use in production
-      removalPolicy: cdk.RemovalPolicy.DESTROY
+      removalPolicy: RemovalPolicy.DESTROY,
     });
-    new cdk.CfnOutput(this, "Bucket", { value: mySiteBucket.bucketName });
+    new CfnOutput(this, "Bucket", { value: mySiteBucket.bucketName });
 
     const originAccessIdentity = new cloudfront.OriginAccessIdentity(
       this,
@@ -36,23 +36,23 @@ export class SsrStack extends cdk.Stack {
 
     new s3deploy.BucketDeployment(this, "Client-side React app", {
       sources: [s3deploy.Source.asset("../simple-ssr/build/")],
-      destinationBucket: mySiteBucket
+      destinationBucket: mySiteBucket,
     });
 
     const ssrFunction = new lambda.Function(this, "ssrHandler", {
       runtime: lambda.Runtime.NODEJS_12_X,
       code: lambda.Code.fromAsset("../simple-ssr/server-build"),
       memorySize: 128,
       timeout: Duration.seconds(5),
-      handler: "index.handler"
+      handler: "index.handler",
     });
 
     const ssrEdgeFunction = new lambda.Function(this, "ssrEdgeHandler", {
       runtime: lambda.Runtime.NODEJS_12_X,
       code: lambda.Code.fromAsset("../simple-ssr/edge-build"),
       memorySize: 128,
       timeout: Duration.seconds(5),
-      handler: "index.handler"
+      handler: "index.handler",
     });
 
     const ssrEdgeFunctionVersion = new lambda.Version(
@@ -62,10 +62,10 @@ export class SsrStack extends cdk.Stack {
     );
 
     const ssrApi = new apigw.LambdaRestApi(this, "ssrEndpoint", {
-      handler: ssrFunction
+      handler: ssrFunction,
     });
 
-    new cdk.CfnOutput(this, "SSR API URL", { value: ssrApi.url });
+    new CfnOutput(this, "SSR API URL", { value: ssrApi.url });
 
     const apiDomainName = `${ssrApi.restApiId}.execute-api.${this.region}.amazonaws.com`;
 
@@ -77,44 +77,44 @@ export class SsrStack extends cdk.Stack {
           {
             s3OriginSource: {
               s3BucketSource: mySiteBucket,
-              originAccessIdentity: originAccessIdentity
+              originAccessIdentity: originAccessIdentity,
             },
             behaviors: [
               {
                 isDefaultBehavior: true,
                 lambdaFunctionAssociations: [
                   {
                     eventType: cloudfront.LambdaEdgeEventType.ORIGIN_REQUEST,
-                    lambdaFunction: ssrEdgeFunctionVersion
-                  }
-                ]
-              }
-            ]
+                    lambdaFunction: ssrEdgeFunctionVersion,
+                  },
+                ],
+              },
+            ],
           },
           {
             customOriginSource: {
               domainName: apiDomainName,
               originPath: "/prod",
-              originProtocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY
+              originProtocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
             },
             behaviors: [
               {
-                pathPattern: "/ssr"
-              }
-            ]
-          }
-        ]
+                pathPattern: "/ssr",
+              },
+            ],
+          },
+        ],
       }
     );
 
-    new cdk.CfnOutput(this, "CF URL", {
-      value: `https://${distribution.distributionDomainName}`
+    new CfnOutput(this, "CF URL", {
+      value: `https://${distribution.distributionDomainName}`,
     });
-    new cdk.CfnOutput(this, "Lambda SSR URL", {
-      value: `https://${distribution.distributionDomainName}/ssr`
+    new CfnOutput(this, "Lambda SSR URL", {
+      value: `https://${distribution.distributionDomainName}/ssr`,
     });
-    new cdk.CfnOutput(this, "Lambda@Edge SSR URL", {
-      value: `https://${distribution.distributionDomainName}/edgessr`
+    new CfnOutput(this, "Lambda@Edge SSR URL", {
+      value: `https://${distribution.distributionDomainName}/edgessr`,
     });
   }
 }