Merge pull request #1085 from bcgov/feature/ns-to-gw-validation-error

Validation error messages namespace to gateway

src/controllers/v2/NamespaceController.ts

@@ -165,7 +165,7 @@ export class NamespaceController extends Controller {
       result.errors.forEach((err: any, ind: number) => {
         errors[`d${ind}`] = { message: err.message };
       });
-      throw new ValidateError(errors, 'Unable to create namespace');
+      throw new ValidateError(errors, 'Unable to create gateway');
     }
     return {
       name: result.data.createNamespace.name,
@@ -201,7 +201,7 @@ export class NamespaceController extends Controller {
       result.errors.forEach((err: any, ind: number) => {
         errors[`d${ind}`] = { message: err.message };
       });
-      throw new ValidateError(errors, 'Unable to delete namespace');
+      throw new ValidateError(errors, 'Unable to delete gateway');
     }
     return result.data.forceDeleteNamespace;
   }

src/lists/extensions/Namespace.ts

@@ -251,7 +251,7 @@ module.exports = {
               assert.strictEqual(
                 re.test(args.namespace),
                 true,
-                'Namespace name must be between 5 and 15 alpha-numeric lowercase characters and begin with an alphabet.'
+                'Gateway name must be between 5 and 15 alpha-numeric lowercase characters and begin with an alphabet.'
               );
               const noauthContext = context.createContext({
                 skipAccessControl: true,

src/services/workflow/delete-namespace.ts

@@ -36,22 +36,22 @@ export const DeleteNamespaceValidate = async (
     messages.push(
       `${accessList.length} ${
         accessList.length == 1 ? 'consumer has' : 'consumers have'
-      } access to products in this namespace.`
+      } access to products in this gateway.`
     );
   }
   if (gwServices.length > 0) {
     messages.push(
       `${gwServices.length} ${
         gwServices.length == 1 ? 'service has' : 'services have'
-      } been configured in this namespace.`
+      } been configured in this gateway.`
     );
   }
 
   // Even when force=true, if there are consumers then do not proceed
   if (accessList.length != 0) {
     const msg = `${accessList.length} ${
       accessList.length == 1 ? 'consumer has' : 'consumers have'
-    } access to products in this namespace.`;
+    } access to products in this gateway.`;
     assert.strictEqual(accessList.length == 0, true, msg);
   }
   if (!force) {

src/services/workflow/validate-access-request.ts

@@ -89,7 +89,7 @@ export const Validate = async (
         'Can not mark a new request approved'
       );
 
-      // assert that either the Product is Active or it belongs to the authorized Subject namespace
+      // assert that either the Product is Active or it belongs to the authorized Subject gateway
       assert.strictEqual(
         prodEnv.active === true ||
           prodEnv.product.namespace === context.authedItem.namespace,

src/services/workflow/validate-active-environment.ts

@@ -71,19 +71,19 @@ export const ValidateActiveEnvironment = async (
           envServices.product.namespace
         );
         addValidationError(
-          `[dataset] Unexpected error finding namespace.  Unable to complete request.`
+          `[dataset] Unexpected error finding gateway.  Unable to complete request.`
         );
       } else if (nsOrgDetails.enabled === false) {
         addValidationError(
-          `[dataset] Namespace must be assigned to an Organization before an Environment can be active.`
+          `[dataset] Gateway must be assigned to an Organization before an Environment can be active.`
         );
       } else if (
         nsOrgDetails.name === envDataset?.organization?.name &&
         nsOrgDetails.orgUnit === envDataset?.organizationUnit?.name
       ) {
       } else {
         addValidationError(
-          `[dataset] Namespace and Dataset must belong to the same Organization Unit (ns:${nsOrgDetails.orgUnit}, dataset:${envDataset?.organizationUnit?.name})`
+          `[dataset] Gateway and Dataset must belong to the same Organization Unit (ns:${nsOrgDetails.orgUnit}, dataset:${envDataset?.organizationUnit?.name})`
         );
       }
 

src/services/workflow/validate-issuer.ts

@@ -44,7 +44,7 @@ export const ValidateIssuer = async (
         resolvedData['namespace']
       );
       addValidationError(
-        'Setting shared is only available in privileged namespaces'
+        'Setting shared is only available in privileged gateways'
       );
     }
   }