Fix logic around 12 Test Sessions

Apply same Test Session iD regex from Job schema to SUT schemas. Increase timeout and duration of.
purpleteam-labs · Dec 9, 2021 · 71df746 · 71df746
1 parent d4ffb45
commit 71df746
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/config/config.js b/config/config.js
@@ -91,7 +91,7 @@ const schema = {
       timeoutToBeAvailable: {
         doc: 'The duration in milliseconds before giving up on waiting for the s2 Service Discovery Service Instances to be available.',
         format: 'duration',
-        default: 120000
+        default: 200000
       },
       retryIntervalToBeAvailable: {
         doc: 'The retry interval in milliseconds for the s2 Service Discovery Service Instances to be available.',
@@ -103,12 +103,12 @@ const schema = {
       timeout: {
         doc: 'The duration in milliseconds before giving up on waiting for the s2 containers to be responsive.',
         format: 'duration',
-        default: 30000
+        default: 120000
       },
       retryInterval: {
         doc: 'The retry interval in milliseconds for the s2 containers to be responsive.',
         format: 'duration',
-        default: 2000
+        default: 10000
       }
     }
   },

diff --git a/src/api/app/do/sUt.aPi.js b/src/api/app/do/sUt.aPi.js
@@ -49,7 +49,7 @@ class Api extends Sut {
       }),
       testSession: Joi.object({
         type: Joi.string().valid('appScanner').required(),
-        id: Joi.string().alphanum().required(),
+        id: Joi.string().regex(/^\w[-\w]{1,200}$/).required(),
         attributes: Joi.object({
           sitesTreePopulationStrategy: Joi.string().min(2).regex(/^[-\w/]{1,200}$/).default('ImportUrls'),
           spiderStrategy: Joi.string().min(2).regex(/^[-\w/]{1,200}$/).default('Standard'),

diff --git a/src/api/app/do/sUt.browserApp.js b/src/api/app/do/sUt.browserApp.js
@@ -55,7 +55,7 @@ class BrowserApp extends Sut {
       }),
       testSession: Joi.object({
         type: Joi.string().valid('appScanner').required(),
-        id: Joi.string().alphanum().required(),
+        id: Joi.string().regex(/^\w[-\w]{1,200}$/).required(),
         attributes: Joi.object({
           sitesTreePopulationStrategy: Joi.string().min(2).regex(/^[-\w/]{1,200}$/).default('WebDriverStandard'),
           spiderStrategy: Joi.string().min(2).regex(/^[-\w/]{1,200}$/).default('Standard'),