Skip to content

Commit d420bbc

Browse files
krsoninikhilkrsoninikhil
committed
Merge beta
2 parents 7325e67 + ca4fda5 commit d420bbc

File tree

150 files changed

+7861
-980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+7861
-980
lines changed

‎.github/workflows/chart-release-dispatcher.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- master
99
- staging
1010
- beta
11+
- staging
1112
types:
1213
- completed
1314

@@ -25,7 +26,6 @@ jobs:
2526
id: extract_branch
2627
run: |
2728
echo "branch=${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
28-
2929
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3030
- uses: actions/checkout@v3
3131
with:
@@ -61,7 +61,6 @@ jobs:
6161
run: |
6262
echo "${{ steps.get_pr_url_user.outputs.pr_url }}"
6363
echo "${{ steps.get_pr_url_user.outputs.pr_user }}"
64-
6564
- name: Repository Dispatch
6665
uses: peter-evans/repository-dispatch@v2
6766
with:
@@ -76,4 +75,4 @@ jobs:
7675
"pr_url": "${{ steps.get_pr_url_user.outputs.pr_url }}",
7776
"pr_user": "${{ steps.get_pr_url_user.outputs.pr_user }}"
7877
}
79-
}
78+
}

‎.github/workflows/github-actions-pr-jira.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: GitHub-Jira Link Action
2+
run-name: ${{ github.actor }} is ensuring Jira ID is present in PR title
3+
on:
4+
pull_request:
5+
types: [opened, edited, synchronize, reopened]
6+
branches: [main, staging, master, beta, develop, prod, development]
7+
8+
jobs:
9+
Enforce-GitHub-Jira-Link-Action:
10+
runs-on: ubuntu-latest
11+
if: ${{ !contains(fromJson('["main", "staging", "master", "beta", "develop", "prod", "development"]'), github.event.pull_request.head.ref) }}
12+
steps:
13+
- name: Enforce Pull Request Title includes Jira Issue Key
14+
uses: ryanvade/[email protected]

‎.github/workflows/maven.yml

+3-13
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ on:
2525
- beta
2626
- development
2727
- master
28+
- staging
2829
- lineageondemand
2930

3031
jobs:
@@ -51,16 +52,6 @@ jobs:
5152
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
5253
id: get_branch
5354

54-
- name: Create Maven Settings
55-
uses: s4u/[email protected]
56-
with:
57-
servers: |
58-
[{
59-
"id": "github",
60-
"username": "atlan-ci",
61-
"password": "${{ secrets.my_pat }}"
62-
}]
63-
6455
- name: Build with Maven
6556
run: |
6657
branch_name=${{ steps.get_branch.outputs.branch }}
@@ -77,7 +68,7 @@ jobs:
7768
shell: bash
7869

7970
- name: Get version tag
80-
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"
71+
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"
8172
id: get_version
8273

8374
- name: Set up Buildx
@@ -89,7 +80,7 @@ jobs:
8980
with:
9081
registry: ghcr.io
9182
username: $GITHUB_ACTOR
92-
password: ${{ secrets.my_pat }}
83+
password: ${{ secrets.ORG_PAT_GITHUB }}
9384

9485
- name: Build and push
9586
id: docker_build
@@ -104,7 +95,6 @@ jobs:
10495
tags: |
10596
ghcr.io/atlanhq/${{ github.event.repository.name }}-${{ steps.get_branch.outputs.branch }}:latest
10697
ghcr.io/atlanhq/${{ github.event.repository.name }}-${{ steps.get_branch.outputs.branch }}:${{ steps.get_version.outputs.version }}
107-
10898
- name: Scan Image
10999
uses: aquasecurity/trivy-action@master
110100
with:

‎.github/workflows/trivy-docker-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
output: 'trivy-results-docker.sarif'
3030
exit-code: '1'
3131
#ignore-unfixed: true
32-
severity: 'CRITICAL,HIGH,MEDIUM'
32+
severity: 'CRITICAL,HIGH'
3333

3434
- name: Upload Trivy Docker Scan Results To GitHub Security tab
3535
uses: github/codeql-action/upload-sarif@v2

‎README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ Build Process
7171
distro/target/apache-atlas-<version>-storm-hook.tar.gz
7272
distro/target/apache-atlas-<version>-falcon-hook.tar.gz
7373

74-
4. For more details on installing and running Apache Atlas, please refer to https://atlas.apache.org/#/Installation.
74+
4. For more details on installing and running Apache Atlas, please refer to https://atlas.apache.org/#/Installation

