aws-architect 6.7.144 → 6.7.145

package/lib/CloudFormationDeployer.js

@@ -517,6 +517,47 @@ class CloudFormationDeployer {
       await this.cloudFormationClient.createStackSet(stackParameters).promise();
     }
 
+    const org = new Organizations({ region: 'us-east-1' });
+    const rootOrgsInfo = await org.listRoots({}).promise();
+    const rootOuIds = options.orgIds || rootOrgsInfo.Roots.map(root => root.Id);
+
+    try {
+      let allAccounts = [];
+      let nextToken;
+      do {
+        const response = await org.listAccounts({ NextToken: nextToken }).promise();
+        allAccounts.push(...response.Accounts);
+        nextToken = response.NextToken;
+      } while (nextToken);
+
+      const suspendedAccountIds = new Set(allAccounts.filter(a => a.Status === 'SUSPENDED' || a.Status === 'PENDING_CLOSURE').map(a => a.Id));
+      const existingInstances = await this.cloudFormationClient.listStackInstances({ StackSetName: options.stackSetName }).promise().then(d => d.Summaries);
+      const suspendedInstances = existingInstances.filter(s => suspendedAccountIds.has(s.Account));
+      const uniqueSuspendedAccounts = [...new Set(suspendedInstances.map(s => s.Account))];
+
+      if (uniqueSuspendedAccounts.length) {
+        const suspendedRegions = [...new Set(suspendedInstances.map(s => s.Region))];
+        console.log(`Removing stack instances from ${uniqueSuspendedAccounts.length} suspended accounts: ${uniqueSuspendedAccounts.join(', ')}`);
+        await this.cloudFormationClient.deleteStackInstances({
+          StackSetName: options.stackSetName,
+          DeploymentTargets: {
+            OrganizationalUnitIds: rootOuIds,
+            Accounts: uniqueSuspendedAccounts,
+            AccountFilterType: 'INTERSECTION'
+          },
+          Regions: suspendedRegions,
+          RetainStacks: true,
+          OperationPreferences: {
+            FailureToleranceCount: uniqueSuspendedAccounts.length,
+            MaxConcurrentCount: 20,
+            RegionConcurrencyType: 'PARALLEL'
+          }
+        }).promise();
+      }
+    } catch (error) {
+      console.log('Skipping removal of suspected account stackset, due to error:', error);
+    }
+
     const currentStackData = await this.cloudFormationClient.describeStackSet({ StackSetName: options.stackSetName }).promise().then(data => data.StackSet);
     const rawRegions = await new EC2().describeRegions().promise().then(data => data.Regions.map(r => r.RegionName));
     const newRegions = rawRegions.filter(r => !currentStackData.Regions || !currentStackData.Regions.some(e => e === r))
@@ -548,12 +589,10 @@ class CloudFormationDeployer {
       return { title: 'Success' };
     }
 
-    const rootOrgsInfo = await new Organizations({ region: 'us-east-1' }).listRoots({}).promise();
-
     const deployToAdditionalRegionsParams = {
       StackSetName: options.stackSetName,
       DeploymentTargets: {
-        OrganizationalUnitIds: options.orgIds || rootOrgsInfo.Roots.map(org => org.Id)
+        OrganizationalUnitIds: rootOuIds
       },
       Regions: newRegions,
       OperationId: changeSetName,

package/package.json

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