You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2020/12/19 19:28:12 UTC

[ranger] branch ranger-2.1 updated: RANGER-3129: updated Python client to fix incorrect default value assignment to method params

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

madhan pushed a commit to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.1 by this push:
     new 5b84115  RANGER-3129: updated Python client to fix incorrect default value assignment to method params
5b84115 is described below

commit 5b84115f25b1e222054751c64a418b715d7eea0c
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Fri Dec 18 09:11:03 2020 -0800

    RANGER-3129: updated Python client to fix incorrect default value assignment to method params
    
    (cherry picked from commit e4a6203cb0c0c877c4dc25d6c3ee042d5c4645f6)
---
 .../python/apache_ranger/client/ranger_client.py   | 20 ++++++--
 .../model/grant_revoke_role_request.py             |  5 +-
 .../main/python/apache_ranger/model/ranger_base.py |  5 +-
 .../python/apache_ranger/model/ranger_policy.py    | 50 ++++++++++++++++----
 .../main/python/apache_ranger/model/ranger_role.py | 10 +++-
 .../apache_ranger/model/ranger_security_zone.py    | 10 +++-
 .../python/apache_ranger/model/ranger_service.py   |  5 +-
 .../apache_ranger/model/ranger_service_def.py      | 55 +++++++++++++++++-----
 8 files changed, 128 insertions(+), 32 deletions(-)

diff --git a/intg/src/main/python/apache_ranger/client/ranger_client.py b/intg/src/main/python/apache_ranger/client/ranger_client.py
index 67b21c2..1dd4118 100644
--- a/intg/src/main/python/apache_ranger/client/ranger_client.py
+++ b/intg/src/main/python/apache_ranger/client/ranger_client.py
@@ -78,7 +78,10 @@ class RangerClient:
 
         return type_coerce(resp, RangerServiceDef)
 
-    def find_service_defs(self, filter={}):
+    def find_service_defs(self, filter=None):
+        if filter is None:
+            filter = {}
+
         resp = self.__call_api(RangerClient.FIND_SERVICEDEFS, filter)
 
         return type_coerce_list(resp, RangerServiceDef)
@@ -116,7 +119,10 @@ class RangerClient:
     def delete_service(self, serviceName):
         self.__call_api(RangerClient.DELETE_SERVICE_BY_NAME.format_path({ 'name': serviceName }))
 
-    def find_services(self, filter={}):
+    def find_services(self, filter=None):
+        if filter is None:
+            filter = {}
+
         resp = self.__call_api(RangerClient.FIND_SERVICES, filter)
 
         return type_coerce_list(resp, RangerService)
