Skip to content

Commit e8f8ad4

Browse files
authored
Merge branch 'main' into mrgrain/chore/globalaccelerator
2 parents 7bd1b63 + 2e7c55b commit e8f8ad4

23 files changed

+792
-65
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cidr-routing-config.js.snapshot/CidrRoutingConfig.assets.json

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
{
2+
"Resources": {
3+
"HostedZoneDB99F866": {
4+
"Type": "AWS::Route53::HostedZone",
5+
"Properties": {
6+
"Name": "cdk.test."
7+
}
8+
},
9+
"CidrCollection": {
10+
"Type": "AWS::Route53::CidrCollection",
11+
"Properties": {
12+
"Locations": [
13+
{
14+
"CidrList": [
15+
"192.168.1.0/24"
16+
],
17+
"LocationName": "test_location"
18+
}
19+
],
20+
"Name": "test-collection"
21+
}
22+
},
23+
"CidrRoutingConfig2AF5DEDB": {
24+
"Type": "AWS::Route53::RecordSet",
25+
"Properties": {
26+
"CidrRoutingConfig": {
27+
"CollectionId": {
28+
"Fn::GetAtt": [
29+
"CidrCollection",
30+
"Id"
31+
]
32+
},
33+
"LocationName": "test_location"
34+
},
35+
"HostedZoneId": {
36+
"Ref": "HostedZoneDB99F866"
37+
},
38+
"Name": "cdk.test.",
39+
"ResourceRecords": [
40+
"1.2.3.4"
41+
],
42+
"SetIdentifier": "test",
43+
"TTL": "1800",
44+
"Type": "A"
45+
}
46+
},
47+
"HostedZone280C0117C": {
48+
"Type": "AWS::Route53::HostedZone",
49+
"Properties": {
50+
"Name": "cdk.test2."
51+
}
52+
},
53+
"DefaultCidrCollection": {
54+
"Type": "AWS::Route53::CidrCollection",
55+
"Properties": {
56+
"Locations": [
57+
{
58+
"CidrList": [
59+
"192.168.1.0/24"
60+
],
61+
"LocationName": "default_location"
62+
}
63+
],
64+
"Name": "default-collection"
65+
}
66+
},
67+
"DefaultCidrRoutingConfigF2FD2A05": {
68+
"Type": "AWS::Route53::RecordSet",
69+
"Properties": {
70+
"CidrRoutingConfig": {
71+
"CollectionId": {
72+
"Fn::GetAtt": [
73+
"DefaultCidrCollection",
74+
"Id"
75+
]
76+
},
77+
"LocationName": "*"
78+
},
79+
"HostedZoneId": {
80+
"Ref": "HostedZone280C0117C"
81+
},
82+
"Name": "cdk.test2.",
83+
"ResourceRecords": [
84+
"5.6.7.8"
85+
],
86+
"SetIdentifier": "test2",
87+
"TTL": "1800",
88+
"Type": "A"
89+
}
90+
}
91+
},
92+
"Parameters": {
93+
"BootstrapVersion": {
94+
"Type": "AWS::SSM::Parameter::Value<String>",
95+
"Default": "/cdk-bootstrap/hnb659fds/version",
96+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
97+
}
98+
},
99+
"Rules": {
100+
"CheckBootstrapVersion": {
101+
"Assertions": [
102+
{
103+
"Assert": {
104+
"Fn::Not": [
105+
{
106+
"Fn::Contains": [
107+
[
108+
"1",
109+
"2",
110+
"3",
111+
"4",
112+
"5"
113+
],
114+
{
115+
"Ref": "BootstrapVersion"
116+
}
117+
]
118+
}
119+
]
120+
},
121+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
122+
}
123+
]
124+
}
125+
}
126+
}

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cidr-routing-config.js.snapshot/CidrRoutingConfigIntegDefaultTestDeployAssert2D4BBAED.assets.json

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cidr-routing-config.js.snapshot/CidrRoutingConfigIntegDefaultTestDeployAssert2D4BBAED.template.json

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cidr-routing-config.js.snapshot/cdk.out

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cidr-routing-config.js.snapshot/integ.json

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)