[ranger] branch RANGER-3923 updated: RANGER-3923: removed RangerSharedResource.resourceSignature - #3

[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 444475c6a RANGER-3923: removed RangerSharedResource.resourceSignature 
- #3
444475c6a is described below

commit 444475c6a9921d3d190435fd575d26fa2cdbf547
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Thu Aug 3 07:21:22 2023 -0700

    RANGER-3923: removed RangerSharedResource.resourceSignature - #3
---
 intg/src/main/python/apache_ranger/model/ranger_gds.py                  | 1 -
 ranger-examples/sample-client/src/main/python/sample_gds_client.py      | 2 +-
 .../java/org/apache/ranger/service/RangerGdsSharedResourceService.java  | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/intg/src/main/python/apache_ranger/model/ranger_gds.py 
b/intg/src/main/python/apache_ranger/model/ranger_gds.py
index cc7ee9cb9..9f4ebaf84 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_gds.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_gds.py
@@ -140,7 +140,6 @@ class RangerSharedResource(RangerBaseModelObject):
         self.dataShareId       = attrs.get('dataShareId')
         self.resource          = attrs.get('resource')
         self.subResourceNames  = attrs.get('subResourceNames')
-        self.resourceSignature = attrs.get('resourceSignature')
         self.conditionExpr     = attrs.get('conditionExpr')
         self.accessTypes       = attrs.get('accessTypes')
         self.rowFilter         = attrs.get('rowFilter')
diff --git a/ranger-examples/sample-client/src/main/python/sample_gds_client.py 
b/ranger-examples/sample-client/src/main/python/sample_gds_client.py
index e40e0736f..1b0d7a93f 100644
--- a/ranger-examples/sample-client/src/main/python/sample_gds_client.py
+++ b/ranger-examples/sample-client/src/main/python/sample_gds_client.py
@@ -121,7 +121,7 @@ dshid_2 = gds.add_data_share_in_dataset(dshid_2)
 print(f'  created data_share_in_dataset: {dshid_2}')
 
 print(f'Updating data_share_in_dataset: id={dshid_1.id}')
-dshid_1.status = GdsShareStatus.ACCEPTED
+dshid_1.status = GdsShareStatus.ACTIVE
 dshid_1 = gds.update_data_share_in_dataset(dshid_1.id, dshid_1)
 print(f'  updated data_share_in_dataset: {dshid_1}')
 
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 d22274c76..33fbd3ce4 100644
--- 
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
@@ -29,6 +29,7 @@ import org.apache.ranger.entity.XXGdsDataShare;
 import org.apache.ranger.entity.XXGdsSharedResource;
 import org.apache.ranger.plugin.model.RangerGds.RangerSharedResource;
 import org.apache.ranger.plugin.model.RangerPolicy;
+import org.apache.ranger.plugin.model.RangerPolicyResourceSignature;
 import org.apache.ranger.plugin.util.SearchFilter;
 import org.apache.ranger.view.RangerGdsVList.RangerSharedResourceList;
 import org.apache.ranger.view.VXMessage;
@@ -193,6 +194,7 @@ public class RangerGdsSharedResourceService extends 
RangerGdsBaseModelService<XX
         xObj.setDataShareId(vObj.getDataShareId());
         xObj.setResource(JsonUtils.mapToJson(vObj.getResource()));
         
xObj.setSubResourceNames(JsonUtils.listToJson(vObj.getSubResourceNames()));
+        
xObj.setResourceSignature(RangerPolicyResourceSignature.toSignatureString(vObj.getResource()));
         xObj.setConditionExpr(vObj.getConditionExpr());
         xObj.setAccessTypes(JsonUtils.objectToJson(vObj.getAccessTypes()));
         xObj.setRowFilter(JsonUtils.objectToJson(vObj.getRowFilter()));