Merge branch 'main' into chore-bedrock-models

aws · Mar 23, 2024 · 3def977 · 3def977
2 parents afaea96 + 7534dcd
commit 3def977
Show file tree

Hide file tree

Showing 18 changed files with 358 additions and 184 deletions.
diff --git a/...grations/test/websocket/integ.aws.js.snapshot/integ-aws-websocket-integration.assets.json b/...grations/test/websocket/integ.aws.js.snapshot/integ-aws-websocket-integration.assets.json
diff --git a/...ations/test/websocket/integ.aws.js.snapshot/integ-aws-websocket-integration.template.json b/...ations/test/websocket/integ.aws.js.snapshot/integ-aws-websocket-integration.template.json
@@ -97,6 +97,7 @@
  "ApiId": {
  "Ref": "mywsapi32E6CE11"
  },
+ "ContentHandlingStrategy": "CONVERT_TO_BINARY",
  "CredentialsArn": {
  "Fn::GetAtt": [
  "ApiGatewayRoleD2518903",
@@ -117,6 +118,10 @@
  ]
  ]
  },
+ "PassthroughBehavior": "WHEN_NO_TEMPLATES",
+ "RequestParameters": {
+ "integration.request.header.Content-Type": "'application/x-www-form-urlencoded'"
+ },
  "RequestTemplates": {
  "application/json": {
  "Fn::Join": [
@@ -130,7 +135,9 @@
  ]
  ]
  }
- }
+ },
+ "TemplateSelectionExpression": "\\$default",
+ "TimeoutInMillis": 10000
  }
  },
  "mywsapiconnectRoute45A0ED6A": {

diff --git a/...teg/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/manifest.json b/...teg/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/manifest.json
diff --git a/...k-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/tree.json b/...k-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.js.snapshot/tree.json
diff --git a/...dk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.ts b/...dk-testing/framework-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.aws.ts
@@ -1,7 +1,7 @@
-import { HttpMethod, WebSocketApi, WebSocketStage } from 'aws-cdk-lib/aws-apigatewayv2';
+import { ContentHandling, HttpMethod, PassthroughBehavior, WebSocketApi, WebSocketStage } from 'aws-cdk-lib/aws-apigatewayv2';
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
 import * as iam from 'aws-cdk-lib/aws-iam';
-import { App, RemovalPolicy, Stack } from 'aws-cdk-lib';
+import { App, Duration, RemovalPolicy, Stack } from 'aws-cdk-lib';
 import { WebSocketAwsIntegration, WebSocketMockIntegration } from 'aws-cdk-lib/aws-apigatewayv2-integrations';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 
@@ -42,6 +42,9 @@ webSocketApi.addRoute('$connect', {
  integrationUri: `arn:aws:apigateway:${stack.region}:dynamodb:action/PutItem`,
  integrationMethod: HttpMethod.POST,
  credentialsRole: apiRole,
+ requestParameters: {
+ 'integration.request.header.Content-Type': '\'application/x-www-form-urlencoded\'',
+ },
  requestTemplates: {
  'application/json': JSON.stringify({
  TableName: table.tableName,
@@ -52,6 +55,10 @@ webSocketApi.addRoute('$connect', {
  },
  }),
  },
+ templateSelectionExpression: '\\$default',
+ passthroughBehavior: PassthroughBehavior.WHEN_NO_TEMPLATES,
+ contentHandling: ContentHandling.CONVERT_TO_BINARY,
+ timeout: Duration.seconds(10),
  }),
 });
 

diff --git a/...ewayv2-integrations/test/websocket/integ.lambda.js.snapshot/WebSocketApiInteg.assets.json b/...ewayv2-integrations/test/websocket/integ.lambda.js.snapshot/WebSocketApiInteg.assets.json
diff --git a/...ayv2-integrations/test/websocket/integ.lambda.js.snapshot/WebSocketApiInteg.template.json b/...ayv2-integrations/test/websocket/integ.lambda.js.snapshot/WebSocketApiInteg.template.json
@@ -431,6 +431,7 @@
  "ApiId": {
  "Ref": "mywsapi32E6CE11"
  },
+ "ContentHandlingStrategy": "CONVERT_TO_TEXT",
  "IntegrationType": "AWS_PROXY",
  "IntegrationUri": {
  "Fn::Join": [
@@ -454,7 +455,8 @@
  "/invocations"
  ]
  ]
- }
+ },
+ "TimeoutInMillis": 10000
  }
  },
  "mywsapidefaultRouteE9382DF8": {

diff --git a/...-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/cdk.out b/...-integ/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/cdk.out
diff --git a/...teg/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/integ.json b/...teg/test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/integ.json
diff --git a/.../test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/manifest.json b/.../test/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/manifest.json