Skip to content

Commit 3def977

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into chore-bedrock-models
2 parents afaea96 + 7534dcd commit 3def977

18 files changed

Lines changed: 358 additions & 184 deletions

File tree

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/integ-aws-websocket-integration.assets.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/integ-aws-websocket-integration.template.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"ApiId": {
9898
"Ref": "mywsapi32E6CE11"
9999
},
100+
"ContentHandlingStrategy": "CONVERT_TO_BINARY",
100101
"CredentialsArn": {
101102
"Fn::GetAtt": [
102103
"ApiGatewayRoleD2518903",
@@ -117,6 +118,10 @@
117118
]
118119
]
119120
},
121+
"PassthroughBehavior": "WHEN_NO_TEMPLATES",
122+
"RequestParameters": {
123+
"integration.request.header.Content-Type": "'application/x-www-form-urlencoded'"
124+
},
120125
"RequestTemplates": {
121126
"application/json": {
122127
"Fn::Join": [
@@ -130,7 +135,9 @@
130135
]
131136
]
132137
}
133-
}
138+
},
139+
"TemplateSelectionExpression": "\\$default",
140+
"TimeoutInMillis": 10000
134141
}
135142
},
136143
"mywsapiconnectRoute45A0ED6A": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/manifest.json‎

Lines changed: 1 addition & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/tree.json‎

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { HttpMethod, WebSocketApi, WebSocketStage } from 'aws-cdk-lib/aws-apigatewayv2';
1+
import { ContentHandling, HttpMethod, PassthroughBehavior, WebSocketApi, WebSocketStage } from 'aws-cdk-lib/aws-apigatewayv2';
22
import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
33
import * as iam from 'aws-cdk-lib/aws-iam';
4-
import { App, RemovalPolicy, Stack } from 'aws-cdk-lib';
4+
import { App, Duration, RemovalPolicy, Stack } from 'aws-cdk-lib';
55
import { WebSocketAwsIntegration, WebSocketMockIntegration } from 'aws-cdk-lib/aws-apigatewayv2-integrations';
66
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
77

@@ -42,6 +42,9 @@ webSocketApi.addRoute('$connect', {
4242
integrationUri: `arn:aws:apigateway:${stack.region}:dynamodb:action/PutItem`,
4343
integrationMethod: HttpMethod.POST,
4444
credentialsRole: apiRole,
45+
requestParameters: {
46+
'integration.request.header.Content-Type': '\'application/x-www-form-urlencoded\'',
47+
},
4548
requestTemplates: {
4649
'application/json': JSON.stringify({
4750
TableName: table.tableName,
@@ -52,6 +55,10 @@ webSocketApi.addRoute('$connect', {
5255
},
5356
}),
5457
},
58+
templateSelectionExpression: '\\$default',
59+
passthroughBehavior: PassthroughBehavior.WHEN_NO_TEMPLATES,
60+
contentHandling: ContentHandling.CONVERT_TO_BINARY,
61+
timeout: Duration.seconds(10),
5562
}),
5663
});
5764

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/WebSocketApiInteg.assets.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/WebSocketApiInteg.template.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
"ApiId": {
432432
"Ref": "mywsapi32E6CE11"
433433
},
434+
"ContentHandlingStrategy": "CONVERT_TO_TEXT",
434435
"IntegrationType": "AWS_PROXY",
435436
"IntegrationUri": {
436437
"Fn::Join": [
@@ -454,7 +455,8 @@
454455
"/invocations"
455456
]
456457
]
457-
}
458+
},
459+
"TimeoutInMillis": 10000
458460
}
459461
},
460462
"mywsapidefaultRouteE9382DF8": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/cdk.out‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/integ.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/manifest.json‎

Lines changed: 6 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)