Skip to content

Commit b5fe0a1

Browse files
authored
chore: remove apiVersion from custom resources (#27021)
`apiVersion` no longer is recognized by sdk v3. source: aws/aws-sdk-js-v3#1869 We use it in two custom resources. I confirmed that each `apiVersion` represented the latest version of sdk v2 and was almost certainly hardcoded because it was the recommended practice: https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/locking-api-versions.html Both integ tests succeed deployment. I can confirm that `aws-route53/delete-existing-record-set-handler` works as intended but the integ test for `pipelines/approve-lambda` could never have worked and needs to be rewritten. That should happen in a different PR. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent a73f256 commit b5fe0a1

File tree

42 files changed

+354
-199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+354
-199
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "34.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "Rooute53DeleteExistingRecordSetIntegDefaultTestDeployAssert62638412.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Parameters": {
3+
"BootstrapVersion": {
4+
"Type": "AWS::SSM::Parameter::Value<String>",
5+
"Default": "/cdk-bootstrap/hnb659fds/version",
6+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
7+
}
8+
},
9+
"Rules": {
10+
"CheckBootstrapVersion": {
11+
"Assertions": [
12+
{
13+
"Assert": {
14+
"Fn::Not": [
15+
{
16+
"Fn::Contains": [
17+
[
18+
"1",
19+
"2",
20+
"3",
21+
"4",
22+
"5"
23+
],
24+
{
25+
"Ref": "BootstrapVersion"
26+
}
27+
]
28+
}
29+
]
30+
},
31+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
32+
}
33+
]
34+
}
35+
}
36+
}

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/asset.b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6/index.js

+55
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.delete-existing-record-set.js.snapshot/asset.e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e/index.js

-55
This file was deleted.

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.assets.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"version": "32.0.0",
2+
"version": "34.0.0",
33
"files": {
4-
"e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e": {
4+
"b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6": {
55
"source": {
6-
"path": "asset.e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e",
6+
"path": "asset.b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e.zip",
12+
"objectKey": "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
1616
},
17-
"510d172ff78b0abe3980fbe5fc62a7aa8179434760f5e885dc73465aeea674ca": {
17+
"30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69": {
1818
"source": {
1919
"path": "cdk-route53-integ-delete-existing-record-set.template.json",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "510d172ff78b0abe3980fbe5fc62a7aa8179434760f5e885dc73465aeea674ca.json",
25+
"objectKey": "30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69.json",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.template.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
"ExistingRecord8E2B2167": {
1010
"Type": "AWS::Route53::RecordSet",
1111
"Properties": {
12-
"Name": "integ.cdk.dev.",
13-
"Type": "A",
1412
"HostedZoneId": {
1513
"Ref": "HostedZoneDB99F866"
1614
},
15+
"Name": "integ.cdk.dev.",
1716
"ResourceRecords": [
1817
"1.2.3.4"
1918
],
20-
"TTL": "1800"
19+
"TTL": "1800",
20+
"Type": "A"
2121
}
2222
},
2323
"NewRecordB9E8EE35": {
2424
"Type": "AWS::Route53::RecordSet",
2525
"Properties": {
26-
"Name": "integ.cdk.dev.",
27-
"Type": "A",
2826
"HostedZoneId": {
2927
"Ref": "HostedZoneDB99F866"
3028
},
29+
"Name": "integ.cdk.dev.",
3130
"ResourceRecords": [
3231
"5.6.7.8"
3332
],
34-
"TTL": "7200"
33+
"TTL": "7200",
34+
"Type": "A"
3535
},
3636
"DependsOn": [
3737
"ExistingRecord8E2B2167",
@@ -151,7 +151,7 @@
151151
"S3Bucket": {
152152
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
153153
},
154-
"S3Key": "e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e.zip"
154+
"S3Key": "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6.zip"
155155
},
156156
"Timeout": 900,
157157
"MemorySize": 128,
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"32.0.0"}
1+
{"version":"34.0.0"}

0 commit comments

Comments
 (0)