(ranger) branch master updated: RANGER-5156:Filter Ranger access audit by DataSet

[rmani]

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

rmani 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 f857b1c8b RANGER-5156:Filter Ranger access audit by DataSet
f857b1c8b is described below

commit f857b1c8be6181efee834c6f0e9f3116ca2f8336
Author: Ramesh Mani <rm...@apache.org>
AuthorDate: Tue Mar 18 17:45:59 2025 -0700

    RANGER-5156:Filter Ranger access audit by DataSet
---
 .../src/main/java/org/apache/ranger/AccessAuditsService.java          | 1 +
 security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java    | 1 +
 .../src/test/java/org/apache/ranger/rest/TestAssetREST.java           | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/AccessAuditsService.java 
b/security-admin/src/main/java/org/apache/ranger/AccessAuditsService.java
index 9b3a7a376..70270673a 100644
--- a/security-admin/src/main/java/org/apache/ranger/AccessAuditsService.java
+++ b/security-admin/src/main/java/org/apache/ranger/AccessAuditsService.java
@@ -81,6 +81,7 @@ public AccessAuditsService() {
         searchFields.add(new SearchField("tags", "tags", 
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
         searchFields.add(new SearchField("cluster", "cluster", 
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
         searchFields.add(new SearchField("zoneName", "zoneName", 
SearchField.DATA_TYPE.STR_LIST, SearchField.SEARCH_TYPE.FULL));
+        searchFields.add(new SearchField("datasets", "datasets", 
SearchField.DATA_TYPE.STR_LIST, SearchField.SEARCH_TYPE.PARTIAL));
         searchFields.add(new SearchField("agentHost", "agentHost", 
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
 
         sortFields.add(new SortField("eventTime", "evtTime", true, 
SortField.SORT_ORDER.DESC));
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java 
b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
index 46f16285c..d29e44eff 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
@@ -558,6 +558,7 @@ public VXAccessAuditList getAccessLogs(@Context 
HttpServletRequest request, @Que
         searchUtil.extractStringList(request, searchCriteria, "zoneName", 
"Zone Name List", "zoneName", null, null);
         searchUtil.extractString(request, searchCriteria, "agentHost", "Agent 
Host Name", StringUtil.VALIDATION_TEXT);
         searchUtil.extractString(request, searchCriteria, "eventId", "Event 
Id", null);
+        searchUtil.extractString(request, searchCriteria, "datasets", 
"DataSets", null);
 
         boolean      isKeyAdmin      = msBizUtil.isKeyAdmin();
         boolean      isAuditKeyAdmin = msBizUtil.isAuditKeyAdmin();
diff --git 
a/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java 
b/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
index 352c63228..7bddf1874 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
@@ -533,7 +533,7 @@ public void testGetAccessLogs() {
         Mockito.verify(msBizUtil).isKeyAdmin();
         Mockito.verify(assetMgr).getAccessLogs(searchCriteria);
         Mockito.verify(daoManager).getXXServiceDef();
-        Mockito.verify(searchUtil, 
Mockito.times(14)).extractString(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
+        Mockito.verify(searchUtil, 
Mockito.times(15)).extractString(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
         Mockito.verify(searchUtil, Mockito.times(4)).extractInt(Mockito.any(), 
Mockito.any(), Mockito.anyString(), Mockito.anyString());
         Mockito.verify(searchUtil, 
Mockito.times(2)).extractDate(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
         Mockito.verify(searchUtil).extractLong(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString());
@@ -568,7 +568,7 @@ public void testGetAccessLogsForKms() {
         Mockito.verify(msBizUtil).isKeyAdmin();
         Mockito.verify(assetMgr).getAccessLogs(searchCriteria);
         Mockito.verify(daoManager).getXXServiceDef();
-        Mockito.verify(searchUtil, 
Mockito.times(14)).extractString(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
+        Mockito.verify(searchUtil, 
Mockito.times(15)).extractString(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
         Mockito.verify(searchUtil, Mockito.times(4)).extractInt(Mockito.any(), 
Mockito.any(), Mockito.anyString(), Mockito.anyString());
         Mockito.verify(searchUtil, 
Mockito.times(2)).extractDate(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
         Mockito.verify(searchUtil).extractLong(Mockito.any(), Mockito.any(), 
Mockito.anyString(), Mockito.anyString());