resolve conflict

atlanhq · Jul 24, 2024 · 0e3f69b · 0e3f69b
2 parents acfc261 + 35226e0
commit 0e3f69b
Show file tree

Hide file tree

Showing 122 changed files with 6,662 additions and 2,472 deletions.
diff --git a/.github/workflows/chart-release-dispatcher.yaml b/.github/workflows/chart-release-dispatcher.yaml
@@ -8,6 +8,7 @@ on:
       - master
       - staging
       - beta
+      - staging
     types:
       - completed
 
@@ -25,11 +26,10 @@ jobs:
         id: extract_branch
         run: |
           echo "branch=${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
-
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.ORG_PAT_GITHUB }}
+          token: ${{ secrets.my_pat }}
           ref: ${{ steps.extract_branch.outputs.branch }}
           fetch-depth: 0
 
@@ -50,22 +50,21 @@ jobs:
       - name: Get PR url and PR User
         id: get_pr_url_user
         run: |
-          head_sha=$(curl -s -H "Authorization: Bearer ${{ secrets.ORG_PAT_GITHUB }}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}/jobs" | jq -r '.jobs[0].head_sha')
+          head_sha=$(curl -s -H "Authorization: Bearer ${{ secrets.my_pat }}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}/jobs" | jq -r '.jobs[0].head_sha')
           echo "Head SHA: $head_sha"
-          pr_url=$(curl -s -H "Authorization: Bearer ${{ secrets.ORG_PAT_GITHUB }}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/search/issues?q=sha:$head_sha+type:pr" | jq -r '.items[0].html_url')
-          pr_user=$(curl -s -H "Authorization: Bearer ${{ secrets.ORG_PAT_GITHUB }}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/search/issues?q=sha:$head_sha+type:pr" | jq -r '.items[0].user.login')
+          pr_url=$(curl -s -H "Authorization: Bearer ${{ secrets.my_pat }}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/search/issues?q=sha:$head_sha+type:pr" | jq -r '.items[0].html_url')
+          pr_user=$(curl -s -H "Authorization: Bearer ${{ secrets.my_pat }}" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/search/issues?q=sha:$head_sha+type:pr" | jq -r '.items[0].user.login')
           echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
           echo "pr_user=$pr_user" >> $GITHUB_OUTPUT
 
       - name: echo PR_URL and PR_USER
         run: |
           echo "${{ steps.get_pr_url_user.outputs.pr_url }}"
           echo "${{ steps.get_pr_url_user.outputs.pr_user }}"
-
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2
         with:
-          token: ${{ secrets.ORG_PAT_GITHUB }}
+          token: ${{ secrets.my_pat }}
           repository: ${{ matrix.repo }}
           event-type: dispatch_chart_release_workflow
           client-payload: |-
@@ -76,4 +75,4 @@ jobs:
                 "pr_url": "${{ steps.get_pr_url_user.outputs.pr_url }}",
                 "pr_user": "${{ steps.get_pr_url_user.outputs.pr_user }}"
               }
-            }
+            }
diff --git a/.github/workflows/main-ecr.yml b/.github/workflows/main-ecr.yml
@@ -196,4 +196,4 @@ jobs:
           ${{ steps.login-ecr.outputs.registry }}/atlanhq/${{ github.event.repository.name }}:${{ steps.get_branch.outputs.branch }}-${{ steps.semver_tag.outputs.new_tag }}
         build-args: |
           ACCESS_TOKEN_USR=$GITHUB_ACTOR
-          ACCESS_TOKEN_PWD=${{ secrets.ORG_PAT_GITHUB }}  
+          ACCESS_TOKEN_PWD=${{ secrets.my_pat }}  
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,6 +25,7 @@ on:
       - beta
       - development
       - master
+      - staging
       - lineageondemand
 
 jobs:
@@ -51,16 +52,6 @@ jobs:
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
         id: get_branch
 
-      - name: Create Maven Settings
-        uses: s4u/[email protected]
-        with:
-          servers: |
-            [{
-                "id": "github",
-                "username": "atlan-ci",
-                "password": "${{ secrets.ORG_PAT_GITHUB }}"
-            }]
-
       - name: Build with Maven
         run: |
           branch_name=${{ steps.get_branch.outputs.branch }} 
