aws-architect 6.7.77 → 6.7.78

package/lib/CloudFormationDeployer.js

@@ -121,7 +121,7 @@ class CloudFormationDeployer {
           throw { error: 'Current status of the stack has failed', status: stackStatus };
         }
 
-        if (!allowUpdateRollback && stackStatus === 'UPDATE_ROLLBACK_COMPLETE') {
+        if (!allowUpdateRollback && stackStatus === 'UPDATE_ROLLBACK_COMPLETE' || stackStatus === 'ROLLBACK_COMPLETE') {
           const eventsResponse = await this.cloudFormationClient.describeStackEvents({ StackName: stackName }).promise();
           const failureStackEventStatuses = {
             CREATE_FAILED: true,
@@ -144,10 +144,6 @@ class CloudFormationDeployer {
           return iteratePromise();
         }
 
-        if (stackStatus === 'ROLLBACK_COMPLETE') {
-          throw { error: 'Failed to create stack, it must be deleted manually.', status: stackStatus };
-        }
-
         if (stackStatus.match(/COMPLETE$/i)) {
           return true;
         }
@@ -269,22 +265,7 @@ class CloudFormationDeployer {
       await this.cloudFormationClient.createChangeSet(stackParameters).promise();
       await this.waitForChangeSetCreation(options.stackName, options.changeSetName);
       await this.cloudFormationClient.executeChangeSet(executeParameters).promise();
-      await this.waitForCompletion(options.stackName, false);
-      let stackData = await this.cloudFormationClient.describeStacks({ StackName: options.stackName }).promise();
-      // make options default to protect the stack
-      if (options.automaticallyProtectStack !== false) {
-        try {
-          await this.cloudFormationClient.updateTerminationProtection({ EnableTerminationProtection: true, StackName: options.stackName }).promise();
-        } catch (error) {
-          console.log('Failed to update termination protection', error);
-        }
-      }
-
-      return stackData.Stacks[0];
     } catch (error) {
-      if (error.code === 'UPDATE_ROLLBACK_COMPLETE') {
-        throw error;
-      }
       if (error.code === 'ValidationError' || error.code === 'MultipleValidationErrors' || error.code === 'InvalidParameterType') {
         throw error;
       }
@@ -307,6 +288,19 @@ class CloudFormationDeployer {
       const stackData = await this.cloudFormationClient.describeStacks({ StackName: options.stackName }).promise();
       return Object.assign({ title: 'Change set skipped, no changes detected.', code: 'SKIPPED' }, stackData.Stacks[0]);
     }
+
+    await this.waitForCompletion(options.stackName, false);
+    let stackData = await this.cloudFormationClient.describeStacks({ StackName: options.stackName }).promise();
+    // make options default to protect the stack
+    if (options.automaticallyProtectStack !== false) {
+      try {
+        await this.cloudFormationClient.updateTerminationProtection({ EnableTerminationProtection: true, StackName: options.stackName }).promise();
+      } catch (error) {
+        console.log('Failed to update termination protection', error);
+      }
+    }
+
+    return stackData.Stacks[0];
   }
 
   async stackSetExists(stackSetName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-architect",
-  "version": "6.7.77",
+  "version": "6.7.78",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",