aws-architect 6.6.23 → 6.6.28

package/CHANGELOG.md

@@ -4,6 +4,7 @@ This is the changelog for [AWS Architect](readme.md).
 ## 6.6 ##
 * Add support to `deleteWebsiteVersion(version)`
 * Fix `The function must be in an Active state. The current state for function arn:aws:lambda:Function:514 is Pending`.
+* Automatically delete existing ROLLBACK_COMPLETE stacks.
 
 ## 6.5 ##
 * Support APIGW version 2

package/lib/CloudFormationDeployer.js

@@ -54,33 +54,46 @@ class CloudFormationDeployer {
     }
   }
 
-  stackExists(stackName) {
-    return this.cloudFormationClient.describeStacks({ StackName: stackName }).promise()
-    .then(data => {
-      if (!data.Stacks[0]) {
-        return false;
-      }
-      let stackStatus = data.Stacks[0].StackStatus;
-      let stackExistsDict = {
-        CREATE_COMPLETE: true,
-        UPDATE_COMPLETE: true,
-        UPDATE_ROLLBACK_COMPLETE: true
-      };
+  async stackExists(stackName) {
+    let data;
+    try {
+      data = await this.cloudFormationClient.describeStacks({ StackName: stackName }).promise();
+    } catch (error) {
+      return false;
+    }
+    if (!data.Stacks[0]) {
+      return false;
+    }
+    let stackStatus = data.Stacks[0].StackStatus;
+    let stackExistsDict = {
+      CREATE_COMPLETE: true,
+      UPDATE_COMPLETE: true,
+      UPDATE_ROLLBACK_COMPLETE: true
+    };
 
-      if (stackExistsDict[stackStatus]) {
-        return true;
-      }
-      if (stackStatus === 'REVIEW_IN_PROGRESS') {
-        return false;
-      }
-      if (stackStatus === 'ROLLBACK_COMPLETE') {
-        throw { error: 'Stack must be deleted manually and cannot be used', status: stackStatus };
+    if (stackExistsDict[stackStatus]) {
+      return true;
+    }
+    if (stackStatus === 'REVIEW_IN_PROGRESS') {
+      return false;
+    }
+    if (stackStatus === 'ROLLBACK_COMPLETE') {
+      console.log('Current status of stack is ROLLBACK_COMPLETE, deleting before generating a new stack.');
+      await this.cloudFormationClient.deleteStack({ StackName: stackName }).promise();
+      for (let checkIteration = 0; checkIteration < 120; checkIteration++) {
+        try {
+          await this.cloudFormationClient.describeStacks({ StackName: stackName }).promise();
+          await new Promise(resolve => setTimeout(resolve, 5000));
+        } catch (error) {
+          break;
+        }
       }
-      throw { error: 'Current status of stack prevents creation or update.', status: stackStatus };
-    }, () => false);
+      return false;
+    }
+    throw { error: 'Current status of stack prevents creation or update.', status: stackStatus };
   }
 
-  async waitForCompletion(stackName, allow_update_rollback) {
+  async waitForCompletion(stackName, allowUpdateRollback) {
     let timeout = new Date();
     let timeoutLength = 60 * 60 * 1000;
     timeout.setTime(timeout.getTime() + timeoutLength);
@@ -108,7 +121,7 @@ class CloudFormationDeployer {
           throw { error: 'Current status of the stack has failed', status: stackStatus };
         }
 
-        if (!allow_update_rollback && stackStatus === 'UPDATE_ROLLBACK_COMPLETE') {
+        if (!allowUpdateRollback && stackStatus === 'UPDATE_ROLLBACK_COMPLETE') {
           throw { title: 'Current stack status is failure', status: stackStatus };
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-architect",
-  "version": "6.6.23",
+  "version": "6.6.28",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -44,7 +44,7 @@
     "error-object-polyfill": "^1.1.14",
     "eslint-config-cimpress-atsquad": "^1.0.67",
     "glob": "^5.0.15",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.1",
     "sinon": "^1.17.3"
   },
   "repository": {