@@ -77,7 +68,7 @@ jobs:
         shell: bash
 
       - name: Get version tag
-        run: echo "##[set-output name=version;]$(echo `git ls-remote https://${{ secrets.ORG_PAT_GITHUB }}@github.com/atlanhq/${REPOSITORY_NAME}.git ${{ steps.get_branch.outputs.branch }} | awk '{ print $1}' | cut -c1-7`)abcd"
+        run: echo "##[set-output name=version;]$(echo `git ls-remote https://${{ secrets.ORG_PAT_GITHUB }}@github.com/atlanhq/${REPOSITORY_NAME}.git refs/heads/${{ steps.get_branch.outputs.branch }} | awk '{ print $1}' | cut -c1-7`)abcd"
         id: get_version
 
       - name: Set up Buildx 
@@ -104,7 +95,6 @@ jobs:
           tags: |
             ghcr.io/atlanhq/${{ github.event.repository.name }}-${{ steps.get_branch.outputs.branch }}:latest
             ghcr.io/atlanhq/${{ github.event.repository.name }}-${{ steps.get_branch.outputs.branch }}:${{ steps.get_version.outputs.version }}
-
       - name: Scan Image
         uses: aquasecurity/trivy-action@master
         with:

diff --git a/README.txt b/README.txt
@@ -71,4 +71,4 @@ Build Process
    distro/target/apache-atlas-<version>-storm-hook.tar.gz
    distro/target/apache-atlas-<version>-falcon-hook.tar.gz
 
-4. For more details on installing and running Apache Atlas, please refer to https://atlas.apache.org/#/Installation.
+4. For more details on installing and running Apache Atlas, please refer to https://atlas.apache.org/#/Installation
diff --git a/addons/models/0000-Area0/0010-base_model.json b/addons/models/0000-Area0/0010-base_model.json
@@ -616,7 +616,7 @@
       ],
       "description": "Model to store auth service in Atlas",
       "serviceType": "atlan",
