update dependencies, migrate apigw

Author: evayde

cdk/lib/cdk-stack.ts

@@ -1,7 +1,8 @@
-import * as cdk from '@aws-cdk/core';
-import * as lambda from '@aws-cdk/aws-lambda';
-import * as apigateway from '@aws-cdk/aws-apigateway';
-import * as cloudfront from '@aws-cdk/aws-cloudfront';
+import * as cdk from "@aws-cdk/core";
+import * as lambda from "@aws-cdk/aws-lambda";
+import * as apigatewayv2 from "@aws-cdk/aws-apigatewayv2";
+import * as apigatewayv2Integrations from "@aws-cdk/aws-apigatewayv2-integrations";
+import * as cloudfront from "@aws-cdk/aws-cloudfront";
 import * as path from "path";
 
 export class CdkStack extends cdk.Stack {
@@ -13,34 +14,43 @@ export class CdkStack extends cdk.Stack {
       runtime: lambda.Runtime.NODEJS_12_X,
       handler: "build/lambda.handler",
       code: lambda.Code.fromAsset(path.join(__dirname, "../../"), {
-        exclude: ["cdk"]
-      })
+        exclude: ["cdk"],
+      }),
     });
 
-    // ApiGW
-    const apigw = new apigateway.LambdaRestApi(this, "MyApi", {
+    // ApiGWv2
+    const httpApiIntegration = new apigatewayv2Integrations.LambdaProxyIntegration({
       handler: fn,
-      proxy: true
+    });
+
+    const httpApi = new apigatewayv2.HttpApi(this, "MyApi");
+    httpApi.addRoutes({
+      path: "/",
+      methods: [apigatewayv2.HttpMethod.ANY],
+      integration: httpApiIntegration,
     });
 
     // CF
     const feCf = new cloudfront.CloudFrontWebDistribution(this, "MyCf", {
       defaultRootObject: "/",
-      originConfigs: [{
-        customOriginSource: {
-          domainName: `${apigw.restApiId}.execute-api.${this.region}.${this.urlSuffix}`,
+      originConfigs: [
+        {
+          customOriginSource: {
+            domainName: `${httpApi.httpApiId}.execute-api.${this.region}.${this.urlSuffix}`,
+          },
+          behaviors: [
+            {
+              isDefaultBehavior: true,
+            },
+          ],
         },
-        originPath: '/' + apigw.deploymentStage.stageName,
-        behaviors: [{
-          isDefaultBehavior: true,
-        }]
-      }],
+      ],
       enableIpV6: true,
     });
 
     // Output
     new cdk.CfnOutput(this, "myOut", {
-      value: feCf.domainName
+      value: feCf.distributionDomainName,
     });
   }
 }

cdk/package.json

@@ -11,20 +11,21 @@
     "cdk": "cdk"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "1.32.2",
+    "@aws-cdk/assert": "1.74.0",
     "@types/jest": "^24.0.22",
-    "@types/node": "10.17.5",
-    "aws-cdk": "1.32.2",
+    "@types/node": "14.14.9",
+    "aws-cdk": "1.74.0",
     "jest": "^24.9.0",
     "ts-jest": "^24.1.0",
-    "ts-node": "^8.1.0",
-    "typescript": "~3.7.2"
+    "ts-node": "^9.0.0",
+    "typescript": "~4.1.2"
   },
   "dependencies": {
-    "@aws-cdk/aws-apigateway": "^1.32.2",
-    "@aws-cdk/aws-cloudfront": "^1.32.2",
-    "@aws-cdk/aws-lambda": "^1.32.2",
-    "@aws-cdk/core": "1.32.2",
+    "@aws-cdk/aws-apigatewayv2": "^1.74.0",
+    "@aws-cdk/aws-apigatewayv2-integrations": "^1.74.0",
+    "@aws-cdk/aws-cloudfront": "^1.74.0",
+    "@aws-cdk/aws-lambda": "^1.74.0",
+    "@aws-cdk/core": "1.74.0",
     "source-map-support": "^0.5.16"
   }
-}
+}