aws-architect 6.7.86 → 6.7.89

package/CHANGELOG.md

@@ -8,6 +8,8 @@ This is the changelog for [AWS Architect](readme.md).
 * Support pnpm lock files
 * Support the new version of openapi-factory 5.4.
 * Duplicate all .html files as cleaned files. `file.html` => `file` and `file/`, all three will work
+* Fix validateTemplate so that it actually uses S3 when available.
+* Add support for new status `CONFIGURATION_COMPLETE`
 
 ## 6.6 ##
 * Add support to `deleteWebsiteVersion(version)`

package/lib/CloudFormationDeployer.js

@@ -3,6 +3,7 @@ const Tmp = require('tmp');
 Tmp.setGracefulCleanup();
 const fs = require('fs-extra');
 const isEqual = require('lodash.isequal');
+const shortUuid = require('short-uuid');
 
 function tryParseJson(stringContent) {
   try {
@@ -29,8 +30,8 @@ class CloudFormationDeployer {
 
   async validateTemplate(template, stackName, bucketDeploymentKey) {
     let templateString = this.getTemplateBody(template);
-    if (stackName && this.deploymentBucket) {
-      let templateRelativeUrl = `${bucketDeploymentKey}/${stackName}.cloudformation.template`;
+    if (this.deploymentBucket) {
+      let templateRelativeUrl = `${bucketDeploymentKey}/${stackName || shortUuid('abcdefghijklmnopqrstuvwxyz0123456789').generate()}.cloudformation.template`;
       await new Promise((resolve, reject) => {
         Tmp.file(async (err, path) => {
           if (err) {
@@ -66,6 +67,7 @@ class CloudFormationDeployer {
     }
     let stackStatus = data.Stacks[0].StackStatus;
     let stackExistsDict = {
+      CONFIGURATION_COMPLETE: true,
       CREATE_COMPLETE: true,
       UPDATE_COMPLETE: true,
       UPDATE_ROLLBACK_COMPLETE: true
@@ -140,7 +142,7 @@ class CloudFormationDeployer {
           throw { title: 'Deployment to the stack failed.', status: stackStatus, code: stackStatus };
         }
 
-        if (stackStatus.match(/PROGRESS$/i)) {
+        if (stackStatus.match(/PROGRESS$/i) || stackStatus === 'CONFIGURATION_COMPLETE') {
           return iteratePromise();
         }
 
@@ -376,7 +378,7 @@ class CloudFormationDeployer {
 
     // If the stack already existed, and there are no new regions, all the stacks are updated then check to see if the template matches the new template
     if (stackExists && !newRegions && existingStacks.every(s => s.Status === 'CURRENT')) {
-      const regionStacks = await this.cloudFormationClient.listStacks({ StackStatusFilter: ['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE'] }).promise()
+      const regionStacks = await this.cloudFormationClient.listStacks({ StackStatusFilter: ['CONFIGURATION_COMPLETE', 'CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE'] }).promise()
       .then(r => r.StackSummaries);
 
       const thisRegionsStackId = existingStacks.find(s => s.Region === this.cloudFormationClient.config.region).StackId;

package/package.json

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