Skip to content

Commit ad71026

Browse files
MrArnoldPalmerMrArnoldPalmer
authored
fix: dns-validated-cert cr doesn't use node16 (#25348)
Changes the custom resource runtime to use the default based on the region it is deployed in. This will be Node16 in most cases except in isolated regions where it is Node14. Fix: #25335 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent c46b013 commit ad71026

File tree

9 files changed

+228
-46
lines changed

9 files changed

+228
-46
lines changed

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/cdk.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"21.0.0"}
1+
{"version":"31.0.0"}

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ-dns-validated-certificate.assets.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "21.0.0",
2+
"version": "31.0.0",
33
"files": {
44
"ef671dfd26b6dde1f73a4325587504813605a928622ebc466f4d0de6a0f3b672": {
55
"source": {
@@ -14,15 +14,15 @@
1414
}
1515
}
1616
},
17-
"40e0cba7b935f2255366302a1ad6c08cc6de0553b650a7d39efff6cfe3c5a251": {
17+
"1827f8b3dae882f9c01e1f56ed8c5cecc88fee8a12a8fd410bc83dd7835622bd": {
1818
"source": {
1919
"path": "integ-dns-validated-certificate.template.json",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "40e0cba7b935f2255366302a1ad6c08cc6de0553b650a7d39efff6cfe3c5a251.json",
25+
"objectKey": "1827f8b3dae882f9c01e1f56ed8c5cecc88fee8a12a8fd410bc83dd7835622bd.json",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ-dns-validated-certificate.template.json

+112-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,15 @@
105105
]
106106
},
107107
"Handler": "index.certificateRequestHandler",
108-
"Runtime": "nodejs14.x",
108+
"Runtime": {
109+
"Fn::FindInMap": [
110+
"DefaultCrNodeVersionMap",
111+
{
112+
"Ref": "AWS::Region"
113+
},
114+
"value"
115+
]
116+
},
109117
"Timeout": 900
110118
},
111119
"DependsOn": [
@@ -130,6 +138,109 @@
130138
"DeletionPolicy": "Delete"
131139
}
132140
},
141+
"Mappings": {
142+
"DefaultCrNodeVersionMap": {
143+
"af-south-1": {
144+
"value": "nodejs16.x"
145+
},
146+
"ap-east-1": {
147+
"value": "nodejs16.x"
148+
},
149+
"ap-northeast-1": {
150+
"value": "nodejs16.x"
151+
},
152+
"ap-northeast-2": {
153+
"value": "nodejs16.x"
154+
},
155+
"ap-northeast-3": {
156+
"value": "nodejs16.x"
157+
},
158+
"ap-south-1": {
159+
"value": "nodejs16.x"
160+
},
161+
"ap-south-2": {
162+
"value": "nodejs16.x"
163+
},
164+
"ap-southeast-1": {
165+
"value": "nodejs16.x"
166+
},
167+
"ap-southeast-2": {
168+
"value": "nodejs16.x"
169+
},
170+
"ap-southeast-3": {
171+
"value": "nodejs16.x"
172+
},
173+
"ca-central-1": {
174+
"value": "nodejs16.x"
175+
},
176+
"cn-north-1": {
177+
"value": "nodejs16.x"
178+
},
179+
"cn-northwest-1": {
180+
"value": "nodejs16.x"
181+
},
182+
"eu-central-1": {
183+
"value": "nodejs16.x"
184+
},
185+
"eu-central-2": {
186+
"value": "nodejs16.x"
187+
},
188+
"eu-north-1": {
189+
"value": "nodejs16.x"
190+
},
191+
"eu-south-1": {
192+
"value": "nodejs16.x"
193+
},
194+
"eu-south-2": {
195+
"value": "nodejs16.x"
196+
},
197+
"eu-west-1": {
198+
"value": "nodejs16.x"
199+
},
200+
"eu-west-2": {
201+
"value": "nodejs16.x"
202+
},
203+
"eu-west-3": {
204+
"value": "nodejs16.x"
205+
},
206+
"me-central-1": {
207+
"value": "nodejs16.x"
208+
},
209+
"me-south-1": {
210+
"value": "nodejs16.x"
211+
},
212+
"sa-east-1": {
213+
"value": "nodejs16.x"
214+
},
215+
"us-east-1": {
216+
"value": "nodejs16.x"
217+
},
218+
"us-east-2": {
219+
"value": "nodejs16.x"
220+
},
221+
"us-gov-east-1": {
222+
"value": "nodejs16.x"
223+
},
224+
"us-gov-west-1": {
225+
"value": "nodejs16.x"
226+
},
227+
"us-iso-east-1": {
228+
"value": "nodejs14.x"
229+
},
230+
"us-iso-west-1": {
231+
"value": "nodejs14.x"
232+
},
233+
"us-isob-east-1": {
234+
"value": "nodejs14.x"
235+
},
236+
"us-west-1": {
237+
"value": "nodejs16.x"
238+
},
239+
"us-west-2": {
240+
"value": "nodejs16.x"
241+
}
242+
}
243+
},
133244
"Outputs": {
134245
"CertificateArn": {
135246
"Value": {

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableLookups": true,
3-
"version": "21.0.0",
3+
"version": "31.0.0",
44
"testCases": {
55
"integ-test/DefaultTest": {
66
"stacks": [

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integtestDefaultTestDeployAssert24D5C536.assets.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "21.0.0",
2+
"version": "31.0.0",
33
"files": {
44
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
55
"source": {

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/manifest.json

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
2-
"version": "21.0.0",
2+
"version": "31.0.0",
33
"artifacts": {
4-
"Tree": {
5-
"type": "cdk:tree",
6-
"properties": {
7-
"file": "tree.json"
8-
}
9-
},
104
"integ-dns-validated-certificate.assets": {
115
"type": "cdk:asset-manifest",
126
"properties": {
@@ -23,7 +17,7 @@
2317
"validateOnSynth": false,
2418
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
2519
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
26-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/40e0cba7b935f2255366302a1ad6c08cc6de0553b650a7d39efff6cfe3c5a251.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1827f8b3dae882f9c01e1f56ed8c5cecc88fee8a12a8fd410bc83dd7835622bd.json",
2721
"requiresBootstrapStackVersion": 6,
2822
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2923
"additionalDependencies": [
@@ -63,6 +57,12 @@
6357
"data": "CertificateCertificateRequestorResource2890C6B7"
6458
}
6559
],
60+
"/integ-dns-validated-certificate/DefaultCrNodeVersionMap": [
61+
{
62+
"type": "aws:cdk:logicalId",
63+
"data": "DefaultCrNodeVersionMap"
64+
}
65+
],
6666
"/integ-dns-validated-certificate/CertificateArn": [
6767
{
6868
"type": "aws:cdk:logicalId",
@@ -130,6 +130,12 @@
130130
]
131131
},
132132
"displayName": "integ-test/DefaultTest/DeployAssert"
133+
},
134+
"Tree": {
135+
"type": "cdk:tree",
136+
"properties": {
137+
"file": "tree.json"
138+
}
133139
}
134140
}
135141
}

0 commit comments

Comments
 (0)