‎addons/elasticsearch/es-settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
"truncate_filter"
6464
],
6565
"tokenizer": "standard"
66+
},
67+
"atlan_hierarchy_analyzer": {
68+
"tokenizer": "path_hierarchy"
6669
}
6770
},
6871
"normalizer": {

‎addons/models/0000-Area0/0010-base_model.json

+23-2
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@
616616
],
617617
"description": "Model to store auth service in Atlas",
618618
"serviceType": "atlan",
619-
"typeVersion": "1.1",
619+
"typeVersion": "1.2",
620620
"attributeDefs": [
621621
{
622622
"name": "authServiceType",
@@ -640,6 +640,17 @@
640640
"skipScrubbing": true,
641641
"includeInNotification": true
642642
},
643+
{
644+
"name": "abacService",
645+
"typeName": "string",
646+
"indexType": "STRING",
647+
"cardinality": "SINGLE",
648+
"isIndexable": false,
649+
"isOptional": true,
650+
"isUnique": false,
651+
"skipScrubbing": true,
652+
"includeInNotification": true
653+
},
643654
{
644655
"name": "authServiceIsEnabled",
645656
"typeName": "boolean",
@@ -681,9 +692,19 @@
681692
"Asset"
682693
],
683694
"serviceType": "atlan",
684-
"typeVersion": "1.1",
695+
"typeVersion": "1.2",
685696
"attributeDefs":
686697
[
698+
{
699+
"name": "policyFilterCriteria",
700+
"typeName": "string",
701+
"cardinality": "SINGLE",
702+
"isIndexable": false,
703+
"isOptional": true,
704+
"isUnique": false,
705+
"skipScrubbing": true,
706+
"includeInNotification": true
707+
},
687708
{
688709
"name": "policyType",
689710
"typeName": "AuthPolicyType",

‎addons/override-policies/glossary_policies.json

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
"entities":
3+
[
4+
{
5+
"typeName": "AuthPolicy",
6+
"customAttributes": {
7+
"internalId": 28
8+
},
9+
"attributes":
10+
{
11+
"name": "READ_GLOSSARY",
12+
"qualifiedName": "READ_GLOSSARY",
13+
"policyCategory": "bootstrap",
14+
"policySubCategory": "default",
15+
"policyServiceName": "atlas",
16+
"policyType": "allow",
17+
"policyPriority": 1,
18+
"policyUsers":
19+
[],
20+
"policyGroups":
21+
[],
22+
"policyRoles":
23+
[
24+
"$admin",
25+
"$api-token-default-access"
26+
],
27+
"policyResourceCategory": "ENTITY",
28+
"policyResources":
29+
[
30+
"entity-type:AtlasGlossary",
31+
"entity-classification:*",
32+
"entity:*"
33+
],
34+
"policyActions":
35+
[
36+
"entity-read"
37+
]
38+
}
39+
},
40+
{
41+
"typeName": "AuthPolicy",
42+
"customAttributes": {
43+
"internalId": 29
44+
},
45+
"attributes":
46+
{
47+
"name": "READ_TERM",
48+
"qualifiedName": "READ_TERM",
49+
"policyCategory": "bootstrap",
50+
"policySubCategory": "default",
51+
"policyServiceName": "atlas",
52+
"policyType": "allow",
53+
"policyPriority": 1,
54+
"policyUsers":
55+
[],
56+
"policyGroups":
57+
[],
58+
"policyRoles":
59+
[
60+
"$admin",
61+
"$api-token-default-access"
62+
],
63+
"policyResourceCategory": "ENTITY",
64+
"policyResources":
65+
[
66+
"entity-type:AtlasGlossaryTerm",
67+
"entity-classification:*",
68+
"entity:*"
69+
],
70+
"policyActions":
71+
[
72+
"entity-read"
73+
]
74+
}
75+
},
76+
{
77+
"typeName": "AuthPolicy",
78+
"customAttributes": {
79+
"internalId": 30
80+
},
81+
"attributes":
82+
{
83+
"name": "READ_CATEGORY",
84+
"qualifiedName": "READ_CATEGORY",
85+
"policyCategory": "bootstrap",
86+
"policySubCategory": "default",
87+
"policyServiceName": "atlas",
88+
"policyType": "allow",
89+
"policyPriority": 1,
90+
"policyUsers":
91+
[],
92+
"policyGroups":
93+
[],
94+
"policyRoles":
95+
[
96+
"$admin",
97+
"$api-token-default-access"
98+
],
99+
"policyResourceCategory": "ENTITY",
100+
"policyResources":
101+
[
102+
"entity-type:AtlasGlossaryCategory",
103+
"entity-classification:*",
104+
"entity:*"
105+
],
106+
"policyActions":
107+
[
108+
"entity-read"
109+
]
110+
}
111+
}
112+
]
113+
}

0 commit comments

Comments
 (0)