Merge branch 'beta' into nb/1245

atlanhq · Aug 16, 2023 · f697300 · f697300
2 parents e92ade9 + 703cfa2
commit f697300
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 11 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,6 +25,7 @@ on:
       - beta
       - development
       - master
+      - staging
       - lineageondemand
 
 jobs:
@@ -67,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 
@@ -94,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:
@@ -111,7 +111,7 @@ jobs:
       - name: Check out into atlan repo
         uses: actions/checkout@v2
         with:
-          ref: main
+          ref: ${{ steps.get_branch.outputs.branch }}
           repository: atlanhq/atlan
           token: ${{ secrets.my_pat }}
 
@@ -121,13 +121,12 @@ jobs:
           echo "- ${{ github.event.head_commit.message }}">>gitlog/${{ github.event.repository.name }}.txt
           chmod +x ./scripts/create_changelog.sh
           ./scripts/create_changelog.sh
-
       - name: Commit changes
         uses: EndBug/add-and-commit@v7
         with:
-          branch: main
+          branch: ${{ steps.get_branch.outputs.branch }}
           author_name: atlan-ci
           author_email: [email protected]
           message: '${{ github.event.repository.name }}'
           default_author: user_info
-          push: origin main
+          push: origin ${{ steps.get_branch.outputs.branch }}
diff --git a/addons/policies/bootstrap_heka_policies.json b/addons/policies/bootstrap_heka_policies.json
@@ -0,0 +1,35 @@
+{
+  "entities":
+  [
+    {
+    "typeName": "AuthPolicy",
+    "attributes":
+    {
+      "name": "DENY_DATA_ACCESS_GUEST",
+      "qualifiedName": "DENY_DATA_ACCESS_GUEST",
+      "description": "deny data access for guest users",
+      "policyCategory": "bootstrap",
+      "policySubCategory": "data",
+      "policyServiceName": "heka",
+      "policyType": "deny",
+      "policyPriority": 0,
+      "policyUsers": [],
+      "policyGroups": [],
+      "policyRoles":
+      [
+        "$guest"
+      ],
+      "policyResourceCategory": "ENTITY",
+      "policyResources":
+      [
+        "entity:*",
+        "entity-type:*"
+      ],
+      "policyActions":
+      [
+        "select"
+      ]
+    }
+    }
+  ]
+}
diff --git a/auth-agents-common/pom.xml b/auth-agents-common/pom.xml
@@ -71,12 +71,14 @@
             <artifactId>jersey-client</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider -->
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
-            <version>${jackson-jaxrs.version}</version>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>2.15.0</version>
         </dependency>
 
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/auth-agents-common/src/main/java/org/apache/atlas/plugin/util/RangerRESTClient.java b/auth-agents-common/src/main/java/org/apache/atlas/plugin/util/RangerRESTClient.java
@@ -19,6 +19,7 @@
 
 package org.apache.atlas.plugin.util;
 
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.sun.jersey.api.client.Client;
@@ -36,7 +37,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.atlas.authorization.hadoop.utils.RangerCredentialProvider;
 import org.apache.atlas.authorization.utils.StringUtil;
-import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.KeyManager;

diff --git a/pom.xml b/pom.xml
@@ -776,7 +776,7 @@
         <tinkerpop.version>3.5.1</tinkerpop.version>
         <woodstox-core.version>5.0.3</woodstox-core.version>
         <zookeeper.version>3.4.6</zookeeper.version>
-        <redis.client.version>3.20.1</redis.client.version>
+        <redis.client.version>3.22.1</redis.client.version>
         <micrometer.version>1.11.1</micrometer.version>
     </properties>
 

diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/SolrIndexHelper.java b/repository/src/main/java/org/apache/atlas/repository/graph/SolrIndexHelper.java
@@ -78,6 +78,8 @@ public void onChange(ChangedTypeDefs changedTypeDefs) {
             return;
         }
 
+        LOG.info("SolrIndexHelper:initializationCompleted: {}", initializationCompleted);
+
         if(initializationCompleted) {
             try {
                 AtlasGraph            graph                          = AtlasGraphProvider.getGraphInstance();