aws-architect 6.7.133 → 6.7.136

package/lib/CloudFormationDeployer.js

@@ -13,6 +13,17 @@ function tryParseJson(stringContent) {
   }
 }
 
+function getChangeSetName(changeSetName) {
+  let newChangeSetName = '';
+  if (!changeSetName[0].match(/[a-z]/ig)) {
+    newChangeSetName = 'v';
+  }
+
+  newChangeSetName += changeSetName.replace(/[^a-z0-9-]/gi, '-');
+
+  return newChangeSetName;
+}
+
 class CloudFormationDeployer {
   constructor(region, bucketManager, deploymentBucket) {
     this.cloudFormationClient = new CloudFormation({ region });
@@ -159,7 +170,9 @@ class CloudFormationDeployer {
     await iteratePromise();
   }
 
-  async waitForChangeSetCreation(stackName, changeSetName) {
+  async waitForChangeSetCreation(stackName, rawChangeSetName) {
+    const changeSetName = getChangeSetName(rawChangeSetName);
+
     let timeout = new Date();
     let timeoutLength = 60 * 1000;
     timeout.setTime(timeout.getTime() + timeoutLength);
@@ -213,9 +226,11 @@ class CloudFormationDeployer {
     let region = this.cloudFormationClient.config.region;
     console.log(`Starting Configuration of Stack: ${options.stackName} in ${region}`);
 
+    const changeSetName = getChangeSetName(options.changeSetName);
+
     let stackExists = await this.stackExists(options.stackName);
     let stackParameters = {
-      ChangeSetName: options.changeSetName,
+      ChangeSetName: changeSetName,
       StackName: options.stackName,
       Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
       ChangeSetType: stackExists ? 'UPDATE' : 'CREATE',
@@ -258,14 +273,14 @@ class CloudFormationDeployer {
     }
 
     let executeParameters = {
-      ChangeSetName: options.changeSetName,
+      ChangeSetName: getChangeSetName(stackParameters.ChangeSetName),
       StackName: options.stackName
     };
 
     console.log(`Deploying Stack: ${options.stackName} in ${region}`);
     try {
       await this.cloudFormationClient.createChangeSet(stackParameters).promise();
-      await this.waitForChangeSetCreation(options.stackName, options.changeSetName);
+      await this.waitForChangeSetCreation(options.stackName, executeParameters.ChangeSetName);
       await this.cloudFormationClient.executeChangeSet(executeParameters).promise();
     } catch (error) {
       if (error.code === 'ValidationError' || error.code === 'MultipleValidationErrors' || error.code === 'InvalidParameterType') {
@@ -393,9 +408,10 @@ class CloudFormationDeployer {
       }
     }
 
+    const changeSetName = getChangeSetName(options.changeSetName);
     if (stackExists) {
       console.log('Updating stack set...');
-      stackParameters.OperationId = `${options.changeSetName}-update`;
+      stackParameters.OperationId = `${changeSetName}-update`;
       stackParameters.OperationPreferences = {
         FailureToleranceCount: 20,
         MaxConcurrentCount: 20,
@@ -429,7 +445,7 @@ class CloudFormationDeployer {
       StackSetName: options.stackSetName,
       Accounts: [accountId],
       Regions: newRegions,
-      OperationId: options.changeSetName,
+      OperationId: changeSetName,
       OperationPreferences: {
         FailureToleranceCount: 20,
         MaxConcurrentCount: 20,
@@ -505,9 +521,10 @@ class CloudFormationDeployer {
       }
     }
 
+    const changeSetName = getChangeSetName(options.changeSetName);
     if (stackExists) {
       console.log('Updating organizational stack set, stack will be updated asynchronously');
-      stackParameters.OperationId = `${options.changeSetName}-update`;
+      stackParameters.OperationId = `${changeSetName}-update`;
       stackParameters.OperationPreferences = {
         FailureToleranceCount: 20,
         MaxConcurrentCount: 20,
@@ -529,7 +546,7 @@ class CloudFormationDeployer {
         OrganizationalUnitIds: rootOrgsInfo.Roots.map(org => org.Id)
       },
       Regions: newRegions,
-      OperationId: options.changeSetName,
+      OperationId: changeSetName,
       OperationPreferences: {
         FailureToleranceCount: 20,
         MaxConcurrentCount: 20,

package/package.json

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