Merge branch 'main' into chore/remove-integ-test-intermediate-snapshots

aws · Nov 1, 2022 · 8d5c422 · 8d5c422
2 parents 0363f4e + 1c707eb
commit 8d5c422
Show file tree

Hide file tree

Showing 389 changed files with 3,671 additions and 3,121 deletions.
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.js.snapshot/cdk.out b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...ges/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.http-proxy.js.snapshot/cdk.out b/...ges/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.http-proxy.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...s/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.lambda-proxy.js.snapshot/cdk.out b/...s/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.lambda-proxy.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.nlb.js.snapshot/cdk.out b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.nlb.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...s-cdk/aws-apigatewayv2-integrations/test/http/integ.service-discovery.js.snapshot/cdk.out b/...s-cdk/aws-apigatewayv2-integrations/test/http/integ.service-discovery.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...es/@aws-cdk/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/cdk.out b/...es/@aws-cdk/aws-apigatewayv2-integrations/test/websocket/integ.lambda.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...ages/@aws-cdk/aws-apigatewayv2-integrations/test/websocket/integ.mock.js.snapshot/cdk.out b/...ages/@aws-cdk/aws-apigatewayv2-integrations/test/websocket/integ.mock.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/packages/@aws-cdk/aws-apprunner/test/integ.service-ecr-public.js.snapshot/cdk.out b/packages/@aws-cdk/aws-apprunner/test/integ.service-ecr-public.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/packages/@aws-cdk/aws-apprunner/test/integ.service-ecr.js.snapshot/cdk.out b/packages/@aws-cdk/aws-apprunner/test/integ.service-ecr.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/packages/@aws-cdk/aws-apprunner/test/integ.service-github.js.snapshot/cdk.out b/packages/@aws-cdk/aws-apprunner/test/integ.service-github.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/packages/@aws-cdk/aws-apprunner/test/integ.service-vpc-connector.js.snapshot/cdk.out b/packages/@aws-cdk/aws-apprunner/test/integ.service-vpc-connector.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}
diff --git a/...ing-hooktargets/test/integ.queue-hook.js.snapshot/integ-autoscalinghook-queue.assets.json b/...ing-hooktargets/test/integ.queue-hook.js.snapshot/integ-autoscalinghook-queue.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "21.0.0",
   "files": {
-    "512271f7a4721942ff4cf09cc4e4500d86b0e93fd0a1214307f7caf0a387bbc8": {
+    "8a3db2dee171afc18cb3c206a03f7f70b4bda8fd9614c0da580b2f78810392fa": {
       "source": {
         "path": "integ-autoscalinghook-queue.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "512271f7a4721942ff4cf09cc4e4500d86b0e93fd0a1214307f7caf0a387bbc8.json",
+          "objectKey": "8a3db2dee171afc18cb3c206a03f7f70b4bda8fd9614c0da580b2f78810392fa.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...g-hooktargets/test/integ.queue-hook.js.snapshot/integ-autoscalinghook-queue.template.json b/...g-hooktargets/test/integ.queue-hook.js.snapshot/integ-autoscalinghook-queue.template.json
@@ -427,17 +427,7 @@
        "Action": "sts:AssumeRole",
        "Effect": "Allow",
        "Principal": {
-        "Service": {
-         "Fn::Join": [
-          "",
-          [
-           "ec2.",
-           {
-            "Ref": "AWS::URLSuffix"
-           }
-          ]
-         ]
-        }
+        "Service": "ec2.amazonaws.com"
        }
       }
      ],

diff --git a/...ages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/manifest.json b/...ages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/manifest.json
@@ -23,7 +23,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}/512271f7a4721942ff4cf09cc4e4500d86b0e93fd0a1214307f7caf0a387bbc8.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8a3db2dee171afc18cb3c206a03f7f70b4bda8fd9614c0da580b2f78810392fa.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -286,7 +286,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}/2952a5f1ee2df6894e782c86d2be1fdd7d53f82d214752f25a6a79e822dabf3e.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/bdae540cd4baafd04bde1c5823b5c218b9a79b8d856a8e9a26151bedc547eacd.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...est/integ.queue-hook.js.snapshot/queuehooktestDefaultTestDeployAssertCF5493DF.assets.json b/...est/integ.queue-hook.js.snapshot/queuehooktestDefaultTestDeployAssertCF5493DF.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "2952a5f1ee2df6894e782c86d2be1fdd7d53f82d214752f25a6a79e822dabf3e": {
+    "bdae540cd4baafd04bde1c5823b5c218b9a79b8d856a8e9a26151bedc547eacd": {
       "source": {
         "path": "queuehooktestDefaultTestDeployAssertCF5493DF.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "2952a5f1ee2df6894e782c86d2be1fdd7d53f82d214752f25a6a79e822dabf3e.json",
+          "objectKey": "bdae540cd4baafd04bde1c5823b5c218b9a79b8d856a8e9a26151bedc547eacd.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...t/integ.queue-hook.js.snapshot/queuehooktestDefaultTestDeployAssertCF5493DF.template.json b/...t/integ.queue-hook.js.snapshot/queuehooktestDefaultTestDeployAssertCF5493DF.template.json
@@ -18,7 +18,7 @@
      "DesiredCapacity": 1
     },
     "flattenResponse": "false",
-    "salt": "1664821428400"
+    "salt": "1666982510481"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -133,7 +133,7 @@
      }
     },
     "flattenResponse": "true",
