Merge beta

atlanhq · Aug 21, 2024 · 05f0b8f · 05f0b8f
2 parents 7325e67 + ca4fda5
commit 05f0b8f
Show file tree

Hide file tree

Showing 150 changed files with 7,863 additions and 982 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,7 +26,6 @@ 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:
@@ -61,7 +61,6 @@ jobs:
         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:
@@ -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/github-actions-pr-jira.yaml b/.github/workflows/github-actions-pr-jira.yaml
@@ -0,0 +1,14 @@
+name: GitHub-Jira Link Action
+run-name: ${{ github.actor }} is ensuring Jira ID is present in PR title
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+    branches: [main, staging, master, beta, develop, prod, development]
+
+jobs:
+  Enforce-GitHub-Jira-Link-Action:
+    runs-on: ubuntu-latest
+    if: ${{ !contains(fromJson('["main", "staging", "master", "beta", "develop", "prod", "development"]'), github.event.pull_request.head.ref) }}
+    steps:
+      - name: Enforce Pull Request Title includes Jira Issue Key
+        uses: ryanvade/[email protected]
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.my_pat }}"
-            }]
-
       - 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.my_pat }}@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 
@@ -89,7 +80,7 @@ jobs:
         with:
           registry: ghcr.io
           username: $GITHUB_ACTOR
-          password: ${{ secrets.my_pat }}
+          password: ${{ secrets.ORG_PAT_GITHUB }}
 
       - name: Build and push
         id: docker_build
@@ -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/.github/workflows/trivy-docker-scan.yml b/.github/workflows/trivy-docker-scan.yml
@@ -29,7 +29,7 @@ jobs:
           output: 'trivy-results-docker.sarif'
           exit-code: '1'
           #ignore-unfixed: true
-          severity: 'CRITICAL,HIGH,MEDIUM'
+          severity: 'CRITICAL,HIGH'
 
       - name: Upload Trivy Docker Scan Results To GitHub Security tab
         uses: github/codeql-action/upload-sarif@v2

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/elasticsearch/es-settings.json b/addons/elasticsearch/es-settings.json
@@ -63,6 +63,9 @@
           "truncate_filter"
         ],
         "tokenizer": "standard"
+      },
+      "atlan_hierarchy_analyzer": {
+        "tokenizer": "path_hierarchy"
       }
     },
     "normalizer": {

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"
+                ]
+            }
+        }
+    ]
+}