code review refactoring

Author: fabianvf

dynamic/client.py

@@ -169,39 +169,41 @@ def patch(self, resource, body=None, name=None, namespace=None, **kwargs):
         if resource.namespaced:
             namespace = self.ensure_namespace(resource, namespace, body)
 
-        path = resource.path(name=name, namespace=namespace, **kwargs)
+        path = resource.path(name=name, namespace=namespace)
 
         content_type = self.client.\
             select_header_content_type(['application/json-patch+json', 'application/merge-patch+json', 'application/strategic-merge-patch+json'])
 
-        return self.request('patch', path, body=body, content_type=content_type)
-
+        return self.request('patch', path, body=body, content_type=content_type, **kwargs)
+
+    def extract_query_params(self, params):
+        valid_params = {
+            'watch': 'watch',
+            'limit': 'limit',
+            'pretty': 'pretty',
+            '_continue': 'continue',
+            'field_selector': 'fieldSelector',
+            'label_selector': 'labelSelector',
+            'timeout_seconds': 'timeoutSeconds',
+            'resource_version': 'resourceVersion',
+            'orphan_dependents': 'orphanDependents',
+            'propagation_policy': 'propagationPolicy',
+            'grace_period_seconds': 'gracePeriodSeconds',
+            'include_uninitialized': 'includeUninitialized',
+        }
+        return [
+            (query_param, params[name])
+            for name, query_param in valid_params.items() if params.get(name)
+        ]
 
     def request(self, method, path, body=None, **params):
 
         if not path.startswith('/'):
             path = '/' + path
 
         path_params = params.get('path_params', {})
-        query_params = params.get('query_params', [])
-        if params.get('pretty'):
-            query_params.append(('pretty', params['pretty']))
-        if params.get('_continue'):
-            query_params.append(('continue', params['_continue']))
-        if params.get('include_uninitialized'):
-            query_params.append(('includeUninitialized', params['include_uninitialized']))
-        if params.get('field_selector'):
-            query_params.append(('fieldSelector', params['field_selector']))
-        if params.get('label_selector'):
-            query_params.append(('labelSelector', params['label_selector']))
-        if params.get('limit'):
-            query_params.append(('limit', params['limit']))
-        if params.get('resource_version'):
-            query_params.append(('resourceVersion', params['resource_version']))
-        if params.get('timeout_seconds'):
-            query_params.append(('timeoutSeconds', params['timeout_seconds']))
-        if params.get('watch'):
-            query_params.append(('watch', params['watch']))
+        query_params = self.extract_query_params(params)
+        query_params.extend(params.get('query_params', []))
 
         header_params = params.get('header_params', {})
         form_params = []
@@ -268,9 +270,7 @@ def __init__(self, prefix=None, group=None, api_version=None, kind=None,
 
     @property
     def group_version(self):
-        if self.group:
-            return '{}/{}'.format(self.group, self.api_version)
-        return self.api_version
+        return '/'.join(filter(None, [self.group, self.api_version]))
 
     def __repr__(self):
         return '<{}({}/{}>)'.format(self.__class__.__name__, self.group_version, self.name)
@@ -372,7 +372,7 @@ def search(self, **kwargs):
                 kind: The kind of the resource
                 arbitrary arguments (see below), in random order
 
-            The arbitrary arguments can be any valid attribute for a kubernetes.dynamic.Resource object
+            The arbitrary arguments can be any valid attribute for a Resource object
         """
         return self.__search(self.__build_search(**kwargs), self.__resources)