Merge branch 'main' into merge-back/2.116.1

aws · Dec 22, 2023 · 6d88faa · 6d88faa
2 parents 222de71 + cd54c42
commit 6d88faa
Show file tree

Hide file tree

Showing 21 changed files with 633 additions and 17 deletions.
diff --git a/...ype.js.snapshot/GlobalAcceleratorIpAddressTypeDefaultTestDeployAssertFE50B593.assets.json b/...ype.js.snapshot/GlobalAcceleratorIpAddressTypeDefaultTestDeployAssertFE50B593.assets.json
diff --git a/...e.js.snapshot/GlobalAcceleratorIpAddressTypeDefaultTestDeployAssertFE50B593.template.json b/...e.js.snapshot/GlobalAcceleratorIpAddressTypeDefaultTestDeployAssertFE50B593.template.json
diff --git a/...st/aws-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/cdk.out b/...st/aws-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/cdk.out
diff --git a/...balaccelerator-ip-address-type.js.snapshot/global-accelerator-ip-address-type.assets.json b/...balaccelerator-ip-address-type.js.snapshot/global-accelerator-ip-address-type.assets.json
diff --git a/...laccelerator-ip-address-type.js.snapshot/global-accelerator-ip-address-type.template.json b/...laccelerator-ip-address-type.js.snapshot/global-accelerator-ip-address-type.template.json
@@ -0,0 +1,46 @@
+{
+ "Resources": {
+  "Accelerator8EB0B6B1": {
+   "Type": "AWS::GlobalAccelerator::Accelerator",
+   "Properties": {
+    "Enabled": true,
+    "IpAddressType": "DUAL_STACK",
+    "Name": "acceleratorWithIpAddressType"
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...aws-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/integ.json b/...aws-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/integ.json
diff --git a/...-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/manifest.json b/...-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/manifest.json
diff --git a/.../aws-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/tree.json b/.../aws-globalaccelerator/test/integ.globalaccelerator-ip-address-type.js.snapshot/tree.json