Merge branch 'main' into conroy/p1

aws · Sep 16, 2024 · ff55718 · ff55718
2 parents c107fa3 + 1726abd
commit ff55718
Show file tree

Hide file tree

Showing 193 changed files with 109,632 additions and 2,268 deletions.
diff --git a/...est/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json b/...est/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json
diff --git a/...t/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json b/...t/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json
@@ -4,7 +4,8 @@
    "Type": "AWS::ApiGatewayV2::Api",
    "Properties": {
     "Name": "HttpApi",
-    "ProtocolType": "HTTP"
+    "ProtocolType": "HTTP",
+    "RouteSelectionExpression": "${request.method} ${request.path}"
    }
   },
   "HttpApiDefaultStage3EEB07D6": {

diff --git a/...cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out b/...cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out
diff --git a/...ewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json b/...ewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json
diff --git a/...-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json b/...-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json
diff --git a/...sting/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json b/...sting/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json
diff --git a/...k-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json b/...k-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.ts
@@ -6,7 +6,9 @@ import * as apigw from 'aws-cdk-lib/aws-apigatewayv2';
 const app = new cdk.App();
 const stack = new cdk.Stack(app, 'aws-cdk-aws-apigatewayv2');
 
-new apigw.HttpApi(stack, 'HttpApi');
+new apigw.HttpApi(stack, 'HttpApi', {
+  routeSelectionExpression: true,
+});
 
 new IntegTest(app, 'http-api', {
   testCases: [stack],

diff --git a/...ipv4.js.snapshot/AlbDualstackWithoutPublicIpv4DefaultTestDeployAssertFA6F90DD.assets.json b/...ipv4.js.snapshot/AlbDualstackWithoutPublicIpv4DefaultTestDeployAssertFA6F90DD.assets.json
diff --git a/...v4.js.snapshot/AlbDualstackWithoutPublicIpv4DefaultTestDeployAssertFA6F90DD.template.json b/...v4.js.snapshot/AlbDualstackWithoutPublicIpv4DefaultTestDeployAssertFA6F90DD.template.json
diff --git a/...out-public-ipv4.js.snapshot/aws-cdk-elbv2-integ-dualstack-without-public-ipv4.assets.json b/...out-public-ipv4.js.snapshot/aws-cdk-elbv2-integ-dualstack-without-public-ipv4.assets.json