(ranger) branch master updated: RANGER-4823: Incorrect processing of downloaded policies in plugin when policy-deltas are enabled

[abhay]

This is an automated email from the ASF dual-hosted git repository.

abhay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 5ca434217 RANGER-4823: Incorrect processing of downloaded policies in 
plugin when policy-deltas are enabled
5ca434217 is described below

commit 5ca434217909adb2c55322b4ab733248344d42ac
Author: Abhay Kulkarni <akulka...@cloudera.com>
AuthorDate: Mon Jun 17 21:12:12 2024 -0700

    RANGER-4823: Incorrect processing of downloaded policies in plugin when 
policy-deltas are enabled
---
 .../src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
index dd64a6767..0cb1f23c7 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
@@ -58,6 +58,7 @@ public class ServicePolicies implements java.io.Serializable {
        private String             auditMode = RangerPolicyEngine.AUDIT_DEFAULT;
        private TagPolicies        tagPolicies;
        private Map<String, SecurityZoneInfo> securityZones;
+       @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
        private List<RangerPolicyDelta> policyDeltas;
        private Map<String, String> serviceConfig;
 
@@ -362,6 +363,7 @@ public class ServicePolicies implements 
java.io.Serializable {
                private String                          zoneName;
                private List<HashMap<String, List<String>>> resources;
                private List<RangerPolicy>              policies;
+               @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
                private List<RangerPolicyDelta>         policyDeltas;
                private Boolean                         
containsAssociatedTagService;