Merge branch 'main' into merge-back/2.123.0

aws · Jan 24, 2024 · 4188eb3 · 4188eb3
2 parents a594112 + 169fd91
commit 4188eb3
Show file tree

Hide file tree

Showing 18 changed files with 665 additions and 18 deletions.
diff --git a/...ng.js.snapshot/Route53LatencyBasedRoutingIntegDefaultTestDeployAssert0B7B9B14.assets.json b/...ng.js.snapshot/Route53LatencyBasedRoutingIntegDefaultTestDeployAssert0B7B9B14.assets.json
diff --git a/....js.snapshot/Route53LatencyBasedRoutingIntegDefaultTestDeployAssert0B7B9B14.template.json b/....js.snapshot/Route53LatencyBasedRoutingIntegDefaultTestDeployAssert0B7B9B14.template.json
diff --git a/...ing/framework-integ/test/aws-route53/test/integ.latency-based-routing.js.snapshot/cdk.out b/...ing/framework-integ/test/aws-route53/test/integ.latency-based-routing.js.snapshot/cdk.out
diff --git a/.../framework-integ/test/aws-route53/test/integ.latency-based-routing.js.snapshot/integ.json b/.../framework-integ/test/aws-route53/test/integ.latency-based-routing.js.snapshot/integ.json
diff --git a/...ws-route53/test/integ.latency-based-routing.js.snapshot/latency-based-routing.assets.json b/...ws-route53/test/integ.latency-based-routing.js.snapshot/latency-based-routing.assets.json
diff --git a/...-route53/test/integ.latency-based-routing.js.snapshot/latency-based-routing.template.json b/...-route53/test/integ.latency-based-routing.js.snapshot/latency-based-routing.template.json
@@ -0,0 +1,92 @@
+{
+ "Resources": {
+  "HostedZoneDB99F866": {
+   "Type": "AWS::Route53::HostedZone",
+   "Properties": {
+    "Name": "cdk.dev."
+   }
+  },
+  "LatencyBasedRouting0C1664EAC": {
+   "Type": "AWS::Route53::RecordSet",
+   "Properties": {
+    "HostedZoneId": {
+     "Ref": "HostedZoneDB99F866"
+    },
+    "Name": "www.cdk.dev.",
+    "Region": "us-east-1",
+    "ResourceRecords": [
+     "1.2.3.4"
+    ],
+    "SetIdentifier": "REGION_us-east-1_ID_latencybasedroutintencyBasedRouting09258C5CC",
+    "TTL": "1800",
+    "Type": "A"
+   }
+  },
+  "LatencyBasedRouting1D10EA109": {
+   "Type": "AWS::Route53::RecordSet",
+   "Properties": {
+    "HostedZoneId": {
+     "Ref": "HostedZoneDB99F866"
+    },
+    "Name": "www.cdk.dev.",
+    "Region": "ap-northeast-1",
+    "ResourceRecords": [
+     "2.3.4.5"
+    ],
+    "SetIdentifier": "REGION_ap-northeast-1_ID_latencybasedroucyBasedRouting193C4855F",
+    "TTL": "1800",
+    "Type": "A"
+   }
+  },
+  "LatencyBasedRouting26C32588A": {
+   "Type": "AWS::Route53::RecordSet",
+   "Properties": {
+    "HostedZoneId": {
+     "Ref": "HostedZoneDB99F866"
+    },
+    "Name": "www.cdk.dev.",
+    "Region": "eu-west-1",
+    "ResourceRecords": [
+     "3.4.5.6"
+    ],
+    "SetIdentifier": "REGION_eu-west-1_ID_latencybasedroutintencyBasedRouting25966E4AD",
+    "TTL": "1800",
+    "Type": "A"
+   }
+  }
+ },
+ "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/...amework-integ/test/aws-route53/test/integ.latency-based-routing.js.snapshot/manifest.json b/...amework-integ/test/aws-route53/test/integ.latency-based-routing.js.snapshot/manifest.json