fix: Update workspace name reg exp and workspace config tags reg exp (#…

…452)
awslabs · Apr 22, 2021 · f9b7d62 · f9b7d62
1 parent 35f6cce
commit f9b7d62
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/...ronment-type-mgmt-services/lib/environment-type/__tests__/env-type-config-service.test.js b/...ronment-type-mgmt-services/lib/environment-type/__tests__/env-type-config-service.test.js
@@ -301,6 +301,12 @@ describe('EnvTypeService', () => {
             value: '${vpcId}',
           },
         ],
+        tags: [
+          {
+            key: 'customTag',
+            value: '${indexId}',
+          },
+        ],
       };
       const envType = {
         id: newConfig.id,

diff --git a/...es/environment-type-mgmt-services/lib/environment-type/__tests__/env-type-service.test.js b/...es/environment-type-mgmt-services/lib/environment-type/__tests__/env-type-service.test.js
@@ -297,7 +297,7 @@ describe('EnvTypeService', () => {
       const envType = {
         id: 'theverybest',
         rev: 1,
-        name: 'stuff',
+        name: 'stuff with spaces',
         desc: 'stuff',
         status: 'approved',
       };
@@ -413,7 +413,7 @@ describe('EnvTypeService', () => {
       // BUILD
       const envType = {
         id: 'iwilltravelacrosstheland',
-        name: 'searchingfarandwide',
+        name: 'searchingfarandwide with spaces',
         product: {
           productId: 'each-------tounderstand',
         },

diff --git a/...pi/packages/environment-type-mgmt-services/lib/environment-type/schema/create-env-type.js b/...pi/packages/environment-type-mgmt-services/lib/environment-type/schema/create-env-type.js
@@ -33,7 +33,7 @@ const schema = {
       // To accommodate default value ${product.name}-${provisioningArtifact.name} we need 16383
       maxLength: 16383,
       minLength: 2,
-      pattern: '^[a-zA-Z0-9_\\-]*$',
+      pattern: '^[a-zA-Z0-9_\\-\\s]*$',
     },
     // Description for this workspace-type
     // Defaults to provisioningArtifact.description

diff --git a/...onment-type-mgmt-services/lib/environment-type/schema/create-or-update-env-type-config.js b/...onment-type-mgmt-services/lib/environment-type/schema/create-or-update-env-type-config.js
@@ -101,7 +101,7 @@ const schema = {
             value: {
               type: 'string', // Tag value
               maxLength: 8191,
-              pattern: '^([^<>{}]*)$',
+              pattern: '^([$\\{]*[^<>{}]*[\\}]*)$',
             },
           },
         },

diff --git a/...pi/packages/environment-type-mgmt-services/lib/environment-type/schema/update-env-type.js b/...pi/packages/environment-type-mgmt-services/lib/environment-type/schema/update-env-type.js
@@ -36,7 +36,7 @@ const schema = {
       // To accommodate default value ${product.name}-${provisioningArtifact.name} we need 16383
       maxLength: 16383,
       minLength: 2,
-      pattern: '^[a-zA-Z0-9_\\-]*$',
+      pattern: '^[a-zA-Z0-9_\\-\\s]*$',
     },
     // Description for this workspace-type
     // Defaults to provisioningArtifact.description