Merge branch 'main' into add-stagename-to-deployment

aws · Mar 25, 2024 · a6f802e · a6f802e
2 parents bfe1792 + f60e6e9
commit a6f802e
Show file tree

Hide file tree

Showing 205 changed files with 41,070 additions and 2,138 deletions.
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@aa08304bd477b800d468db44fe10f6c61f7f7b11
+        uses: tj-actions/changed-files@20576b4b9ed46d41e2d45a2256e5e2316dde6834
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "jsii-diff": "1.95.0",
     "jsii-pacmak": "1.95.0",
     "jsii-reflect": "1.95.0",
-    "jsii-rosetta": "~5.3.27",
+    "jsii-rosetta": "~5.3.29",
     "lerna": "^7.4.2",
     "nx": "^16.10.0",
     "patch-package": "^6.5.1",

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1576.0",
-    "axios": "^1.6.7",
+    "aws-sdk": "^2.1583.0",
+    "axios": "^1.6.8",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
     "jest": "^29.7.0",

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -41,7 +41,7 @@
     "@aws-cdk/integ-tests-alpha": "0.0.0",
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1576.0",
+    "aws-sdk": "^2.1583.0",
     "aws-sdk-mock": "5.6.0",
     "cdk8s": "2.68.46",
     "cdk8s-plus-27": "2.7.84",

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