From 14628264c1a33feab8774edf7e1494402a2394a0 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Mon, 9 Sep 2024 20:41:15 +0900 Subject: [PATCH 1/7] add routeSelectionExpression --- .../aws-cdk-aws-apigatewayv2.assets.json | 6 +-- .../aws-cdk-aws-apigatewayv2.template.json | 3 +- .../test/http/integ.api.js.snapshot/cdk.out | 2 +- ...efaultTestDeployAssert77633A40.assets.json | 2 +- .../http/integ.api.js.snapshot/integ.json | 2 +- .../http/integ.api.js.snapshot/manifest.json | 4 +- .../test/http/integ.api.js.snapshot/tree.json | 47 ++++++++++--------- .../aws-apigatewayv2/lib/http/api.ts | 10 ++++ 8 files changed, 44 insertions(+), 32 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json index 2a97a56ed3ab4..b331064340137 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json @@ -1,7 +1,7 @@ { - "version": "35.0.0", + "version": "36.0.5", "files": { - "f753b6c52b805082d600dd33b6be3b816c0954f254acf84347e2447774db5100": { + "f65d8ddb0185bf19b874b00fc97f8affa5dfd707b669e7c9545c6d9e2f97c637": { "source": { "path": "aws-cdk-aws-apigatewayv2.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "f753b6c52b805082d600dd33b6be3b816c0954f254acf84347e2447774db5100.json", + "objectKey": "f65d8ddb0185bf19b874b00fc97f8affa5dfd707b669e7c9545c6d9e2f97c637.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json index 36bd57da384f9..6e2d36660aacc 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/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/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out index c5cb2e5de6344..bd5311dc372de 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"35.0.0"} \ No newline at end of file +{"version":"36.0.5"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json index 1b6f704767526..05227ce830419 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json @@ -1,5 +1,5 @@ { - "version": "35.0.0", + "version": "36.0.5", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json index 1b3ad22cef14a..fa5fd868ff827 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "35.0.0", + "version": "36.0.5", "testCases": { "http-api/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json index 91e40a0cbe7bb..920ce784b6153 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "35.0.0", + "version": "36.0.5", "artifacts": { "aws-cdk-aws-apigatewayv2.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f753b6c52b805082d600dd33b6be3b816c0954f254acf84347e2447774db5100.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f65d8ddb0185bf19b874b00fc97f8affa5dfd707b669e7c9545c6d9e2f97c637.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json index d17481862eddf..e9011e8174f8c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json @@ -19,12 +19,13 @@ "aws:cdk:cloudformation:type": "AWS::ApiGatewayV2::Api", "aws:cdk:cloudformation:props": { "name": "HttpApi", - "protocolType": "HTTP" + "protocolType": "HTTP", + "routeSelectionExpression": "$request.method $request.path" } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_apigatewayv2.CfnApi", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultStage": { @@ -45,42 +46,42 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_apigatewayv2.CfnStage", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_apigatewayv2.HttpStage", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_apigatewayv2.HttpApi", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "aws-cdk-aws-apigatewayv2/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "aws-cdk-aws-apigatewayv2/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "http-api": { @@ -107,22 +108,22 @@ "id": "BootstrapVersion", "path": "http-api/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnParameter", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "http-api/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "aws-cdk-lib.CfnRule", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "aws-cdk-lib.Stack", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, @@ -147,8 +148,8 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.App", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } } \ No newline at end of file diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts index 55ff0955df3b8..9fe8ad1d9114e 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts +++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts @@ -160,6 +160,15 @@ export interface HttpApiProps { * @default - no default authorization scopes */ readonly defaultAuthorizationScopes?: string[]; + + /** + * Whether to set the default route selection expression for the API. + * + * When enabled, "${request.method} ${request.path}" is set as the default route selection expression. + * + * @default false + */ + readonly routeSelectionExpression?: boolean; } /** @@ -434,6 +443,7 @@ export class HttpApi extends HttpApiBase { corsConfiguration, description: props?.description, disableExecuteApiEndpoint: this.disableExecuteApiEndpoint, + routeSelectionExpression: props?.isDefaultRouteSelectionExpression === true ? '$request.method $request.path' : undefined, }; const resource = new CfnApi(this, 'Resource', apiProps); From eb1f1beb43f4024eaf12d0f6d47745cca5d2e20f Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Mon, 9 Sep 2024 21:28:48 +0900 Subject: [PATCH 2/7] update integ --- .../test/aws-apigatewayv2/test/http/integ.api.ts | 4 +++- packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 index dac08621b9906..e60b20380a4ac 100644 --- 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/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts index 9fe8ad1d9114e..db27faee0b3a1 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts +++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts @@ -443,7 +443,7 @@ export class HttpApi extends HttpApiBase { corsConfiguration, description: props?.description, disableExecuteApiEndpoint: this.disableExecuteApiEndpoint, - routeSelectionExpression: props?.isDefaultRouteSelectionExpression === true ? '$request.method $request.path' : undefined, + routeSelectionExpression: props?.routeSelectionExpression === true ? '$request.method $request.path' : undefined, }; const resource = new CfnApi(this, 'Resource', apiProps); From 9fd9bad886f2aae5a9b8e4cd61f5af26ecf9de38 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Mon, 9 Sep 2024 21:34:44 +0900 Subject: [PATCH 3/7] add unit test --- .../aws-apigatewayv2/test/http/api.test.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts b/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts index e703dbd9d7d56..cbe670732815a 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts +++ b/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts @@ -234,6 +234,19 @@ describe('HttpApi', () => { }); }); + test('routeSelectionExpression is enabled', () => { + const stack = new Stack(); + new HttpApi(stack, 'api', { + routeSelectionExpression: true, + }); + + Template.fromStack(stack).hasResourceProperties('AWS::ApiGatewayV2::Api', { + Name: 'api', + ProtocolType: 'HTTP', + RouteSelectionExpression: '$request.method $request.path', + }); + }); + test('can add a vpc links', () => { // GIVEN const stack = new Stack(); From eab94f80402e65526dbed82f779120dce96561d8 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Tue, 10 Sep 2024 12:58:28 +0900 Subject: [PATCH 4/7] update readme --- packages/aws-cdk-lib/aws-apigatewayv2/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/README.md b/packages/aws-cdk-lib/aws-apigatewayv2/README.md index 8b74889d941cb..c66ea4a7444a8 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/README.md +++ b/packages/aws-cdk-lib/aws-apigatewayv2/README.md @@ -93,6 +93,15 @@ new apigwv2.HttpApi(this, 'HttpProxyApi', { }); ``` +The `routeSelectionExpression` option can be configured. +In the HTTP API, only the value `$request.method $request.path` is allowed, and it can be configured by enabling `routeSelectionExpression`. + +```ts +new apigwv2.HttpApi(this, 'HttpProxyApi', { + routeSelectionExpression: true, +}); +``` + ### Cross Origin Resource Sharing (CORS) [Cross-origin resource sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) is a browser security From f9c9457674a4b7d062c12a029ee8e7b152deda88 Mon Sep 17 00:00:00 2001 From: Kazuho Cryer-Shinozuka Date: Fri, 13 Sep 2024 07:51:25 +0900 Subject: [PATCH 5/7] Update packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts Co-authored-by: Kenta Goto (k.goto) <24818752+go-to-k@users.noreply.github.com> --- packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts index db27faee0b3a1..a38ec88bcf536 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts +++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts @@ -443,7 +443,7 @@ export class HttpApi extends HttpApiBase { corsConfiguration, description: props?.description, disableExecuteApiEndpoint: this.disableExecuteApiEndpoint, - routeSelectionExpression: props?.routeSelectionExpression === true ? '$request.method $request.path' : undefined, + routeSelectionExpression: props?.routeSelectionExpression ? '$request.method $request.path' : undefined, }; const resource = new CfnApi(this, 'Resource', apiProps); From f3634b2d47202204e6b262b9235393b73c39f4b8 Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Fri, 13 Sep 2024 08:02:33 +0900 Subject: [PATCH 6/7] review --- packages/aws-cdk-lib/aws-apigatewayv2/README.md | 3 +-- .../aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts | 2 +- .../aws-apigatewayv2/test/http/api.test.ts | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/README.md b/packages/aws-cdk-lib/aws-apigatewayv2/README.md index c66ea4a7444a8..fdde2f476c216 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/README.md +++ b/packages/aws-cdk-lib/aws-apigatewayv2/README.md @@ -93,8 +93,7 @@ new apigwv2.HttpApi(this, 'HttpProxyApi', { }); ``` -The `routeSelectionExpression` option can be configured. -In the HTTP API, only the value `$request.method $request.path` is allowed, and it can be configured by enabling `routeSelectionExpression`. +The `routeSelectionExpression` option allows configuring the HTTP API to accept only `${request.method} ${request.path}`. Setting it to `true` automatically applies this value. ```ts new apigwv2.HttpApi(this, 'HttpProxyApi', { diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts index a38ec88bcf536..53437c47a5db3 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts +++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts @@ -443,7 +443,7 @@ export class HttpApi extends HttpApiBase { corsConfiguration, description: props?.description, disableExecuteApiEndpoint: this.disableExecuteApiEndpoint, - routeSelectionExpression: props?.routeSelectionExpression ? '$request.method $request.path' : undefined, + routeSelectionExpression: props?.routeSelectionExpression ? '${request.method} ${request.path}' : undefined, }; const resource = new CfnApi(this, 'Resource', apiProps); diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts b/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts index cbe670732815a..295986b4bc2bc 100644 --- a/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts +++ b/packages/aws-cdk-lib/aws-apigatewayv2/test/http/api.test.ts @@ -243,7 +243,20 @@ describe('HttpApi', () => { Template.fromStack(stack).hasResourceProperties('AWS::ApiGatewayV2::Api', { Name: 'api', ProtocolType: 'HTTP', - RouteSelectionExpression: '$request.method $request.path', + RouteSelectionExpression: '${request.method} ${request.path}', + }); + }); + + test.each([false, undefined])('routeSelectionExpression is not enabled', (routeSelectionExpression) => { + const stack = new Stack(); + new HttpApi(stack, 'api', { + routeSelectionExpression, + }); + + Template.fromStack(stack).hasResourceProperties('AWS::ApiGatewayV2::Api', { + Name: 'api', + ProtocolType: 'HTTP', + RouteSelectionExpression: Match.absent(), }); }); From 4eae08d6946d3a2febc6c39e951bd5611f02b95d Mon Sep 17 00:00:00 2001 From: Kazuho CryerShinozuka Date: Fri, 13 Sep 2024 19:08:50 +0900 Subject: [PATCH 7/7] update integ --- .../aws-cdk-aws-apigatewayv2.assets.json | 6 +-- .../aws-cdk-aws-apigatewayv2.template.json | 2 +- .../test/http/integ.api.js.snapshot/cdk.out | 2 +- ...efaultTestDeployAssert77633A40.assets.json | 2 +- .../http/integ.api.js.snapshot/integ.json | 2 +- .../http/integ.api.js.snapshot/manifest.json | 4 +- .../test/http/integ.api.js.snapshot/tree.json | 46 +++++++++---------- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json index b331064340137..d4faf85d53ac2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.assets.json @@ -1,7 +1,7 @@ { - "version": "36.0.5", + "version": "36.0.24", "files": { - "f65d8ddb0185bf19b874b00fc97f8affa5dfd707b669e7c9545c6d9e2f97c637": { + "9f85e0964776ba83e66fcd671c3a1742f019c357f8fc867e1890e86af1fdec7b": { "source": { "path": "aws-cdk-aws-apigatewayv2.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "f65d8ddb0185bf19b874b00fc97f8affa5dfd707b669e7c9545c6d9e2f97c637.json", + "objectKey": "9f85e0964776ba83e66fcd671c3a1742f019c357f8fc867e1890e86af1fdec7b.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json index 6e2d36660aacc..27b13d1802598 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json @@ -5,7 +5,7 @@ "Properties": { "Name": "HttpApi", "ProtocolType": "HTTP", - "RouteSelectionExpression": "$request.method $request.path" + "RouteSelectionExpression": "${request.method} ${request.path}" } }, "HttpApiDefaultStage3EEB07D6": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out index bd5311dc372de..4efaa16f29af9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"36.0.5"} \ No newline at end of file +{"version":"36.0.24"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json index 05227ce830419..ac2d13efda342 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/httpapiDefaultTestDeployAssert77633A40.assets.json @@ -1,5 +1,5 @@ { - "version": "36.0.5", + "version": "36.0.24", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json index fa5fd868ff827..80fc2143882d2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "36.0.5", + "version": "36.0.24", "testCases": { "http-api/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json index 920ce784b6153..27baec36eb925 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "36.0.5", + "version": "36.0.24", "artifacts": { "aws-cdk-aws-apigatewayv2.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f65d8ddb0185bf19b874b00fc97f8affa5dfd707b669e7c9545c6d9e2f97c637.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9f85e0964776ba83e66fcd671c3a1742f019c357f8fc867e1890e86af1fdec7b.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json index e9011e8174f8c..68ac7cffc7318 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/tree.json @@ -20,12 +20,12 @@ "aws:cdk:cloudformation:props": { "name": "HttpApi", "protocolType": "HTTP", - "routeSelectionExpression": "$request.method $request.path" + "routeSelectionExpression": "${request.method} ${request.path}" } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.aws_apigatewayv2.CfnApi", + "version": "0.0.0" } }, "DefaultStage": { @@ -46,42 +46,42 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.aws_apigatewayv2.CfnStage", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.aws_apigatewayv2.HttpStage", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.aws_apigatewayv2.HttpApi", + "version": "0.0.0" } }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "aws-cdk-aws-apigatewayv2/BootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "aws-cdk-aws-apigatewayv2/CheckBootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" } }, "http-api": { @@ -108,22 +108,22 @@ "id": "BootstrapVersion", "path": "http-api/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "http-api/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" } } }, @@ -148,8 +148,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.3.0" + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" } } } \ No newline at end of file