[ranger] 02/03: RANGER-4274: updated security-zones to support admin-roles and audit-roles: fix unit test failures - #2

[madhan]

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

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 81a4aa60ff489029293f138f9f56bd4c06e73a5a
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Fri Jun 9 06:33:50 2023 -0700

    RANGER-4274: updated security-zones to support admin-roles and audit-roles: 
fix unit test failures - #2
---
 .../main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java    | 2 +-
 .../ranger/plugin/model/validation/RangerSecurityZoneValidatorTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
index ea79b69e8..bd10ff1df 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
@@ -55,7 +55,7 @@ public class RangerSecurityZone extends RangerBaseModelObject 
implements java.io
     }
 
     public RangerSecurityZone(String name, Map<String, 
RangerSecurityZoneService> services,List<String> tagServices, List<String> 
adminUsers, List<String> adminUserGroups, List<String> auditUsers, List<String> 
auditUserGroups, String description) {
-        this(name, services, tagServices, adminUsers, adminUserGroups, null, 
adminUsers, adminUserGroups, null, description);
+        this(name, services, tagServices, adminUsers, adminUserGroups, null, 
auditUsers, auditUserGroups, null, description);
     }
 
     public RangerSecurityZone(String name, Map<String, 
RangerSecurityZoneService> services,List<String> tagServices, List<String> 
adminUsers, List<String> adminUserGroups, List<String> adminRoles, List<String> 
auditUsers, List<String> auditUserGroups, List<String> auditRoles, String 
description) {
diff --git 
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/RangerSecurityZoneValidatorTest.java
 
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/RangerSecurityZoneValidatorTest.java
index 8bc77672c..dcc970c47 100644
--- 
a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/RangerSecurityZoneValidatorTest.java
+++ 
b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/RangerSecurityZoneValidatorTest.java
@@ -163,7 +163,7 @@ public class RangerSecurityZoneValidatorTest {
                } catch (Exception ex) {
                        Assert.assertEquals(
                                        ex.getMessage(),
-                                       "(0) Validation failure: error 
code[3044], reason[No services specified for security-zone:[MyZone]], 
field[services], subfield[null], type[missing] (1) Validation failure: error 
code[3038], reason[both users and user-groups collections for the security zone 
were null/empty], field[security zone admin users/user-groups], subfield[null], 
type[missing] (2) Validation failure: error code[3038], reason[both users and 
user-groups collections for the security zone were null/empty], field[s [...]
+                                       "(0) Validation failure: error 
code[3044], reason[No services specified for security-zone:[MyZone]], 
field[services], subfield[null], type[missing] (1) Validation failure: error 
code[3038], reason[users, user-groups and roles collections for the security 
zone were null/empty], field[security zone admin users/user-groups/roles], 
subfield[null], type[missing] (2) Validation failure: error code[3038], 
reason[users, user-groups and roles collections for the security zone were 
null/empty [...]
                }
        }