aws-architect 6.7.144 → 6.7.146

package/bin/template/package.json

@@ -31,7 +31,6 @@
     "eslint-plugin-mocha": "^10.0.5",
     "eslint-plugin-node": "^11.1.0",
     "glob": "^7.1.3",
-    "mocha": "^5.2.0",
     "nodemon": "^1.18.7",
     "sinon": "^7.1.1"
   },

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.146",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -12,7 +12,7 @@
   ],
   "scripts": {
     "lint": "eslint --ext .js tests lib index.js",
-    "test": "mocha tests/**/*.js -R spec"
+    "test": "vitest run"
   },
   "bin": {
     "aws-architect": "./bin/aws-architect.js"
@@ -42,17 +42,15 @@
   "devDependencies": {
     "@authress/eslint-config": "^1.0.2",
     "aws-sdk": "*",
-    "chai": "^3.5.0",
     "error-object-polyfill": "^1.1.14",
     "eslint": "~8.35.0",
     "eslint-config-cimpress-atsquad": "^1.0.67",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-mocha": "^10.0.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "glob": "^5.0.15",
-    "mocha": "^10.1.0",
-    "sinon": "^1.17.3"
+    "sinon": "^1.17.3",
+    "vitest": "^3.0.0"
   },
   "repository": {
     "type": "git",

package/bin/template/tests/index.js

@@ -1,74 +0,0 @@
-let { describe, it } = require('mocha');
-let assert = require('chai').assert;
-
-describe('src/index.js', function() {
-	describe('Test Handler', function () {
-		it('GET livecheck', function() {
-			try {
-				let api = require('../src/index');
-
-				let result = api.Routes['GET']['/livecheck'].Handler();
-				let expectedResult = {
-					statusCode: 200,
-					body: JSON.stringify({
-						'field': 'hello world'
-					}),
-					headers: {
-						'Content-Type': 'application/json'
-					}
-				}
-				assert.equal(result.statusCode, expectedResult.statusCode, 'Expected ANY /proxy status code to have matching value.')
-				assert.deepEqual(result.headers, expectedResult.headers, 'Expected ANY /proxy headers to have matching value.')
-				assert.equal(result.body, expectedResult.body, 'Expected ANY /proxy body to have matching value.')
-			}
-			catch(e) {
-				console.error(e.stack);
-				assert(false, e.toString());
-			}
-		});
-		it('ANY', function() {
-			try {
-				let api = require('../src/index');
-
-				let result = api.Routes['ANY']['/{proxy+}'].Handler();
-				let expectedResult = {
-					statusCode: 404,
-					body: JSON.stringify({}),
-					headers: {
-						'Content-Type': 'application/json'
-					}
-				}
-				assert.equal(result.statusCode, expectedResult.statusCode, 'Expected ANY /proxy status code to have matching value.')
-				assert.deepEqual(result.headers, expectedResult.headers, 'Expected ANY /proxy headers to have matching value.')
-				assert.equal(result.body, expectedResult.body, 'Expected ANY /proxy body to have matching value.')
-			}
-			catch(e) {
-				console.error(e.stack);
-				assert(false, e.toString());
-			}
-		});
-	});
-	describe('Non-RESTful Test', function () {
-		/*
-		it('GET', function(done) {
-			try {
-				let lambda = require('../src/index');
-				new Promise((s, f) => {
-					lambda({}, {}, (failure, success) => {
-						if(success && !failure) { return s(success); }
-						else { f(failure); }
-					});
-				})
-				.then(output => {
-					done();
-				})
-				.catch(failure => done(failure));
-			}
-			catch(e) {
-				console.error(e.stack);
-				assert(false, e.toString());
-			}
-		});
-		*/
-	});
-});

package/bin/template/tests/make.js

@@ -1,19 +0,0 @@
-let { describe, it } = require('mocha');
-let assert = require('chai').assert;
-let fs = require('fs');
-let path = require('path');
-
-describe('make.js', function() {
-	describe('Syntax', function () {
-		it('Should be valid node', function(){
-			try {
-				let app = require('../make');
-				assert(true);
-			}
-			catch(e) {
-				console.log(e.stack);
-				assert(false, e.toString());
-			}
-		});
-	});
-});