This is an automated email from the ASF dual-hosted git repository.
madhan 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 f47db0cd8 RANGER-4630: updated tag REST APIs to support multiple
resourceIDs
f47db0cd8 is described below
commit f47db0cd8fc213c2340afe0b942135cdf38d1a46
Author: Anand Nadar <[email protected]>
AuthorDate: Tue Feb 20 21:28:26 2024 -0800
RANGER-4630: updated tag REST APIs to support multiple resourceIDs
Signed-off-by: Madhan Neethiraj <[email protected]>
---
.../src/main/java/org/apache/ranger/plugin/util/SearchFilter.java | 1 +
.../src/main/java/org/apache/ranger/common/RangerSearchUtil.java | 1 -
security-admin/src/main/java/org/apache/ranger/rest/TagREST.java | 1 +
.../java/org/apache/ranger/service/RangerServiceResourceService.java | 1 +
.../main/java/org/apache/ranger/service/RangerTagResourceMapService.java | 1 +
5 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
index d1568bbac..b0fad0aea 100755
---
a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
@@ -84,6 +84,7 @@ public class SearchFilter {
public static final String TAG_IDS = "tagIds";
// search
public static final String TAG_GUID = "tagGuid";
// search
public static final String TAG_RESOURCE_ID = "resourceId";
// search
+ public static final String TAG_RESOURCE_IDS = "resourceIds";
// search
public static final String TAG_RESOURCE_GUID = "resourceGuid";
// search
public static final String TAG_RESOURCE_SERVICE_NAME =
"resourceServiceName"; // search
public static final String TAG_RESOURCE_SIGNATURE =
"resourceSignature"; // search
diff --git
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index 529472a31..c816ad229 100755
---
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -358,7 +358,6 @@ public class RangerSearchUtil extends SearchUtil {
whereClause.append(" ) ");
}
- logger.debug("Where
clause ... :: " + whereClause);
} else {
whereClause.append("
and ")
.append(searchField.getFieldName())
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
b/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
index 01ff442fb..09d771565 100755
--- a/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java
@@ -1050,6 +1050,7 @@ public class TagREST {
try {
SearchFilter filter = searchUtil.getSearchFilter(request,
rangerServiceResourceService.sortFields);
+ searchUtil.extractIntList(request, filter,
SearchFilter.TAG_RESOURCE_IDS, "Tag resource list");
ret = tagStore.getPaginatedServiceResources(filter);
} catch (Exception excp) {
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
old mode 100644
new mode 100755
index 989ea2259..918c8d009
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceService.java
@@ -61,6 +61,7 @@ public class RangerServiceResourceService extends
RangerServiceResourceServiceBa
searchFields.add(new
SearchField(SearchFilter.TAG_SERVICE_NAME_PARTIAL, "service.name",
DATA_TYPE.STRING, SEARCH_TYPE.PARTIAL, "XXService service", "obj.serviceId =
service.id"));
searchFields.add(new SearchField(SearchFilter.TAG_RESOURCE_GUID,
"obj.guid", DATA_TYPE.STRING, SEARCH_TYPE.FULL));
searchFields.add(new SearchField(SearchFilter.TAG_RESOURCE_SIGNATURE,
"obj.resourceSignature", DATA_TYPE.STRING, SEARCH_TYPE.FULL));
+ searchFields.add(new SearchField(SearchFilter.TAG_RESOURCE_IDS,
"obj.id", SearchField.DATA_TYPE.INT_LIST, SearchField.SEARCH_TYPE.FULL));
sortFields.add(new SortField(SearchFilter.TAG_RESOURCE_ID, "obj.id",
true, SortField.SORT_ORDER.ASC));
sortFields.add(new SortField(SearchFilter.TAG_SERVICE_ID,
"obj.serviceId"));
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
old mode 100644
new mode 100755
index f22963f3c..fd39a4ecb
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerTagResourceMapService.java
@@ -39,6 +39,7 @@ public class RangerTagResourceMapService extends
RangerTagResourceMapServiceBase
searchFields.add(new SearchField(SearchFilter.TAG_DEF_ID,
"obj.id", DATA_TYPE.INTEGER, SEARCH_TYPE.FULL));
searchFields.add(new SearchField(SearchFilter.TAG_RESOURCE_ID,
"obj.resourceId", DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
searchFields.add(new SearchField(SearchFilter.TAG_ID,
"obj.tagId", DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
+ searchFields.add(new SearchField(SearchFilter.TAG_SERVICE_NAME,
"svc.name", DATA_TYPE.STRING, SEARCH_TYPE.FULL, "XXServiceResource svcr,
XXService svc", "obj.resourceId = svcr.id and svcr.serviceId = svc.id"));
sortFields.add(new SortField(SearchFilter.TAG_DEF_ID, "obj.id",
true, SortField.SORT_ORDER.ASC));
sortFields.add(new SortField(SearchFilter.TAG_RESOURCE_ID,
"obj.resourceId"));
