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*
aws · Sep 14, 2023 · 94b31d7 · 94b31d7
1 parent 8721a51
commit 94b31d7
Show file tree

Hide file tree

Showing 42 changed files with 354 additions and 199 deletions.
diff --git a/....snapshot/Rooute53DeleteExistingRecordSetIntegDefaultTestDeployAssert62638412.assets.json b/....snapshot/Rooute53DeleteExistingRecordSetIntegDefaultTestDeployAssert62638412.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "34.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "Rooute53DeleteExistingRecordSetIntegDefaultTestDeployAssert62638412.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...napshot/Rooute53DeleteExistingRecordSetIntegDefaultTestDeployAssert62638412.template.json b/...napshot/Rooute53DeleteExistingRecordSetIntegDefaultTestDeployAssert62638412.template.json
@@ -0,0 +1,36 @@
+{
+ "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/...171fc9a72a644543a57ce7e/__entrypoint__.js → ...dfead0945b9de4b5ac368b6/__entrypoint__.js b/...171fc9a72a644543a57ce7e/__entrypoint__.js → ...dfead0945b9de4b5ac368b6/__entrypoint__.js
diff --git a/....snapshot/asset.b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6/index.js b/....snapshot/asset.b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6/index.js
diff --git a/....snapshot/asset.e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e/index.js b/....snapshot/asset.e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e/index.js
diff --git a/...-existing-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.assets.json b/...-existing-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.assets.json
@@ -1,28 +1,28 @@
 {
-  "version": "32.0.0",
+  "version": "34.0.0",
   "files": {
-    "e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e": {
+    "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6": {
       "source": {
-        "path": "asset.e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e",
+        "path": "asset.b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e.zip",
+          "objectKey": "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "510d172ff78b0abe3980fbe5fc62a7aa8179434760f5e885dc73465aeea674ca": {
+    "30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69": {
       "source": {
         "path": "cdk-route53-integ-delete-existing-record-set.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "510d172ff78b0abe3980fbe5fc62a7aa8179434760f5e885dc73465aeea674ca.json",
+          "objectKey": "30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...xisting-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.template.json b/...xisting-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.template.json
@@ -9,29 +9,29 @@
   "ExistingRecord8E2B2167": {
    "Type": "AWS::Route53::RecordSet",
    "Properties": {
-    "Name": "integ.cdk.dev.",
-    "Type": "A",
     "HostedZoneId": {
      "Ref": "HostedZoneDB99F866"
     },
+    "Name": "integ.cdk.dev.",
     "ResourceRecords": [
      "1.2.3.4"
     ],
-    "TTL": "1800"
+    "TTL": "1800",
+    "Type": "A"
    }
   },
   "NewRecordB9E8EE35": {
    "Type": "AWS::Route53::RecordSet",
    "Properties": {
-    "Name": "integ.cdk.dev.",
-    "Type": "A",
     "HostedZoneId": {
      "Ref": "HostedZoneDB99F866"
     },
+    "Name": "integ.cdk.dev.",
     "ResourceRecords": [
      "5.6.7.8"
     ],
-    "TTL": "7200"
+    "TTL": "7200",
+    "Type": "A"
    },
    "DependsOn": [
     "ExistingRecord8E2B2167",
@@ -151,7 +151,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "e1555732b4098df87db06daafa8ad81ce14ace955171fc9a72a644543a57ce7e.zip"
+     "S3Key": "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...ramework-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/cdk.out b/...ramework-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"32.0.0"}
+{"version":"34.0.0"}