improve waitForChange

Author: pecirep

lib/route53.js

@@ -23,12 +23,13 @@ const checkChangeStatus = async (awsClient, changeInfo) => {
 };
 
 const waitForChange = async (checkChange) => {
-    const isChangeComplete = await checkChange;
+    const isChangeComplete = await checkChange();
 
     if (isChangeComplete) {
         return isChangeComplete
     } else {
-        await setTimeout(waitForChange, 1000);
+        await new Promise(r => setTimeout(r, 1000));
+        return await waitForChange(checkChange, serverless);
     };
 };
 
@@ -103,8 +104,7 @@ const setupCertificate = async (serverless, domainName) => {
             return certificaterequest.DomainValidationOptions[0].ResourceRecord
         },
         // sometimes the ResourceRecord entry isn't immediately available, so we wait until it is
-        // the anonymous function given to waitForChange has to call itself after waitForChange returns it so we get the value
-        certificateResourceRecord = await (await waitForChange(() => getCertificateRecord(serverless, domainName)))(),
+        certificateResourceRecord = await waitForChange(() => getCertificateRecord(serverless, domainName)),
         changeRecordParams = {
             HostedZoneId: hostedZone.Id,
             ChangeBatch: {
@@ -131,9 +131,9 @@ const setupCertificate = async (serverless, domainName) => {
     await waitForChange(() => checkChangeStatus(awsClient, changeRecordResult.ChangeInfo));
 
     // wait for issued certificate
-    await waitForChange(() => getCertificateArn(serverless, domainName));
-    
+    const certificateArn = await waitForChange(() => getCertificateArn(serverless, domainName));
     serverless.cli.log(`Certificate for ${domainName} successfully issued.`, entity);
+    return certificateArn;
 };
 
 module.exports = {