fix(route53): timeouts due to delete-existing-record-set-handler's wa…

…it time (#27068) This PR updates the wait time of the `delete-existing-record-set-handler` from 60 to 1800 seconds. Commit 399b6bb upgraded the handler to use the AWS SDK V3 (was V2) and made the following change: ``` - await route53.waitFor('resourceRecordSetsChanged', { Id: changeResourceRecordSets.ChangeInfo.Id }).promise(); + await waitUntilResourceRecordSetsChanged({ client: route53, maxWaitTime: 60 }, { Id: changeResourceRecordSets?.ChangeInfo?.Id }) ``` The V2 `route53.waitFor` waits for 1800 seconds (see [reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Route53.html#waitFor-property)) > `Waits for the resourceRecordSetsChanged state by periodically calling the underlying [Route53.getChange()](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Route53.html#getChange-property) operation every 30 seconds (at most 60 times).` The new explicit configuration was set to 60 seconds which is too short and caused timeouts and failure in our cloudformation stacks Supersedes and closes #27060 Co-authored-by: Tom Roshko [hi@pistazie.rocks](mailto:hi@pistazie.rocks) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Sep 8, 2023 · d730f7f · d730f7f
1 parent 70d9bf7
commit d730f7f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/...dfead0945b9de4b5ac368b6/__entrypoint__.js → ...7e6c6b9c77245f2bc55f6ef/__entrypoint__.js b/...dfead0945b9de4b5ac368b6/__entrypoint__.js → ...7e6c6b9c77245f2bc55f6ef/__entrypoint__.js
diff --git a/...1986d1beedfead0945b9de4b5ac368b6/index.js → ...e5c7265377e6c6b9c77245f2bc55f6ef/index.js b/...1986d1beedfead0945b9de4b5ac368b6/index.js → ...e5c7265377e6c6b9c77245f2bc55f6ef/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": "34.0.0",
   "files": {
-    "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6": {
+    "482643dcf7106ecdc7f4ff9aefba13d1e5c7265377e6c6b9c77245f2bc55f6ef": {
       "source": {
-        "path": "asset.b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6",
+        "path": "asset.482643dcf7106ecdc7f4ff9aefba13d1e5c7265377e6c6b9c77245f2bc55f6ef",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6.zip",
+          "objectKey": "482643dcf7106ecdc7f4ff9aefba13d1e5c7265377e6c6b9c77245f2bc55f6ef.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69": {
+    "57446ecbb9974f64369e24dcd15c9ee996690ec25e80aa5a3e44a695645f3ea5": {
       "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": "30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69.json",
+          "objectKey": "57446ecbb9974f64369e24dcd15c9ee996690ec25e80aa5a3e44a695645f3ea5.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
@@ -151,7 +151,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "b3a6a7ffec7a4baf8647b80c08ebb1b91986d1beedfead0945b9de4b5ac368b6.zip"
+     "S3Key": "482643dcf7106ecdc7f4ff9aefba13d1e5c7265377e6c6b9c77245f2bc55f6ef.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...rk-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/manifest.json b/...rk-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/30e7342ae8e084b153ef62f76086d417df5f1382d2d7738cea15913e165a0f69.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/57446ecbb9974f64369e24dcd15c9ee996690ec25e80aa5a3e44a695645f3ea5.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/packages/aws-cdk-lib/aws-route53/lib/delete-existing-record-set-handler/index.ts b/packages/aws-cdk-lib/aws-route53/lib/delete-existing-record-set-handler/index.ts
@@ -46,7 +46,7 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
     },
   });
 
-  await waitUntilResourceRecordSetsChanged({ client: route53, maxWaitTime: 60 }, { Id: changeResourceRecordSets?.ChangeInfo?.Id });
+  await waitUntilResourceRecordSetsChanged({ client: route53, maxWaitTime: 890 }, { Id: changeResourceRecordSets?.ChangeInfo?.Id });
 
   return {
     PhysicalResourceId: `${existingRecord.Name}-${existingRecord.Type}`,