FIX: Changing nimbus prd url

package-lock.json

@@ -18,7 +18,7 @@
         "@nestjs/microservices": "^8.4.3",
         "@nestjs/platform-express": "^8.4.3",
         "@nestjs/swagger": "^5.2.1",
-        "@victorradael/protospack": "^1.5.9",
+        "@victorradael/protospack": "^1.6.1",
         "axios": "^0.25.0",
         "dotenv": "^14.2.0",
         "helmet": "^5.0.2",
@@ -2344,9 +2344,9 @@
       }
     },
     "node_modules/@victorradael/protospack": {
-      "version": "1.5.9",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.5.9.tgz",
-      "integrity": "sha512-h96qwtRftVkZ0ftsahymnxO/bwCL8/bHvllyjTuhcLLmBj0fKG6q/nz5S9cFpq8OAEljehO+luNj388mZCF7Yg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.6.1.tgz",
+      "integrity": "sha512-GEW+NYaMNnuUZ4/WsNJGpi3dHAOXkbm4BQKFkT/Ij7P9vSelyx9RGqkrs5m0biAXfITWDHe8hjI4AbRQe6AMDw==",
       "dependencies": {
         "rxjs": "^7.5.5"
       }
@@ -10904,9 +10904,9 @@
       }
     },
     "@victorradael/protospack": {
-      "version": "1.5.9",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.5.9.tgz",
-      "integrity": "sha512-h96qwtRftVkZ0ftsahymnxO/bwCL8/bHvllyjTuhcLLmBj0fKG6q/nz5S9cFpq8OAEljehO+luNj388mZCF7Yg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.6.1.tgz",
+      "integrity": "sha512-GEW+NYaMNnuUZ4/WsNJGpi3dHAOXkbm4BQKFkT/Ij7P9vSelyx9RGqkrs5m0biAXfITWDHe8hjI4AbRQe6AMDw==",
       "requires": {
         "rxjs": "^7.5.5"
       }

package.json

@@ -30,7 +30,7 @@
     "@nestjs/microservices": "^8.4.3",
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "^1.5.9",
+    "@victorradael/protospack": "^1.6.1",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "helmet": "^5.0.2",

src/modules/catalog/catalog.service.ts

@@ -6,12 +6,16 @@ class CatalogService {
       body.info.customer.toLowerCase() === 'dadosfera'
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/all/`,
-    );
-    console.log(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/all/`,
-    );
+
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/all/`);
+
     return data;
   }
 
@@ -21,9 +25,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data_apps/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data_apps/`);
     return data;
   }
 
@@ -33,8 +42,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data_apps/${id}/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/data_apps/${id}/`,
     );
     return data;
   }
@@ -45,8 +61,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/dashboard-metabase/`,
+      `${nimbusUrl}/api/catalog/dashboard-metabase/`,
     );
     return data;
   }
@@ -57,8 +80,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/dashboard-metabase/${id}`,
+      `${nimbusUrl}/api/catalog/dashboard-metabase/${id}`,
     );
 
     const [, path] = data.iframe_url.split('.dadosfera');
@@ -74,8 +104,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/`,
+      `${nimbusUrl}/api/catalog/table-metadata/`,
     );
     return data;
   }
@@ -86,8 +123,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/`,
+      `${nimbusUrl}/api/catalog/table-metadata/`,
       { params: params },
     );
     return data;
@@ -99,8 +143,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/${id}`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-metadata/${id}`,
     );
     return data;
   }
@@ -111,8 +162,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/column-metadata/`,
+      `${nimbusUrl}/api/catalog/column-metadata/`,
       { params: params },
     );
     return data;
@@ -124,8 +182,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/column-metadata/${id}/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/column-metadata/${id}/`,
     );
     return data;
   }
@@ -136,10 +201,16 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-preview/`,
-      { params: params },
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-preview/`, {
+      params: params,
+    });
     return data;
   }
 
@@ -149,9 +220,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-status/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-status/`);
     return data;
   }
 
@@ -161,8 +237,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-description/`,
+      `${nimbusUrl}/api/catalog/data-description/`,
     );
     return data;
   }
@@ -173,9 +256,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-docs/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-docs/`);
     return data;
   }
 
@@ -185,9 +273,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-rating/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-rating/`);
     return data;
   }
 
@@ -197,8 +290,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-rating/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/data-rating/`,
       body,
     );
     return data;
@@ -209,8 +309,16 @@ class CatalogService {
       body.info.customer.toLowerCase() === 'dadosfera'
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
+
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/summary-rating/${id}`,
+      `${nimbusUrl}/api/catalog/summary-rating/${id}`,
     );
     return data;
   }
@@ -221,9 +329,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-comment/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-comment/`);
     return data;
   }
 
@@ -233,8 +346,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-comment/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/data-comment/`,
       body,
     );
     return data;
@@ -246,10 +366,16 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-review/`,
-      { params: params },
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-review/`, {
+      params: params,
+    });
     return data;
   }
 
@@ -259,10 +385,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/tags/`,
-      body,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/`, body);
     return data;
   }
 
@@ -272,10 +402,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/tags/`,
-      body,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/`, body);
     return data;
   }
 
@@ -285,8 +419,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-tags/`,
+      `${nimbusUrl}/api/catalog/table-tags/`,
       body,
     );
     return data;
@@ -298,9 +439,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/tags/${id}`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/${id}`);
     return data;
   }
 
@@ -310,8 +456,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-tags/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-tags/`,
       body,
     );
     return data;
@@ -323,8 +476,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-tags/${id}`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-tags/${id}`,
     );
     return data;
   }
@@ -335,8 +495,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-rules/`,
+      `${nimbusUrl}/api/catalog/table-rules/`,
       body,
     );
     return data;
@@ -348,8 +515,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-rules/${id}`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `${
+            process.env.NIMBUS_BASE_URL
+          }-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `http://nimbus-api${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-rules/${id}`,
     );
     return data;
   }