Merge branch 'main' into merge-back/2.103.1

aws · Oct 27, 2023 · fdf9b68 · fdf9b68
2 parents 3bb19ac + 1141992
commit fdf9b68
Show file tree

Hide file tree

Showing 68 changed files with 3,662 additions and 132 deletions.
diff --git a/...-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/manifest.json
diff --git a/...eg/test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.assets.json b/...eg/test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.assets.json
diff --git a/.../test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.template.json b/.../test/aws-apigateway/test/integ.restapi.js.snapshot/test-apigateway-restapi.template.json
@@ -57,7 +57,7 @@
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
   },
-  "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6": {
+  "myapiDeployment92F2CB49069d16df09c59427069eb74581a0403d": {
    "Type": "AWS::ApiGateway::Deployment",
    "Properties": {
     "Description": "beta stage",
@@ -66,8 +66,8 @@
     }
    },
    "DependsOn": [
-    "myapiv1appliancesallGETC4DF552D",
-    "myapiv1appliancesallCF8C6A16",
+    "myapiv1appliancesallGETB8EB1B77",
+    "myapiv1appliancesallD279897B",
     "myapiv1booksGETC6B996D0",
     "myapiv1booksPOST53E2832E",
     "myapiv1books1D4BE6C1",
@@ -86,7 +86,7 @@
     "CacheClusterEnabled": true,
     "CacheClusterSize": "0.5",
     "DeploymentId": {
-     "Ref": "myapiDeployment92F2CB4993c0f175ba8d5964f5e1cc7bc64fe6e6"
+     "Ref": "myapiDeployment92F2CB49069d16df09c59427069eb74581a0403d"
     },
     "Description": "beta stage",
     "MethodSettings": [
@@ -290,19 +290,19 @@
     }
    }
   },
-  "myapiv1appliancesallCF8C6A16": {
+  "myapiv1appliancesallD279897B": {
    "Type": "AWS::ApiGateway::Resource",
    "Properties": {
     "ParentId": {
      "Ref": "myapiv113487378"
     },
-    "PathPart": "appliances:all",
+    "PathPart": "$appliances:all",
     "RestApiId": {
      "Ref": "myapi4C7BF186"
     }
    }
   },
-  "myapiv1appliancesallGETC4DF552D": {
+  "myapiv1appliancesallGETB8EB1B77": {
    "Type": "AWS::ApiGateway::Method",
    "Properties": {
     "AuthorizationType": "NONE",
@@ -311,7 +311,7 @@
      "Type": "MOCK"
     },
     "ResourceId": {
-     "Ref": "myapiv1appliancesallCF8C6A16"
+     "Ref": "myapiv1appliancesallD279897B"
     },
     "RestApiId": {
      "Ref": "myapi4C7BF186"
@@ -682,7 +682,7 @@
     }
    },
    "DependsOn": [
-    "myapiv1appliancesallGETC4DF552D",
+    "myapiv1appliancesallGETB8EB1B77",
     "myapiv1booksGETC6B996D0",
     "myapiv1booksPOST53E2832E",
     "myapiv1toysGET7348114D",

diff --git a/...-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/tree.json b/...-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.js.snapshot/tree.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.ts
@@ -43,7 +43,7 @@ class Test extends cdk.Stack {
     toys.addMethod('POST');
     toys.addMethod('PUT');
 
-    const appliances = v1.addResource('appliances:all');
+    const appliances = v1.addResource('$appliances:all');
     appliances.addMethod('GET');
 
     const books = v1.addResource('books');

diff --git a/...-default-method-responses.js.snapshot/SfnRestApiWithoutDefaultMethodResponses.assets.json b/...-default-method-responses.js.snapshot/SfnRestApiWithoutDefaultMethodResponses.assets.json