RANGER-4459: add filters for sharedResourceName and sharedResourceNam…

…ePartial in get sharedResource API #2 Signed-off-by: Madhan Neethiraj <[email protected]>
gympass · Oct 11, 2023 · d0f3929 · d0f3929
1 parent 5aecd13
commit d0f3929
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
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
@@ -109,6 +109,7 @@ public class SearchFilter {
 	public static final String DATA_SHARE_NAME_PARTIAL  = "dataShareNamePartial"; // search, sort
 	public static final String DATA_SHARE_ID            = "dataShareId";          // search, sort
 	public static final String SHARED_RESOURCE_NAME     = "sharedResourceName";   // search, sort
+	public static final String SHARED_RESOURCE_NAME_PARTIAL = "sharedResourceNamePartial";   // search, sort
 	public static final String RESOURCE_CONTAINS        = "resourceContains";     // search
 	public static final String SHARED_RESOURCE_ID       = "sharedResourceId";     // search, sort
 	public static final String PROFILE_NAME             = "profileName";          // 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
@@ -111,6 +111,8 @@ public SearchFilter getSearchFilter(@Nonnull HttpServletRequest request, List<So
 		ret.setParam(SearchFilter.DATA_SHARE_NAME_PARTIAL, request.getParameter(SearchFilter.DATA_SHARE_NAME_PARTIAL));
 		ret.setParam(SearchFilter.DATA_SHARE_ID, request.getParameter(SearchFilter.DATA_SHARE_ID));
 		ret.setParam(SearchFilter.SHARED_RESOURCE_ID, request.getParameter(SearchFilter.SHARED_RESOURCE_ID));
+		ret.setParam(SearchFilter.SHARED_RESOURCE_NAME, request.getParameter(SearchFilter.SHARED_RESOURCE_NAME));
+		ret.setParam(SearchFilter.SHARED_RESOURCE_NAME_PARTIAL, request.getParameter(SearchFilter.SHARED_RESOURCE_NAME_PARTIAL));
 		ret.setParam(SearchFilter.PROFILE_NAME, request.getParameter(SearchFilter.PROFILE_NAME));
 		ret.setParam(SearchFilter.OWNER_NAME, request.getParameter(SearchFilter.OWNER_NAME));
 		ret.setParam(SearchFilter.OWNER_TYPE, request.getParameter(SearchFilter.OWNER_TYPE));

diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
@@ -57,6 +57,7 @@ public RangerGdsSharedResourceService() {
         super(AppConstants.CLASS_TYPE_GDS_SHARED_RESOURCE);
 
         searchFields.add(new SearchField(SearchFilter.SHARED_RESOURCE_NAME, "obj.name",        SearchField.DATA_TYPE.STRING,  SearchField.SEARCH_TYPE.FULL));
+        searchFields.add(new SearchField(SearchFilter.SHARED_RESOURCE_NAME_PARTIAL, "obj.name", SearchField.DATA_TYPE.STRING,  SearchField.SEARCH_TYPE.PARTIAL));
         searchFields.add(new SearchField(SearchFilter.SHARED_RESOURCE_ID,   "obj.id",          SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
         searchFields.add(new SearchField(SearchFilter.GUID      ,           "obj.guid",        SearchField.DATA_TYPE.STRING,  SearchField.SEARCH_TYPE.FULL));
         searchFields.add(new SearchField(SearchFilter.IS_ENABLED,           "obj.isEnabled",   SearchField.DATA_TYPE.BOOLEAN, SearchField.SEARCH_TYPE.FULL));