Revert cypress file and logger messages back to namespace

bcgov · Jul 19, 2024 · 8ceb7af · 8ceb7af
1 parent 88b4845
commit 8ceb7af
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/e2e/cypress/pageObjects/home.ts b/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("Gateway "+name+" created!")
+    cy.verifyToastMessage("Namespace "+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,"Gateway name must be between 5 and 15 alpha-numeric lowercase characters and start and end with an alphabet.")
+        assert.equal(validationMessage,"Namespace name must be between 5 and 15 alpha-numeric lowercase characters and start and end with an alphabet.")
       })
       // cy.verifyToastMessage("Namespace create failed")
     })

diff --git a/src/auth/auth-oauth2-proxy.js b/src/auth/auth-oauth2-proxy.js
@@ -208,7 +208,7 @@ class Oauth2ProxyAuthStrategy {
 
           res.json({ switch: switched });
         } catch (err) {
-          logger.error('Error clearing gateway %s', err);
+          logger.error('Error clearing namespace %s', err);
           res.status(400).json({ switch: false, error: 'ns_cleared_fail' });
         }
       }

diff --git a/src/services/workflow/delete-namespace.ts b/src/services/workflow/delete-namespace.ts
@@ -21,7 +21,7 @@ export const DeleteNamespaceValidate = async (
   ns: string,
   force: boolean
 ): Promise<void> => {
-  logger.debug('Validate Deleting Gateway ns=%s', ns);
+  logger.debug('Validate Deleting Namespace ns=%s', ns);
 
   const gwServices = await lookupServicesByNamespace(context, ns);
 
@@ -63,7 +63,7 @@ export const DeleteNamespaceRecordActivity = async (
   context: any,
   ns: string
 ): Promise<{ id: string }> => {
-  logger.debug('Record Activity for Deleting Gateway ns=%s', ns);
+  logger.debug('Record Activity for Deleting Namespace ns=%s', ns);
 
   const envs = await lookupEnvironmentsByNS(context, ns);
 
@@ -98,7 +98,7 @@ export const DeleteNamespace = async (
   subjectToken: string,
   ns: string
 ) => {
-  logger.debug('Deleting Gateway ns=%s', ns);
+  logger.debug('Deleting Namespace ns=%s', ns);
   assert.strictEqual(
     typeof ns === 'string' && ns.length > 0,
     true,

diff --git a/src/services/workflow/validate-active-environment.ts b/src/services/workflow/validate-active-environment.ts
@@ -67,7 +67,7 @@ export const ValidateActiveEnvironment = async (
         );
       } else if (typeof nsOrgDetails === 'undefined') {
         logger.error(
-          '[dataset] Gateway not found %s',
+          '[dataset] Namespace not found %s',
           envServices.product.namespace
         );
         addValidationError(

diff --git a/src/services/workflow/validate-issuer.ts b/src/services/workflow/validate-issuer.ts
@@ -40,7 +40,7 @@ export const ValidateIssuer = async (
     );
     if (!privileged) {
       logger.warn(
-        '[%s] Setting shared is only available in privileged gateways',
+        '[%s] Setting shared is only available in privileged namespaces',
         resolvedData['namespace']
       );
       addValidationError(