[ranger] branch RANGER-3923 updated: RANGER-4459: add filters for sharedResourceName and sharedResourceNamePartial in get sharedResource API #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


The following commit(s) were added to refs/heads/RANGER-3923 by this push:
     new d0f39291c RANGER-4459: add filters for sharedResourceName and 
sharedResourceNamePartial in get sharedResource API #2
d0f39291c is described below

commit d0f39291c8d6badb71808b9166f91fca4dd506f1
Author: Subhrat Chaudhary <such...@yahoo.com>
AuthorDate: Wed Oct 11 08:17:13 2023 -0700

    RANGER-4459: add filters for sharedResourceName and 
sharedResourceNamePartial in get sharedResource API #2
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
---
 .../src/main/java/org/apache/ranger/plugin/util/SearchFilter.java       | 1 +
 .../src/main/java/org/apache/ranger/common/RangerSearchUtil.java        | 2 ++
 .../java/org/apache/ranger/service/RangerGdsSharedResourceService.java  | 1 +
 3 files changed, 4 insertions(+)

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 ed855446f..93bd7f73d 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
@@ -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
index 90e9a6c02..719d8a900 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
@@ -111,6 +111,8 @@ public class RangerSearchUtil extends SearchUtil {
                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
index 2d2830c07..4bdb09f4d 100755
--- 
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 class RangerGdsSharedResourceService extends 
RangerGdsBaseModelService<XX
         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));