-      "typeVersion": "1.1",
+      "typeVersion": "1.2",
       "attributeDefs": [
         {
           "name": "authServiceType",
@@ -640,6 +640,17 @@
           "skipScrubbing": true,
           "includeInNotification": true
         },
+        {
+          "name": "abacService",
+          "typeName": "string",
+          "indexType": "STRING",
+          "cardinality": "SINGLE",
+          "isIndexable": false,
+          "isOptional": true,
+          "isUnique": false,
+          "skipScrubbing": true,
+          "includeInNotification": true
+        },
         {
           "name": "authServiceIsEnabled",
           "typeName": "boolean",
@@ -681,9 +692,19 @@
         "Asset"
       ],
       "serviceType": "atlan",
-      "typeVersion": "1.1",
+      "typeVersion": "1.2",
       "attributeDefs":
       [
+        {
+          "name": "policyFilterCriteria",
+          "typeName": "string",
+          "cardinality": "SINGLE",
+          "isIndexable": false,
+          "isOptional": true,
+          "isUnique": false,
+          "skipScrubbing": true,
+          "includeInNotification": true
+        },
         {
           "name": "policyType",
           "typeName": "AuthPolicyType",

diff --git a/addons/override-policies/glossary_policies.json b/addons/override-policies/glossary_policies.json
@@ -0,0 +1,113 @@
+{
+    "entities":
+    [
+        {
+            "typeName": "AuthPolicy",
+            "customAttributes": {
+                "internalId": 28
+            },
+            "attributes":
+            {
+                "name": "READ_GLOSSARY",
+                "qualifiedName": "READ_GLOSSARY",
+                "policyCategory": "bootstrap",
+                "policySubCategory": "default",
+                "policyServiceName": "atlas",
+                "policyType": "allow",
+                "policyPriority": 1,
+                "policyUsers":
+                [],
+                "policyGroups":
+                [],
+                "policyRoles":
+                [
+                    "$admin",
+                    "$api-token-default-access"
+                ],
+                "policyResourceCategory": "ENTITY",
+                "policyResources":
+                [
+                    "entity-type:AtlasGlossary",
+                    "entity-classification:*",
+                    "entity:*"
+                ],
+                "policyActions":
+                [
+                    "entity-read"
+                ]
+            }
+        },
+        {
+            "typeName": "AuthPolicy",
+            "customAttributes": {
+                "internalId": 29
+            },
+            "attributes":
+            {
+                "name": "READ_TERM",
+                "qualifiedName": "READ_TERM",
+                "policyCategory": "bootstrap",
+                "policySubCategory": "default",
+                "policyServiceName": "atlas",
+                "policyType": "allow",
+                "policyPriority": 1,
+                "policyUsers":
+                [],
+                "policyGroups":
+                [],
+                "policyRoles":
+                [
+                    "$admin",
+                    "$api-token-default-access"
+                ],
+                "policyResourceCategory": "ENTITY",
+                "policyResources":
+                [
+                    "entity-type:AtlasGlossaryTerm",
+                    "entity-classification:*",
+                    "entity:*"
+                ],
+                "policyActions":
+                [
+                    "entity-read"
+                ]
+            }
+        },
+        {
+            "typeName": "AuthPolicy",
+            "customAttributes": {
+                "internalId": 30
+            },
+            "attributes":
+            {
+                "name": "READ_CATEGORY",
+                "qualifiedName": "READ_CATEGORY",
+                "policyCategory": "bootstrap",
+                "policySubCategory": "default",
+                "policyServiceName": "atlas",
+                "policyType": "allow",
+                "policyPriority": 1,
+                "policyUsers":
+                [],
+                "policyGroups":
+                [],
+                "policyRoles":
+                [
+                    "$admin",
+                    "$api-token-default-access"
+                ],
+                "policyResourceCategory": "ENTITY",
+                "policyResources":
+                [
+                    "entity-type:AtlasGlossaryCategory",
+                    "entity-classification:*",
+                    "entity:*"
+                ],
+                "policyActions":
+                [
+                    "entity-read"
+                ]
+            }
+        }
+    ]
+}
diff --git a/addons/policies/bootstrap_entity_policies.json b/addons/policies/bootstrap_entity_policies.json
@@ -2886,7 +2886,7 @@
                 [
                     "entity-type:DataDomain",
                     "entity-classification:*",
-                    "entity:*"
+                    "entity:*/super"
                 ],
                 "policyActions":
                 [
@@ -2897,6 +2897,42 @@
                 ]
             }
         },
+        {
+            "typeName": "AuthPolicy",
+            "attributes":
+            {
+                "name": "RD_DATA_MESH_ENTITIES",
+                "qualifiedName": "RD_DATA_MESH_ENTITIES",
+                "description": "Allows admins to perform delete operation on data mesh assets",
+                "policyCategory": "bootstrap",
+                "policySubCategory": "default",
+                "policyServiceName": "atlas",
+                "policyType": "allow",
+                "policyPriority": 0,
+                "policyUsers":
+                [],
+                "policyGroups":
+                [],
+                "policyRoles":
+                [
+                    "$admin",
+                    "$api-token-default-access"
+                ],
+                "policyResourceCategory": "ENTITY",
+                "policyResources":
+                [
+
+                    "entity-type:DataDomain",
+                    "entity-classification:*",
+                    "entity:*"
+                ],
+                "policyActions":
+                [
+                    "entity-read",
+                    "entity-delete"
+                ]
+            }
+        },
         {
             "typeName": "AuthPolicy",
             "attributes":
@@ -2959,6 +2995,7 @@
                 "policyResourceCategory": "ENTITY",
                 "policyResources":
                 [
+
                     "entity-type:DataDomain",
                     "entity-classification:*",
                     "entity:*"

diff --git a/addons/policies/bootstrap_relationship_policies.json b/addons/policies/bootstrap_relationship_policies.json
@@ -646,6 +646,7 @@
             "typeName": "AuthPolicy",
             "attributes":
             {
+
                 "name": "LINK_MESH_DATA_DOMAIN_TO_DATA_PRODUCT",
                 "qualifiedName": "LINK_MESH_DATA_DOMAIN_TO_DATA_PRODUCT",
                 "policyCategory": "bootstrap",