@@ -416,7 +422,10 @@ class RangerClient:
 
 
 class Message(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.name      = attrs.get('name')
@@ -427,7 +436,10 @@ class Message(RangerBase):
 
 
 class RESTResponse(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.httpStatusCode = attrs.get('httpStatusCode')
diff --git a/intg/src/main/python/apache_ranger/model/grant_revoke_role_request.py b/intg/src/main/python/apache_ranger/model/grant_revoke_role_request.py
index fcc9078..0af333a 100644
--- a/intg/src/main/python/apache_ranger/model/grant_revoke_role_request.py
+++ b/intg/src/main/python/apache_ranger/model/grant_revoke_role_request.py
@@ -21,7 +21,10 @@ from apache_ranger.utils             import *
 
 
 class GrantRevokeRoleRequest(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.grantor         = attrs.get('grantor')
diff --git a/intg/src/main/python/apache_ranger/model/ranger_base.py b/intg/src/main/python/apache_ranger/model/ranger_base.py
index edabe2c..83ec44d 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_base.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_base.py
@@ -50,7 +50,10 @@ class RangerBase(dict):
 
 
 class RangerBaseModelObject(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.id         = attrs.get('id')
diff --git a/intg/src/main/python/apache_ranger/model/ranger_policy.py b/intg/src/main/python/apache_ranger/model/ranger_policy.py
index 1531a84..c33f6e4 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_policy.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_policy.py
@@ -26,7 +26,10 @@ class RangerPolicy(RangerBaseModelObject):
     POLICY_TYPE_DATAMASK  = 1
     POLICY_TYPE_ROWFILTER = 2
 
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBaseModelObject.__init__(self, attrs)
 
         self.service              = attrs.get('service')
@@ -65,7 +68,10 @@ class RangerPolicy(RangerBaseModelObject):
 
 
 class RangerPolicyResource(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.values      = attrs.get('values')
@@ -74,7 +80,10 @@ class RangerPolicyResource(RangerBase):
 
 
 class RangerPolicyItemCondition(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.type   = attrs.get('type')
@@ -82,7 +91,10 @@ class RangerPolicyItemCondition(RangerBase):
 
 
 class RangerPolicyItem(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.accesses      = attrs.get('accesses')
@@ -99,7 +111,10 @@ class RangerPolicyItem(RangerBase):
 
 
 class RangerDataMaskPolicyItem(RangerPolicyItem):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerPolicyItem.__init__(self, attrs)
 
         self.dataMaskInfo = attrs.get('dataMaskInfo')
@@ -111,7 +126,10 @@ class RangerDataMaskPolicyItem(RangerPolicyItem):
 
 
 class RangerRowFilterPolicyItem(RangerPolicyItem):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerPolicyItem.__init__(self, attrs)
 
         self.rowFilterInfo = attrs.get('rowFilterInfo')
@@ -123,7 +141,10 @@ class RangerRowFilterPolicyItem(RangerPolicyItem):
 
 
 class RangerValiditySchedule(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.startTime = attrs.get('startTime')
@@ -132,7 +153,10 @@ class RangerValiditySchedule(RangerBase):
 
 
 class RangerPolicyItemAccess(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.type      = attrs.get('type')
@@ -140,7 +164,10 @@ class RangerPolicyItemAccess(RangerBase):
 
 
 class RangerPolicyItemDataMaskInfo(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.dataMaskType  = attrs.get('dataMaskType')
@@ -149,7 +176,10 @@ class RangerPolicyItemDataMaskInfo(RangerBase):
 
 
 class RangerPolicyItemRowFilterInfo(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.filterExpr = attrs.get('filterExpr')
diff --git a/intg/src/main/python/apache_ranger/model/ranger_role.py b/intg/src/main/python/apache_ranger/model/ranger_role.py
index c789a76..ab9052c 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_role.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_role.py
@@ -21,7 +21,10 @@ from apache_ranger.utils             import *
 
 
 class RoleMember(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.name    = attrs.get('name')
@@ -29,7 +32,10 @@ class RoleMember(RangerBase):
 
 
 class RangerRole(RangerBaseModelObject):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBaseModelObject.__init__(self, attrs)
 
         self.name          = attrs.get('name')
diff --git a/intg/src/main/python/apache_ranger/model/ranger_security_zone.py b/intg/src/main/python/apache_ranger/model/ranger_security_zone.py
index 2ba0915..3056b7e 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_security_zone.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_security_zone.py
@@ -20,14 +20,20 @@ from apache_ranger.model.ranger_base import RangerBase, RangerBaseModelObject
 
 
 class RangerSecurityZoneService(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.resources = attrs.get('resources')
 
 
 class RangerSecurityZone(RangerBaseModelObject):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBaseModelObject.__init__(self, attrs)
 
         self.name            = attrs.get('name')
diff --git a/intg/src/main/python/apache_ranger/model/ranger_service.py b/intg/src/main/python/apache_ranger/model/ranger_service.py
index d8ea93b..a3d273c 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_service.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_service.py
@@ -20,7 +20,10 @@ from apache_ranger.model.ranger_base import RangerBaseModelObject
 
 
 class RangerService(RangerBaseModelObject):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBaseModelObject.__init__(self, attrs)
 
         self.type             = attrs.get('type')
diff --git a/intg/src/main/python/apache_ranger/model/ranger_service_def.py b/intg/src/main/python/apache_ranger/model/ranger_service_def.py
index b35fe2a..67923ea 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_service_def.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_service_def.py
@@ -21,7 +21,10 @@ from apache_ranger.utils             import *
 
 
 class RangerServiceDef(RangerBaseModelObject):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBaseModelObject.__init__(self, attrs)
 
         self.name             = attrs.get('name')
@@ -55,7 +58,10 @@ class RangerServiceDef(RangerBaseModelObject):
 
 
 class RangerServiceConfigDef:
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId                 = attrs.get('itemId')
@@ -75,7 +81,10 @@ class RangerServiceConfigDef:
 
 
 class RangerResourceDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId                 = attrs.get('itemId')
@@ -102,7 +111,10 @@ class RangerResourceDef(RangerBase):
 
 
 class RangerAccessTypeDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId        = attrs.get('itemId')
@@ -113,7 +125,10 @@ class RangerAccessTypeDef(RangerBase):
 
 
 class RangerPolicyConditionDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId                 = attrs.get('itemId')
@@ -131,7 +146,10 @@ class RangerPolicyConditionDef(RangerBase):
 
 
 class RangerContextEnricherDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId         = attrs.get('itemId')
@@ -141,7 +159,10 @@ class RangerContextEnricherDef(RangerBase):
 
 
 class RangerEnumDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId       = attrs.get('itemId')
@@ -156,7 +177,10 @@ class RangerEnumDef(RangerBase):
 
 
 class RangerDataMaskDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.maskTypes   = attrs.get('maskTypes')
@@ -172,7 +196,10 @@ class RangerDataMaskDef(RangerBase):
 
 
 class RangerRowFilterDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.accessTypes = attrs.get('accessTypes')
@@ -186,7 +213,10 @@ class RangerRowFilterDef(RangerBase):
 
 
 class RangerEnumElementDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId     = attrs.get('itemId')
@@ -196,7 +226,10 @@ class RangerEnumElementDef(RangerBase):
 
 
 class RangerDataMaskTypeDef(RangerBase):
-    def __init__(self, attrs={}):
+    def __init__(self, attrs=None):
+        if attrs is None:
+            attrs = {}
+
         RangerBase.__init__(self, attrs)
 
         self.itemId           = attrs.get('itemId')