-    "salt": "1664821428400"
+    "salt": "1666982510481"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -226,7 +226,7 @@
      "Fn::Join": [
       "",
       [
-       "{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":5,\"MaxAttempts\":360,\"BackoffRate\":1}],\"Catch\":[{\"ErrorEquals\":[\"States.ALL\"],\"Next\":\"framework-onTimeout-task\"}],\"Type\":\"Task\",\"Resource\":\"",
+       "{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":5,\"MaxAttempts\":8,\"BackoffRate\":1}],\"Catch\":[{\"ErrorEquals\":[\"States.ALL\"],\"Next\":\"framework-onTimeout-task\"}],\"Type\":\"Task\",\"Resource\":\"",
        {
         "Fn::GetAtt": [
          "SingletonFunction76b3e830a873425f8453eddd85c86925Handler81461ECE",
@@ -385,7 +385,7 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1664821428402"
+    "salt": "1666982510483"
    },
    "DependsOn": [
     "AwsApiCallAutoScalingsetDesiredCapacity",

diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/tree.json b/packages/@aws-cdk/aws-autoscaling-hooktargets/test/integ.queue-hook.js.snapshot/tree.json
@@ -9,7 +9,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.1.102"
+          "version": "10.1.140"
         }
       },
       "integ-autoscalinghook-queue": {
@@ -741,17 +741,7 @@
                               "Action": "sts:AssumeRole",
                               "Effect": "Allow",
                               "Principal": {
-                                "Service": {
-                                  "Fn::Join": [
-                                    "",
-                                    [
-                                      "ec2.",
-                                      {
-                                        "Ref": "AWS::URLSuffix"
-                                      }
-                                    ]
-                                  ]
-                                }
+                                "Service": "ec2.amazonaws.com"
                               }
                             }
                           ],
@@ -1039,7 +1029,7 @@
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.1.102"
+              "version": "10.1.140"
             }
           }
         },
@@ -1061,7 +1051,7 @@
                 "path": "queue-hook-test/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.1.102"
+                  "version": "10.1.140"
                 }
               },
               "DeployAssert": {
@@ -1081,7 +1071,7 @@
                             "path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallAutoScalingsetDesiredCapacity/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.1.102"
+                              "version": "10.1.140"
                             }
                           }
                         },
@@ -1145,7 +1135,7 @@
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.1.102"
+                      "version": "10.1.140"
                     }
                   },
                   "AwsApiCallSQSreceiveMessage": {
@@ -1161,7 +1151,7 @@
                             "path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallSQSreceiveMessage/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.1.102"
+                              "version": "10.1.140"
                             }
                           }
                         },
@@ -1201,7 +1191,7 @@
                                 "path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallSQSreceiveMessage/WaitFor/IsCompleteProvider/AssertionsProvider",
                                 "constructInfo": {
                                   "fqn": "constructs.Construct",
-                                  "version": "10.1.102"
+                                  "version": "10.1.140"
                                 }
                               },
                               "Invoke": {
@@ -1227,7 +1217,7 @@
                                 "path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallSQSreceiveMessage/WaitFor/TimeoutProvider/AssertionsProvider",
                                 "constructInfo": {
                                   "fqn": "constructs.Construct",
-                                  "version": "10.1.102"
+                                  "version": "10.1.140"
                                 }
                               },
                               "Invoke": {
@@ -1311,7 +1301,7 @@
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.1.102"
+                      "version": "10.1.140"
                     }
                   },
                   "SingletonFunction5c1898e096fb4e3e95d5f6c67f3ce41a": {
@@ -1345,7 +1335,7 @@
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.1.102"
+                      "version": "10.1.140"
                     }
                   },
                   "AwsApiCallAutoScalingcompleteLifecycleAction": {
@@ -1361,7 +1351,7 @@
                             "path": "queue-hook-test/DefaultTest/DeployAssert/AwsApiCallAutoScalingcompleteLifecycleAction/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.1.102"
+                              "version": "10.1.140"
                             }
                           }
                         },

diff --git a/...aws-autoscaling/test/integ.amazonlinux2.js.snapshot/aws-cdk-autoscaling-integ.assets.json b/...aws-autoscaling/test/integ.amazonlinux2.js.snapshot/aws-cdk-autoscaling-integ.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "20.0.0",
+  "version": "21.0.0",
   "files": {
-    "516c8876cabc562bdf34136436fba1348731ecb81e67578b762095b7a048fc98": {
+    "62dd6f0ccfbbd1354c9a66f975cb337502f0359aa6f302762d33e013a53ee141": {
       "source": {
         "path": "aws-cdk-autoscaling-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "516c8876cabc562bdf34136436fba1348731ecb81e67578b762095b7a048fc98.json",
+          "objectKey": "62dd6f0ccfbbd1354c9a66f975cb337502f0359aa6f302762d33e013a53ee141.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...s-autoscaling/test/integ.amazonlinux2.js.snapshot/aws-cdk-autoscaling-integ.template.json b/...s-autoscaling/test/integ.amazonlinux2.js.snapshot/aws-cdk-autoscaling-integ.template.json
@@ -422,17 +422,7 @@
        "Action": "sts:AssumeRole",
        "Effect": "Allow",
        "Principal": {
-        "Service": {
-         "Fn::Join": [
-          "",
-          [
-           "ec2.",
-           {
-            "Ref": "AWS::URLSuffix"
-           }
-          ]
-         ]
-        }
+        "Service": "ec2.amazonaws.com"
        }
       }
      ],

diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/integ.json b/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "20.0.0",
+  "version": "21.0.0",
   "testCases": {
     "integ.amazonlinux2": {
       "stacks": [

diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/manifest.json b/packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "20.0.0",
+  "version": "21.0.0",
   "artifacts": {
     "Tree": {
       "type": "cdk:tree",
@@ -23,7 +23,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}/516c8876cabc562bdf34136436fba1348731ecb81e67578b762095b7a048fc98.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/62dd6f0ccfbbd1354c9a66f975cb337502f0359aa6f302762d33e013a53ee141.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [