integration test cleanup script

Author: eahefnawy

package.json

@@ -55,6 +55,7 @@
     "test": "istanbul cover -x \"**/*.test.js\" bin/test",
     "lint": "eslint . --cache",
     "docs": "node scripts/generate-readme.js",
+    "integration-test-cleanup": "node scripts/integration-test-cleanup.js",
     "simple-integration-test": "jest --maxWorkers=5 simple-suite",
     "complex-integration-test": "jest --maxWorkers=5 integration",
     "postinstall": "node ./scripts/postinstall.js",

scripts/integration-test-cleanup.js

@@ -10,7 +10,6 @@ BbPromise.promisifyAll(CF, { suffix: 'Promised' });
 BbPromise.promisifyAll(S3, { suffix: 'Promised' });
 
 const logger = console;
-const regex = /test-.+/;
 
 const emptyS3Bucket = (bucket) => (
   S3.listObjectsPromised({ Bucket: bucket })
@@ -48,12 +47,8 @@ const cleanupS3Buckets = (token) => {
 
   return S3.listBucketsPromised()
     .then(response =>
-      response.Buckets.reduce((memo, bucket) => {
-        if (bucket.Name.match(regex)) {
-          return memo.then(() => deleteS3Bucket(bucket.Name));
-        }
-        return memo;
-      }, BbPromise.resolve())
+      response.Buckets.reduce((memo, bucket) => memo
+        .then(() => deleteS3Bucket(bucket.Name)), BbPromise.resolve())
         .then(() => {
           if (response.NextToken) {
             return cleanupS3Buckets(response.NextToken);
@@ -84,7 +79,7 @@ const cleanupCFStacks = (token) => {
   return CF.listStacksPromised(params)
     .then(response =>
       response.StackSummaries.reduce((memo, stack) => {
-        if (stack.StackName.match(regex)) {
+        if (['DELETE_COMPLETE', 'DELETE_IN_PROGRESS'].indexOf(stack.StackStatus) === -1) {
           logger.log('Deleting stack', stack.StackName);
           return memo.then(() => CF.deleteStackPromised({ StackName: stack.StackName }));
         }