Skip to content

Commit 20df8fb

Browse files
authored
fix(efs): support imported subnet (#34041)
### Issue # (if applicable) Closes #33876 ### Description of changes LogicalId generation cover unresolved token case. ### Description of how you validated changes Unit + Integ ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent ebf1ea2 commit 20df8fb

11 files changed

+813
-2
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-from-imported-subnet.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-efs/test/integ.efs-from-imported-subnet.js.snapshot/efs-from-imported-subnet.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,330 @@
1+
{
2+
"Resources": {
3+
"Vpc8378EB38": {
4+
"Type": "AWS::EC2::VPC",
5+
"Properties": {
6+
"CidrBlock": "10.0.0.0/16",
7+
"EnableDnsHostnames": true,
8+
"EnableDnsSupport": true,
9+
"InstanceTenancy": "default",
10+
"Tags": [
11+
{
12+
"Key": "Name",
13+
"Value": "efs-from-imported-subnet/Vpc"
14+
}
15+
]
16+
}
17+
},
18+
"VpctestSubnet1Subnet43126774": {
19+
"Type": "AWS::EC2::Subnet",
20+
"Properties": {
21+
"AvailabilityZone": {
22+
"Fn::Select": [
23+
0,
24+
{
25+
"Fn::GetAZs": ""
26+
}
27+
]
28+
},
29+
"CidrBlock": "10.0.0.0/17",
30+
"MapPublicIpOnLaunch": true,
31+
"Tags": [
32+
{
33+
"Key": "aws-cdk:subnet-name",
34+
"Value": "test"
35+
},
36+
{
37+
"Key": "aws-cdk:subnet-type",
38+
"Value": "Public"
39+
},
40+
{
41+
"Key": "Name",
42+
"Value": "efs-from-imported-subnet/Vpc/testSubnet1"
43+
}
44+
],
45+
"VpcId": {
46+
"Ref": "Vpc8378EB38"
47+
}
48+
}
49+
},
50+
"VpctestSubnet1RouteTableF77D2377": {
51+
"Type": "AWS::EC2::RouteTable",
52+
"Properties": {
53+
"Tags": [
54+
{
55+
"Key": "Name",
56+
"Value": "efs-from-imported-subnet/Vpc/testSubnet1"
57+
}
58+
],
59+
"VpcId": {
60+
"Ref": "Vpc8378EB38"
61+
}
62+
}
63+
},
64+
"VpctestSubnet1RouteTableAssociationE292CAA1": {
65+
"Type": "AWS::EC2::SubnetRouteTableAssociation",
66+
"Properties": {
67+
"RouteTableId": {
68+
"Ref": "VpctestSubnet1RouteTableF77D2377"
69+
},
70+
"SubnetId": {
71+
"Ref": "VpctestSubnet1Subnet43126774"
72+
}
73+
}
74+
},
75+
"VpctestSubnet1DefaultRouteA2DE75B7": {
76+
"Type": "AWS::EC2::Route",
77+
"Properties": {
78+
"DestinationCidrBlock": "0.0.0.0/0",
79+
"GatewayId": {
80+
"Ref": "VpcIGWD7BA715C"
81+
},
82+
"RouteTableId": {
83+
"Ref": "VpctestSubnet1RouteTableF77D2377"
84+
}
85+
},
86+
"DependsOn": [
87+
"VpcVPCGWBF912B6E"
88+
]
89+
},
90+
"VpctestSubnet1EIPEE8206FB": {
91+
"Type": "AWS::EC2::EIP",
92+
"Properties": {
93+
"Domain": "vpc",
94+
"Tags": [
95+
{
96+
"Key": "Name",
97+
"Value": "efs-from-imported-subnet/Vpc/testSubnet1"
98+
}
99+
]
100+
}
101+
},
102+
"VpctestSubnet1NATGateway4E5EAED1": {
103+
"Type": "AWS::EC2::NatGateway",
104+
"Properties": {
105+
"AllocationId": {
106+
"Fn::GetAtt": [
107+
"VpctestSubnet1EIPEE8206FB",
108+
"AllocationId"
109+
]
110+
},
111+
"SubnetId": {
112+
"Ref": "VpctestSubnet1Subnet43126774"
113+
},
114+
"Tags": [
115+
{
116+
"Key": "Name",
117+
"Value": "efs-from-imported-subnet/Vpc/testSubnet1"
118+
}
119+
]
120+
},
121+
"DependsOn": [
122+
"VpctestSubnet1DefaultRouteA2DE75B7",
123+
"VpctestSubnet1RouteTableAssociationE292CAA1"
124+
]
125+
},
126+
"VpctestSubnet2Subnet3B2E5192": {
127+
"Type": "AWS::EC2::Subnet",
128+
"Properties": {
129+
"AvailabilityZone": {
130+
"Fn::Select": [
131+
1,
132+
{
133+
"Fn::GetAZs": ""
134+
}
135+
]
136+
},
137+
"CidrBlock": "10.0.128.0/17",
138+
"MapPublicIpOnLaunch": true,
139+
"Tags": [
140+
{
141+
"Key": "aws-cdk:subnet-name",
142+
"Value": "test"
143+
},
144+
{
145+
"Key": "aws-cdk:subnet-type",
146+
"Value": "Public"
147+
},
148+
{
149+
"Key": "Name",
150+
"Value": "efs-from-imported-subnet/Vpc/testSubnet2"
151+
}
152+
],
153+
"VpcId": {
154+
"Ref": "Vpc8378EB38"
155+
}
156+
}
157+
},
158+
"VpctestSubnet2RouteTable25D207BE": {
159+
"Type": "AWS::EC2::RouteTable",
160+
"Properties": {
161+
"Tags": [
162+
{
163+
"Key": "Name",
164+
"Value": "efs-from-imported-subnet/Vpc/testSubnet2"
165+
}
166+
],
167+
"VpcId": {
168+
"Ref": "Vpc8378EB38"
169+
}
170+
}
171+
},
172+
"VpctestSubnet2RouteTableAssociationFA920AD0": {
173+
"Type": "AWS::EC2::SubnetRouteTableAssociation",
174+
"Properties": {
175+
"RouteTableId": {
176+
"Ref": "VpctestSubnet2RouteTable25D207BE"
177+
},
178+
"SubnetId": {
179+
"Ref": "VpctestSubnet2Subnet3B2E5192"
180+
}
181+
}
182+
},
183+
"VpctestSubnet2DefaultRoute31936D04": {
184+
"Type": "AWS::EC2::Route",
185+
"Properties": {
186+
"DestinationCidrBlock": "0.0.0.0/0",
187+
"GatewayId": {
188+
"Ref": "VpcIGWD7BA715C"
189+
},
190+
"RouteTableId": {
191+
"Ref": "VpctestSubnet2RouteTable25D207BE"
192+
}
193+
},
194+
"DependsOn": [
195+
"VpcVPCGWBF912B6E"
196+
]
197+
},
198+
"VpcIGWD7BA715C": {
199+
"Type": "AWS::EC2::InternetGateway",
200+
"Properties": {
201+
"Tags": [
202+
{
203+
"Key": "Name",
204+
"Value": "efs-from-imported-subnet/Vpc"
205+
}
206+
]
207+
}
208+
},
209+
"VpcVPCGWBF912B6E": {
210+
"Type": "AWS::EC2::VPCGatewayAttachment",
211+
"Properties": {
212+
"InternetGatewayId": {
213+
"Ref": "VpcIGWD7BA715C"
214+
},
215+
"VpcId": {
216+
"Ref": "Vpc8378EB38"
217+
}
218+
}
219+
},
220+
"FileSystem8A8E25C0": {
221+
"Type": "AWS::EFS::FileSystem",
222+
"Properties": {
223+
"Encrypted": true,
224+
"FileSystemPolicy": {
225+
"Statement": [
226+
{
227+
"Action": [
228+
"elasticfilesystem:ClientRootAccess",
229+
"elasticfilesystem:ClientWrite"
230+
],
231+
"Condition": {
232+
"Bool": {
233+
"elasticfilesystem:AccessedViaMountTarget": "true"
234+
}
235+
},
236+
"Effect": "Allow",
237+
"Principal": {
238+
"AWS": "*"
239+
}
240+
}
241+
],
242+
"Version": "2012-10-17"
243+
},
244+
"FileSystemTags": [
245+
{
246+
"Key": "Name",
247+
"Value": "efs-from-imported-subnet/FileSystem"
248+
}
249+
]
250+
},
251+
"UpdateReplacePolicy": "Delete",
252+
"DeletionPolicy": "Delete"
253+
},
254+
"FileSystemEfsSecurityGroup212D3ACB": {
255+
"Type": "AWS::EC2::SecurityGroup",
256+
"Properties": {
257+
"GroupDescription": "efs-from-imported-subnet/FileSystem/EfsSecurityGroup",
258+
"SecurityGroupEgress": [
259+
{
260+
"CidrIp": "0.0.0.0/0",
261+
"Description": "Allow all outbound traffic by default",
262+
"IpProtocol": "-1"
263+
}
264+
],
265+
"Tags": [
266+
{
267+
"Key": "Name",
268+
"Value": "efs-from-imported-subnet/FileSystem"
269+
}
270+
],
271+
"VpcId": {
272+
"Ref": "Vpc8378EB38"
273+
}
274+
}
275+
},
276+
"FileSystemEfsMountTargetSubnetE0FBE03C": {
277+
"Type": "AWS::EFS::MountTarget",
278+
"Properties": {
279+
"FileSystemId": {
280+
"Ref": "FileSystem8A8E25C0"
281+
},
282+
"SecurityGroups": [
283+
{
284+
"Fn::GetAtt": [
285+
"FileSystemEfsSecurityGroup212D3ACB",
286+
"GroupId"
287+
]
288+
}
289+
],
290+
"SubnetId": {
291+
"Ref": "VpctestSubnet1Subnet43126774"
292+
}
293+
}
294+
}
295+
},
296+
"Parameters": {
297+
"BootstrapVersion": {
298+
"Type": "AWS::SSM::Parameter::Value<String>",
299+
"Default": "/cdk-bootstrap/hnb659fds/version",
300+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
301+
}
302+
},
303+
"Rules": {
304+
"CheckBootstrapVersion": {
305+
"Assertions": [
306+
{
307+
"Assert": {
308+
"Fn::Not": [
309+
{
310+
"Fn::Contains": [
311+
[
312+
"1",
313+
"2",
314+
"3",
315+
"4",
316+
"5"
317+
],
318+
{
319+
"Ref": "BootstrapVersion"
320+
}
321+
]
322+
}
323+
]
324+
},
325+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
326+
}
327+
]
328+
}
329+
}
330+
}

packages/@aws-cdk-testing/framework-integ/test/aws-efs/test/integ.efs-from-imported-subnet.js.snapshot/efsfromimportedsubnettestDefaultTestDeployAssertC5BA6A6C.assets.json

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

0 commit comments

Comments
 (0)