Skip to content

Commit

Permalink
Merge branch 'beta' into dg-980-daap-visibility
Browse files Browse the repository at this point in the history
  • Loading branch information
PRATHAM2002-DS authored Feb 22, 2024
2 parents 941fdb1 + 38f7523 commit ba9f885
Show file tree
Hide file tree
Showing 131 changed files with 13,316 additions and 2,476 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/chart-release-dispatcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branches:
- master
- beta
- staging
types:
- completed

Expand All @@ -24,13 +25,6 @@ jobs:
id: extract_branch
run: |
echo "branch=${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
- name: Extract Repository Name
id: extract_repo_name
run: |
repo_name=$(basename $GITHUB_REPOSITORY)
echo "repo_name=${repo_name}" >> $GITHUB_OUTPUT
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
with:
Expand All @@ -40,7 +34,7 @@ jobs:
client-payload: |-
{
"repo": {
"name": "${{ steps.extract_repo_name.outputs.repo_name }}",
"name": "${{ github.repository }}",
"branch": "${{ steps.extract_branch.outputs.branch }}"
}
}
}
14 changes: 2 additions & 12 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ on:
- beta
- development
- master
- staging
- lineageondemand

jobs:
Expand All @@ -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 }}
Expand All @@ -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.my_pat }}@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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

distro
# Maven
target*
dependency-reduced-pom.xml
Expand Down
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 23 additions & 2 deletions addons/models/0000-Area0/0010-base_model.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@
],
"description": "Model to store auth service in Atlas",
"serviceType": "atlan",
"typeVersion": "1.1",
"typeVersion": "1.2",
"attributeDefs": [
{
"name": "authServiceType",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
113 changes: 113 additions & 0 deletions addons/override-policies/glossary_policies.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
]
}
14 changes: 14 additions & 0 deletions addons/policies/atlas_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
}
}
},
{
"typeName": "AuthService",
"attributes":
{
"qualifiedName": "auth_service_atlas_abac",
"name": "atlas_abac",
"authServiceType": "abac",
"authServiceConfig": {
"ranger.plugin.audit.filters": "[{'accessResult':'DENIED','isAudited':true}]"
}
}
},
{
"typeName": "AuthService",
"attributes":
Expand All @@ -20,6 +32,7 @@
"name": "atlas",
"authServiceType": "atlas",
"tagService": "atlas_tag",
"abacService": "atlas_abac",
"authServiceConfig": {
"ranger.plugin.audit.filters": "[ {'accessResult': 'DENIED', 'isAudited': true}, {'users':['atlas'] ,'isAudited':false} ]"
}
Expand All @@ -33,6 +46,7 @@
"name": "heka",
"authServiceType": "heka",
"tagService": "atlas_tag",
"abacService": "atlas_abac",
"authServiceConfig": {}
}
}
Expand Down
35 changes: 35 additions & 0 deletions auth-agents-common-temp/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>auth-agents-common-temp</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core4</artifactId>
<version>4.1.0-incubating</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
</dependencies>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

</project>
Loading

0 comments on commit ba9f885

Please sign in to comment.