Validation error messages namespace to gateway

e2e/cypress/pageObjects/home.ts

@@ -15,7 +15,7 @@ class HomePage {
     cy.get(this.nsDropdownCreateNsBtn).click()
     cy.get(this.namespaceNameInput).type(name) // using `platform` as a default ns as its being seeding through feeder
     cy.get(this.nsCreateBtn).click()
-    cy.verifyToastMessage("Namespace "+name+" created!")
+    cy.verifyToastMessage("Gateway "+name+" created!")
     cy.wait(5000) // wait for dropdown to have latest text
     cy.get(this.nsDropdown).then(($el) => {
       expect($el).contain(name)
@@ -56,7 +56,7 @@ class HomePage {
       cy.wait(1000)
       cy.get(this.namespaceNameInput).next('div').then(($ele) => {
         let validationMessage = $ele.text()
-        assert.equal(validationMessage,"Namespace name must be between 5 and 15 alpha-numeric lowercase characters and start and end with an alphabet.")
+        assert.equal(validationMessage,"Gateway name must be between 5 and 15 alpha-numeric lowercase characters and start and end with an alphabet.")
       })
       // cy.verifyToastMessage("Namespace create failed")
     })

src/auth/auth-oauth2-proxy.js

@@ -208,7 +208,7 @@ class Oauth2ProxyAuthStrategy {
 
           res.json({ switch: switched });
         } catch (err) {
-          logger.error('Error clearing namespace %s', err);
+          logger.error('Error clearing gateway %s', err);
           res.status(400).json({ switch: false, error: 'ns_cleared_fail' });
         }
       }

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

@@ -21,7 +21,7 @@ export const DeleteNamespaceValidate = async (
   ns: string,
   force: boolean
 ): Promise<void> => {
-  logger.debug('Validate Deleting Namespace ns=%s', ns);
+  logger.debug('Validate Deleting Gateway ns=%s', ns);
 
   const gwServices = await lookupServicesByNamespace(context, ns);
 
@@ -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) {
@@ -63,7 +63,7 @@ export const DeleteNamespaceRecordActivity = async (
   context: any,
   ns: string
 ): Promise<{ id: string }> => {
-  logger.debug('Record Activity for Deleting Namespace ns=%s', ns);
+  logger.debug('Record Activity for Deleting Gateway ns=%s', ns);
 
   const envs = await lookupEnvironmentsByNS(context, ns);
 
@@ -98,7 +98,7 @@ export const DeleteNamespace = async (
   subjectToken: string,
   ns: string
 ) => {
-  logger.debug('Deleting Namespace ns=%s', ns);
+  logger.debug('Deleting Gateway ns=%s', ns);
   assert.strictEqual(
     typeof ns === 'string' && ns.length > 0,
     true,

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

@@ -67,23 +67,23 @@ export const ValidateActiveEnvironment = async (
         );
       } else if (typeof nsOrgDetails === 'undefined') {
         logger.error(
-          '[dataset] Namespace not found %s',
+          '[dataset] Gateway not found %s',
           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

@@ -40,11 +40,11 @@ export const ValidateIssuer = async (
     );
     if (!privileged) {
       logger.warn(
-        '[%s] Setting shared is only available in privileged namespaces',
+        '[%s] Setting shared is only available in privileged gateways',
         resolvedData['namespace']
       );
       addValidationError(
-        'Setting shared is only available in privileged namespaces'
+        'Setting shared is only available in privileged gateways'
       );
     }
   }