Fix logic around 12 Test Sessions

Double coolDown timeout (duration to wait for ECS Tasks to be down).
Change logic around Tls Test Session count to be more flexible.

config/config.example.json

@@ -23,6 +23,6 @@
     "medium": "lp"
   },
   "coolDown": {
-    "timeout": 50000
+    "timeout": 100000
   }
 }

config/config.js

@@ -95,7 +95,17 @@ const schema = {
       testPlanRoute: '/test-plan',
       initTesterRoute: '/init-tester',
       startTesterRoute: '/start-tester',
-      resetTesterRoute: '/reset-tester'
+      resetTesterRoute: '/reset-tester',
+      minNum: {
+        doc: 'The minimum number of supported App Testers.',
+        format: Number,
+        default: 1
+      },
+      maxNum: {
+        doc: 'The maximum number of supported App Testers.',
+        format: Number,
+        default: 12
+      }
     },
     server: {
       name: 'server',
@@ -112,7 +122,17 @@ const schema = {
       testPlanRoute: '/test-plan',
       initTesterRoute: '/init-tester',
       startTesterRoute: '/start-tester',
-      resetTesterRoute: '/reset-tester'
+      resetTesterRoute: '/reset-tester',
+      minNum: {
+        doc: 'The minimum number of supported Server Testers.',
+        format: Number,
+        default: 1
+      },
+      maxNum: {
+        doc: 'The maximum number of supported Server Testers.',
+        format: Number,
+        default: 1
+      }
     },
     tls: {
       name: 'tls',
@@ -129,7 +149,17 @@ const schema = {
       testPlanRoute: '/test-plan',
       initTesterRoute: '/init-tester',
       startTesterRoute: '/start-tester',
-      resetTesterRoute: '/reset-tester'
+      resetTesterRoute: '/reset-tester',
+      minNum: {
+        doc: 'The minimum number of supported Tls Testers.',
+        format: Number,
+        default: 1
+      },
+      maxNum: {
+        doc: 'The maximum number of supported Tls Testers.',
+        format: Number,
+        default: 1
+      }
     }
   },
   job: {

src/api/orchestration/models/orchestrate.app.js

@@ -56,17 +56,17 @@ async function plan(testJob) {
 }
 
 async function initTester(testJob) {
-  const { testerConfig: { name, url, initTesterRoute } } = internals;
+  const { testerConfig: { name, url, initTesterRoute, minNum, maxNum } } = internals;
 
   if (!isActive()) return { name, message: TesterUnavailable(name) };
 
   const hydratedTestJob = Bourne.parse(testJob);
   const validNumberOfResourceObjects = (() => {
     const numberOfAppScannerResourceObjects = hydratedTestJob.included.filter((resourceObj) => resourceObj.type === 'appScanner').length;
-    return numberOfAppScannerResourceObjects > 0 && numberOfAppScannerResourceObjects <= 12;
+    return numberOfAppScannerResourceObjects >= minNum && numberOfAppScannerResourceObjects <= maxNum;
   })();
 
-  if (!validNumberOfResourceObjects) return { name, message: 'Tester failure: The only valid number of appScanner resource objects is from 1-12 inclusive. Please modify your Job file.' };
+  if (!validNumberOfResourceObjects) return { name, message: `Tester failure: The only valid number of appScanner resource objects is from: "${minNum}-${maxNum}" inclusive. Please modify your Job file.` };
   internals.jobTestSessions = hydratedTestJob.included.filter((resourceObj) => resourceObj.type === 'appScanner').map((testSessionResourceObj) => ({ id: testSessionResourceObj.id, isFinished: false }));
 
   const { res, payload } = await Wreck.post(`${url}${initTesterRoute}`, { headers: { 'content-type': 'application/vnd.api+json' }, payload: testJob }); // eslint-disable-line no-unused-vars

src/api/orchestration/models/orchestrate.server.js

@@ -37,7 +37,7 @@ async function plan(testJob) { // eslint-disable-line no-unused-vars
 }
 
 async function initTester(testJob) { // eslint-disable-line no-unused-vars
-  const { testerConfig: { name, url, initTesterRoute } } = internals; // eslint-disable-line no-unused-vars
+  const { testerConfig: { name, url, initTesterRoute, minNum, maxNum } } = internals; // eslint-disable-line no-unused-vars
 
   internals.jobTestSessions = [{ id: 'NA' }];
 

src/api/orchestration/models/orchestrate.tls.js

@@ -56,14 +56,17 @@ async function plan(testJob) {
 }
 
 async function initTester(testJob) {
-  const { testerConfig: { name, url, initTesterRoute } } = internals;
+  const { testerConfig: { name, url, initTesterRoute, minNum, maxNum } } = internals;
 
   if (!isActive()) return { name, message: TesterUnavailable(name) };
 
   const hydratedTestJob = Bourne.parse(testJob);
-  const validNumberOfResourceObjects = hydratedTestJob.included.filter((resourceObj) => resourceObj.type === 'tlsScanner').length === 1;
+  const validNumberOfResourceObjects = (() => {
+    const numberOfTlsScannerResourceObjects = hydratedTestJob.included.filter((resourceObj) => resourceObj.type === 'tlsScanner').length;
+    return numberOfTlsScannerResourceObjects >= minNum && numberOfTlsScannerResourceObjects <= maxNum;
+  })();
 
-  if (!validNumberOfResourceObjects) return { name, message: 'Tester failure: The only valid number of tlsScanner resource objects is one. Please modify your Job file.' };
+  if (!validNumberOfResourceObjects) return { name, message: `Tester failure: The only valid number of tlsScanner resource objects is${minNum === maxNum ? `: "${minNum}"` : ` from: "${minNum}-${maxNum}"`}. Please modify your Job file.` };
   internals.jobTestSessions = hydratedTestJob.included.filter((resourceObj) => resourceObj.type === 'tlsScanner').map((testSessionResourceObj) => ({ id: testSessionResourceObj.id, isFinished: false }));
 
   const { res, payload } = await Wreck.post(`${url}${initTesterRoute}`, { headers: { 'content-type': 'application/vnd.api+json' }, payload: testJob }); // eslint-disable-line no-unused-vars