Merge pull request #136 from atlanhq/revert-134-DQ-384-rename-to-atla…

…n-action Revert "DQ-384 rename(dbt-action): change dbt-action to atlan action"
atlanhq · Oct 7, 2024 · 4e565a3 · 4e565a3
2 parents d8e827a + 77e39e9
commit 4e565a3
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 166 deletions.
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -3,8 +3,6 @@ name: Test Action
 on:
   pull_request:
     types: [opened, edited, synchronize, reopened, closed]
-    paths:
-      - 'test/**'
 
 jobs:
   get-downstream-assets:

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# Atlan Action
+# Atlan dbt Action
 
 ![atlan<>dbt](https://user-images.githubusercontent.com/14099191/209542321-54d5557e-8abf-4d9a-9f6d-dcacb856f25f.png)
 
 ## Overview
 
-_Have you ever changed a dbt model or a [data contract](https://ask.atlan.com/hc/en-us/articles/9281528742799-How-to-create-data-contracts) only to later find it broke a downstream table or dashboard? 💔_
+_Have you ever changed a dbt model only to later find it broke a downstream table or dashboard? 💔_
 
 We've created a GitHub Action to help you out — putting Atlan's impact analysis right into your pull request. So now, before merging the PR, you can see the potential downstream impact of your changes.
 
@@ -31,7 +31,7 @@ Here's what it looks like 👇
    2. Add the following code to the workflow file:
 
       ```yaml
-      name: Atlan action
+      name: Atlan dbt action
 
       on:
         pull_request:
@@ -43,7 +43,7 @@ Here's what it looks like 👇
           runs-on: ubuntu-latest
           steps:
             - name: Run Action
-              uses: atlanhq/atlan-action@v2
+              uses: atlanhq/dbt-action@v1
               with:
                 GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
                 ATLAN_INSTANCE_URL: ${{secrets.ATLAN_INSTANCE_URL}}
@@ -52,7 +52,7 @@ Here's what it looks like 👇
 
 ## Test the action
 
-After you've completed the configuration above, create a pull request with a changed dbt model or data contract file to test the action. You should see the Atlan GitHub action running and then adding comments in your pull request:
+After you've completed the configuration above, create a pull request with a changed dbt model file to test the action. You should see the Atlan GitHub action running and then adding comments in your pull request:
 
 - The GitHub workflow will add and update a single comment for every file change.
 - The impacted assets in the comment will be displayed in a collapsible section and grouped by source and asset type.
@@ -84,7 +84,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run Action
-        uses: atlanhq/atlan-action@v2
+        uses: atlanhq/dbt-action@v1
         with:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           ATLAN_INSTANCE_URL: ${{secrets.ATLAN_INSTANCE_URL}}
@@ -105,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run Action
-        uses: atlanhq/atlan-action@v2
+        uses: atlanhq/dbt-action@v1
         with:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           ATLAN_INSTANCE_URL: ${{secrets.ATLAN_INSTANCE_URL}}

diff --git a/SETUP.md b/SETUP.md
@@ -31,7 +31,7 @@ It is a very useful and easy to use library, which runs your Github Actions loca
 
 Since you as a developer would be using your Github PAT to test the action locally, you'll need to locally run the clone of your fork, in order to generate the event.json file, follow the following steps:
 
-- [Fork this repo.](https://github.com/atlanhq/atlan-action/fork)
+- [Fork this repo.](https://github.com/atlanhq/dbt-action/fork)
 - Create a pull request from `test-action` branch to `main` branch. Once you do so, it will automatically run the action.
 - Go to your forked repo's `Actions` page and open the workflow with the name `Test Action`.
 - Click on the one and only job, `Get Downstream Assets`.
@@ -58,4 +58,4 @@ Once and if `act` is setup properly, then you can simply use the command `npm st
 
 ## Contributing
 
-Please make sure to use the command `npm run sync` in order to sync changes, since the workflow [`.github/workflows/package-action.yml`](https://github.com/atlanhq/atlan-action/blob/main/.github/workflows/package-action.yml) updates the `dist/` in order to package the action code in case you forget to package the action before pushing.
+Please make sure to use the command `npm run sync` in order to sync changes, since the workflow [`.github/workflows/package-action.yml`](https://github.com/atlanhq/dbt-action/blob/main/.github/workflows/package-action.yml) updates the `dist/` in order to package the action code in case you forget to package the action before pushing.
diff --git a/action.yml b/action.yml
@@ -1,5 +1,5 @@
-name: "Atlan Action"
-description: "Whenever you make a change to a dbt model or a data contract, Atlan will add downstream lineage impact context right in your pull requests."
+name: "Atlan dbt Action"
+description: "Whenever you make a change to a dbt model, Atlan will add downstream lineage impact context right in your pull requests."
 author: "Atlan"
 
 inputs:

diff --git a/adapters/api/get-contract-asset.js b/adapters/api/get-contract-asset.js
@@ -35,15 +35,6 @@ export default async function getContractAsset({
                           term: {
                               qualifiedName: assetQualifiedName
                           }
-                      },
-                      {
-                        terms: {
-                          "__typeName.keyword": [
-                            "Table",
-                            "MaterialisedView",
-                            "View"
-                          ]
-                        }
                       }
                   ]
               }

diff --git a/adapters/integrations/atlan-contract-impact-analysis-github.js b/adapters/integrations/atlan-contract-impact-analysis-github.js
@@ -843,6 +843,7 @@ ${viewAssetButton}`;
 
     // Iterate through the object to find relevant keys
     for (const [key, value] of Object.entries(configYaml)) {
+        console.log(key);
         if (key.startsWith('data_source ')) {
             // Trim the prefix and add to the Map
             const trimmedKey = key.replace('data_source ', '');

diff --git a/adapters/integrations/gitlab-integration.js b/adapters/integrations/gitlab-integration.js
@@ -779,66 +779,23 @@ ${content}`;
           CI_COMMIT_SHA,
           "getAssetName"
         );
-        const startRegex =
-            /{{\s*config\s*\(/im;
-        const startMatch = fileContents.match(startRegex);
-        let configSection = ''
-        if (startMatch) {
-          const startIndex = startMatch.index;
-          const openParensIndex = fileContents.indexOf('(', startIndex) + 1;
-          let openParensCount = 1;
-          let endIndex = openParensIndex;
-
-          while (openParensCount > 0 && endIndex < fileContents.length) {
-            const char = fileContents[endIndex];
-
-            if (char === '(') {
-                openParensCount++;
-            } else if (char === ')') {
-                openParensCount--;
-            }
-            endIndex++;
-            }
-
-            const endMarker = '}}';
-            const finalEndIndex = fileContents.indexOf(endMarker, endIndex) + endMarker.length;
-
-            configSection = fileContents.substring(startIndex, finalEndIndex);
-            logger.withInfo(
-              "Extracted config section",
-              integrationName,
-              CI_COMMIT_SHA,
-              "getAssetName"
-            );
-
-            if (configSection){
-              logger.withInfo(
-                "Executing final regex",
-                integrationName,
-                CI_COMMIT_SHA,
-                "getAssetName"
-              );
-
-              var matches = regExp.exec(configSection);
-
-              logger.withInfo(
-                "Successfully executed regex matching",
-                integrationName,
-                CI_COMMIT_SHA,
-                "getAssetName"
-              );
+        var matches = regExp.exec(fileContents);
 
-            }
-            if (matches) {
-              logger.withInfo(
-                `Found a match: ${matches[1].trim()}`,
-                integrationName,
-                CI_COMMIT_SHA,
-                "getAssetName"
-              );
+        logger.withInfo(
+          "Successfully executed regex matching",
+          integrationName,
+          CI_COMMIT_SHA,
+          "getAssetName"
+        );
 
-              return matches[1].trim();
-            }
+        if (matches) {
+          logger.withInfo(
+            `Found a match: ${matches[1].trim()}`,
+            integrationName,
+            CI_COMMIT_SHA,
+            "getAssetName"
+          );
+          return matches[1].trim();
         }
       }
 

diff --git a/adapters/templates/github-integration.js b/adapters/templates/github-integration.js
@@ -5,7 +5,7 @@ export function getErrorResponseStatus401 (ATLAN_INSTANCE_URL, context) {
 
 Atlan Instance URL: ${ATLAN_INSTANCE_URL}
     
-Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://github.com/atlanhq/atlan-action/blob/main/README.md).`
+Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://github.com/atlanhq/dbt-action/blob/main/README.md).`
 }
 
 export function getErrorResponseStatusUndefined(ATLAN_INSTANCE_URL, context) {
@@ -16,7 +16,7 @@ Atlan Instance URL: ${ATLAN_INSTANCE_URL}
 Make sure your Atlan Instance URL is set in the following format.
 \`https://tenant.atlan.com\`
     
-Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://github.com/atlanhq/atlan-action/blob/main/README.md).`
+Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://github.com/atlanhq/dbt-action/blob/main/README.md).`
 }
 
 export function getSetResourceOnAssetComment(tableMd, setResourceFailed) {

diff --git a/adapters/templates/gitlab-integration.js b/adapters/templates/gitlab-integration.js
@@ -1,11 +1,11 @@
-import { getCertificationImage, getConnectorImage, getImageURL } from "../utils/index.js";
+import { getImageURL, getConnectorImage, getCertificationImage } from "../utils/index.js";
 
 export function getErrorResponseStatus401 (ATLAN_INSTANCE_URL, CI_PROJECT_NAME, CI_PROJECT_NAMESPACE) {
     return `We couldn't connect to your Atlan Instance, please make sure to set the valid Atlan Bearer Token as \`ATLAN_API_TOKEN\` as this repository's CI/CD variable. 
 
 Atlan Instance URL: ${ATLAN_INSTANCE_URL}
     
-Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
+Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
 }
 
 export function getErrorResponseStatusUndefined(ATLAN_INSTANCE_URL, CI_PROJECT_NAME, CI_PROJECT_NAMESPACE) {
@@ -16,7 +16,7 @@ Atlan Instance URL: ${ATLAN_INSTANCE_URL}
 Make sure your Atlan Instance URL is set in the following format.
 \`https://tenant.atlan.com\`
     
-Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
+Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
 }
 
 export function getSetResourceOnAssetComment(tableMd, setResourceFailed) {

diff --git a/dist/index.js b/dist/index.js
@@ -24831,7 +24831,7 @@ function getErrorResponseStatus401 (ATLAN_INSTANCE_URL, context) {
 
 Atlan Instance URL: ${ATLAN_INSTANCE_URL}
 
-Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://github.com/atlanhq/atlan-action/blob/main/README.md).`
+Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://github.com/atlanhq/dbt-action/blob/main/README.md).`
 }
 
 function getErrorResponseStatusUndefined(ATLAN_INSTANCE_URL, context) {
@@ -24842,7 +24842,7 @@ Atlan Instance URL: ${ATLAN_INSTANCE_URL}
 Make sure your Atlan Instance URL is set in the following format.
 \`https://tenant.atlan.com\`
 
-Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://github.com/atlanhq/atlan-action/blob/main/README.md).`
+Set your repository action secrets [here](https://github.com/${context.payload.repository.full_name}/settings/secrets/actions). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://github.com/atlanhq/dbt-action/blob/main/README.md).`
 }
 
 function getSetResourceOnAssetComment(tableMd, setResourceFailed) {
@@ -25120,15 +25120,6 @@ async function getContractAsset({
                           term: {
                               qualifiedName: assetQualifiedName
                           }
-                      },
-                      {
-                        terms: {
-                          "__typeName.keyword": [
-                            "Table",
-                            "MaterialisedView",
-                            "View"
-                          ]
-                        }
                       }
                   ]
               }
@@ -30597,6 +30588,7 @@ ${viewAssetButton}`;
 
     // Iterate through the object to find relevant keys
     for (const [key, value] of Object.entries(configYaml)) {
+        console.log(key);
         if (key.startsWith('data_source ')) {
             // Trim the prefix and add to the Map
             const trimmedKey = key.replace('data_source ', '');
@@ -39065,7 +39057,7 @@ function gitlab_integration_getErrorResponseStatus401 (ATLAN_INSTANCE_URL, CI_PR
 
 Atlan Instance URL: ${ATLAN_INSTANCE_URL}
 
-Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
+Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
 }
 
 function gitlab_integration_getErrorResponseStatusUndefined(ATLAN_INSTANCE_URL, CI_PROJECT_NAME, CI_PROJECT_NAMESPACE) {
@@ -39076,7 +39068,7 @@ Atlan Instance URL: ${ATLAN_INSTANCE_URL}
 Make sure your Atlan Instance URL is set in the following format.
 \`https://tenant.atlan.com\`
 
-Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
+Set your CI/CD variables [here](https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/settings/ci_cd). For more information on how to setup the Atlan dbt Action, please read the [setup documentation here](https://ask.atlan.com/hc/en-us/articles/8284983222415).`
 }
 
 function gitlab_integration_getSetResourceOnAssetComment(tableMd, setResourceFailed) {
@@ -39910,66 +39902,23 @@ ${content}`;
           CI_COMMIT_SHA,
           "getAssetName"
         );
-        const startRegex =
-            /{{\s*config\s*\(/im;
-        const startMatch = fileContents.match(startRegex);
-        let configSection = ''
-        if (startMatch) {
-          const startIndex = startMatch.index;
-          const openParensIndex = fileContents.indexOf('(', startIndex) + 1;
-          let openParensCount = 1;
-          let endIndex = openParensIndex;
-
-          while (openParensCount > 0 && endIndex < fileContents.length) {
-            const char = fileContents[endIndex];
-
-            if (char === '(') {
-                openParensCount++;
-            } else if (char === ')') {
-                openParensCount--;
-            }
-            endIndex++;
-            }
-
-            const endMarker = '}}';
-            const finalEndIndex = fileContents.indexOf(endMarker, endIndex) + endMarker.length;
-
-            configSection = fileContents.substring(startIndex, finalEndIndex);
-            logger_logger.withInfo(
-              "Extracted config section",
-              gitlab_integration_integrationName,
-              CI_COMMIT_SHA,
-              "getAssetName"
-            );
-
-            if (configSection){
-              logger_logger.withInfo(
-                "Executing final regex",
-                gitlab_integration_integrationName,
-                CI_COMMIT_SHA,
-                "getAssetName"
-              );
-
-              var matches = regExp.exec(configSection);
-
-              logger_logger.withInfo(
-                "Successfully executed regex matching",
-                gitlab_integration_integrationName,
-                CI_COMMIT_SHA,
-                "getAssetName"
-              );
+        var matches = regExp.exec(fileContents);
 
-            }
-            if (matches) {
-              logger_logger.withInfo(
-                `Found a match: ${matches[1].trim()}`,
-                gitlab_integration_integrationName,
-                CI_COMMIT_SHA,
-                "getAssetName"
-              );
+        logger_logger.withInfo(
+          "Successfully executed regex matching",
+          gitlab_integration_integrationName,
+          CI_COMMIT_SHA,
+          "getAssetName"
+        );
 
-              return matches[1].trim();
-            }
+        if (matches) {
+          logger_logger.withInfo(
+            `Found a match: ${matches[1].trim()}`,
+            gitlab_integration_integrationName,
+            CI_COMMIT_SHA,
+            "getAssetName"
+          );
+          return matches[1].trim();
         }
       }
 

diff --git a/package-lock.json b/package-lock.json