Merge branch 'feat/integration_support' into PR_main_integration_support

atlanhq · Nov 8, 2023 · fe795dd · fe795dd
2 parents 2f69567 + 8ff1a35
commit fe795dd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/adapters/api/create-resource.js b/adapters/api/create-resource.js
@@ -59,5 +59,6 @@ export default async function createResource(
       });
     });
 
+  if (response?.errorCode) return null;
   return response;
 }
diff --git a/adapters/api/segment.js b/adapters/api/segment.js
@@ -18,12 +18,13 @@ export async function sendSegmentEvent(action, body) {
   };
 
   var response = null;
+
   if (!IS_DEV) {
     response = await fetch(
       `${ATLAN_INSTANCE_URL}/api/service/segment/track`,
       requestOptions
     )
-      .then(() => {
+      .then((resp) => {
         console.log("send segment event", action, body);
       })
       .catch((err) => {

diff --git a/adapters/integrations/github-integration.js b/adapters/integrations/github-integration.js
@@ -77,7 +77,7 @@ export default class GitHubIntegration extends IntegrationInterface {
       }
 
       if (total_assets !== 0) {
-        this.sendSegmentEventOfIntegration({
+        await this.sendSegmentEventOfIntegration({
           action: "dbt_ci_action_run",
           properties: {
             asset_count: total_assets,
@@ -412,7 +412,9 @@ export default class GitHubIntegration extends IntegrationInterface {
               pull_request.html_url,
               this.sendSegmentEventOfIntegration
             );
+
             const md = getMDCommentForModel(ATLAN_INSTANCE_URL, model);
+
             tableMd += getTableMD(md, resp);
             if (!resp) {
               setResourceFailed = true;
@@ -433,10 +435,12 @@ export default class GitHubIntegration extends IntegrationInterface {
               pull_request.html_url,
               this.sendSegmentEventOfIntegration
             );
+
             const md = getMDCommentForMaterialisedView(
               ATLAN_INSTANCE_URL,
               materialisedView
             );
+
             tableMd += getTableMD(md, resp);
             if (!resp) {
               setResourceFailed = true;
@@ -858,6 +862,7 @@ ${content}`;
         headSHA,
         "createIssueComment"
       );
+
       return content;
     }
 

diff --git a/adapters/integrations/gitlab-integration.js b/adapters/integrations/gitlab-integration.js
@@ -117,7 +117,7 @@ export default class GitLabIntegration extends IntegrationInterface {
       }
 
       if (total_assets !== 0)
-        this.sendSegmentEventOfIntegration({
+        await this.sendSegmentEventOfIntegration({
           action: "dbt_ci_action_run",
           properties: {
             asset_count: total_assets,

diff --git a/dist/index.js b/dist/index.js
@@ -25366,6 +25366,7 @@ async function createResource(
       });
     });
 
+  if (response?.errorCode) return null;
   return response;
 }
 
@@ -25386,12 +25387,13 @@ async function sendSegmentEvent(action, body) {
   };
 
   var response = null;
+
   if (!IS_DEV) {
     response = await src_fetch(
       `${ATLAN_INSTANCE_URL}/api/service/segment/track`,
       requestOptions
     )
-      .then(() => {
+      .then((resp) => {
         console.log("send segment event", action, body);
       })
       .catch((err) => {
@@ -25571,7 +25573,7 @@ class GitHubIntegration extends IntegrationInterface {
       }
 
       if (total_assets !== 0) {
-        this.sendSegmentEventOfIntegration({
+        await this.sendSegmentEventOfIntegration({
           action: "dbt_ci_action_run",
           properties: {
             asset_count: total_assets,
@@ -25906,7 +25908,9 @@ class GitHubIntegration extends IntegrationInterface {
               pull_request.html_url,
               this.sendSegmentEventOfIntegration
             );
+
             const md = getMDCommentForModel(ATLAN_INSTANCE_URL, model);
+
             tableMd += getTableMD(md, resp);
             if (!resp) {
               setResourceFailed = true;
@@ -25927,10 +25931,12 @@ class GitHubIntegration extends IntegrationInterface {
               pull_request.html_url,
               this.sendSegmentEventOfIntegration
             );
+
             const md = getMDCommentForMaterialisedView(
               ATLAN_INSTANCE_URL,
               materialisedView
             );
+
             tableMd += getTableMD(md, resp);
             if (!resp) {
               setResourceFailed = true;
@@ -26352,6 +26358,7 @@ ${content}`;
         headSHA,
         "createIssueComment"
       );
+
       return content;
     }
 
@@ -34134,7 +34141,7 @@ class GitLabIntegration extends IntegrationInterface {
       }
 
       if (total_assets !== 0)
-        this.sendSegmentEventOfIntegration({
+        await this.sendSegmentEventOfIntegration({
           action: "dbt_ci_action_run",
           properties: {
             asset_count: total_assets,
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,5 +59,6 @@ export default async function createResource( @@
           });
         });
+      if (response?.errorCode) return null;
       return response;
     }