Remove fields implementation.

This was copy-pasted from Storage and not thought through yet.

Author: tswast

runtimeconfig/google/cloud/runtimeconfig/config.py

@@ -159,7 +159,7 @@ def exists(self, client=None):
         except NotFound:
             return False
 
-    def reload(self, client=None, fields=None):
+    def reload(self, client=None):
         """API call:  reload the config via a ``GET`` request.
 
         This method will reload the newest data for the config.
@@ -171,25 +171,15 @@ def reload(self, client=None, fields=None):
                       :data:`NoneType <types.NoneType>`
         :param client: the client to use.  If not passed, falls back to
                        the client stored on the current config.
-
-        :type fields: string or ``NoneType``
-        :param fields: Selector specifying which fields to include in a
-                       partial response. Must be a list of fields. For example
-                       to get a partial response with just the name and
-                       description: 'name,description'
         """
         client = self._require_client(client)
-        query_params = {}
-        if fields is not None:
-            query_params['fields'] = fields
 
         # We assume the config exists. If it doesn't it will raise a NotFound
         # exception.
-        resp = client.connection.api_request(method='GET', path=self.path,
-                                             query_params=query_params)
+        resp = client.connection.api_request(method='GET', path=self.path)
         self._set_properties(api_response=resp)
 
-    def get_variable(self, variable_name, fields=None, client=None):
+    def get_variable(self, variable_name, client=None):
         """API call:  get a variable via a ``GET`` request.
 
         This will return None if the variable doesn't exist::
@@ -205,12 +195,6 @@ def get_variable(self, variable_name, fields=None, client=None):
         :type variable_name: string
         :param variable_name: The name of the variable to retrieve.
 
-        :type fields: string or ``NoneType``
-        :param fields: Selector specifying which fields to include in a
-                       partial response. Must be a list of fields. For example
-                       to get a partial response with just the name and value:
-                       'name,value'
-
         :type client: :class:`~google.cloud.runtimeconfig.client.Client` or
                       ``NoneType``
         :param client: Optional. The client to use.  If not passed, falls back
@@ -222,13 +206,12 @@ def get_variable(self, variable_name, fields=None, client=None):
         client = self._require_client(client)
         variable = Variable(config=self, name=variable_name)
         try:
-            variable.reload(fields=fields, client=client)
+            variable.reload(client=client)
             return variable
         except NotFound:
             return None
 
-    def list_variables(self, page_size=None, page_token=None, filter_=None,
-                       fields=None, client=None):
+    def list_variables(self, page_size=None, page_token=None, client=None):
         """API call:  list variables for this config.
 
         This only lists variable names, not the values.
@@ -243,16 +226,6 @@ def list_variables(self, page_size=None, page_token=None, filter_=None,
         :param page_token: opaque marker for the next "page" of variables. If
                            not passed, will return the first page of variables.
 
-        :type filter_: string or ``NoneType``
-        :param filter_: optional filter used to filter variables.
-
-        :type fields: string or ``NoneType``
-        :param fields: Selector specifying which fields to include in a
-                       partial response. Must be a list of fields. For example
-                       to get a partial response with just the next page token
-                       and the name of each variable returned:
-                       'variables/name,nextPageToken'
-
         :type client: :class:`~google.cloud.runtimeconfig.client.Client` or
                       ``NoneType``
         :param client: Optional. The client to use.  If not passed, falls back
@@ -273,12 +246,6 @@ def list_variables(self, page_size=None, page_token=None, filter_=None,
         if page_token is not None:
             params['pageToken'] = page_token
 
-        if filter_ is not None:
-            params['filter'] = filter_
-
-        if fields is not None:
-            params['fields'] = fields
-
         path = '%s/variables' % (self.path,)
         client = self._require_client(client)
         connection = client.connection

runtimeconfig/google/cloud/runtimeconfig/variable.py

@@ -81,9 +81,10 @@ def value(self):
         :returns: The value of the variable or ``None`` if the property
                   is not set locally.
         """
-        if 'value' in self._properties:
-            return base64.b64decode(self._properties['value'])
-        return None
+        value = self._properties.get('value')
+        if value is not None:
+            value = base64.b64decode(value)
+        return value
 
     @property
     def state(self):
@@ -166,32 +167,22 @@ def exists(self, client=None):
         except NotFound:
             return False
 
-    def reload(self, fields=None, client=None):
+    def reload(self, client=None):
         """API call:  reload the variable via a ``GET`` request.
 
         This method will reload the newest data for the variable.
 
         See:
         https://cloud.google.com/deployment-manager/runtime-configurator/reference/rest/v1beta1/projects.configs/get
 
-        :type fields: string or ``NoneType``
-        :param fields: Selector specifying which fields to include in a
-                       partial response. Must be a list of fields. For example
-                       to get a partial response with just the name and value:
-                       'name,value'
-
         :type client: :class:`google.cloud.runtimeconfig.client.Client` or
                       :data:`NoneType <types.NoneType>`
         :param client: the client to use.  If not passed, falls back to
                        the client stored on the current config.
         """
         client = self._require_client(client)
-        query_params = {}
-        if fields is not None:
-            query_params['fields'] = fields
 
         # We assume the variable exists. If it doesn't it will raise a NotFound
         # exception.
-        resp = client.connection.api_request(method='GET', path=self.path,
-                                             query_params=query_params)
+        resp = client.connection.api_request(method='GET', path=self.path)
         self._set_properties(api_response=resp)

runtimeconfig/unit_tests/test_config.py

@@ -82,13 +82,13 @@ def test_exists_hit_w_alternate_client(self):
         self.assertEqual(req['path'], '/%s' % (self.CONFIG_PATH,))
         self.assertEqual(req['query_params'], {'fields': 'name'})
 
-    def test_reload_w_no_fields(self):
+    def test_reload_w_empty_resource(self):
         RESOURCE = {}
         conn = _Connection(RESOURCE)
         client = _Client(project=self.PROJECT, connection=conn)
         config = self._makeOne(name=self.CONFIG_NAME, client=client)
 
-        config.reload(fields='')
+        config.reload()
 
         self.assertEqual(len(conn._requested), 1)
         req = conn._requested[0]
@@ -250,8 +250,6 @@ def test_list_variables_defaults(self):
     def test_list_variables_explicit(self):
         from google.cloud.runtimeconfig.variable import Variable
 
-        FILTER = 'filter'
-        FIELDS = 'variables/name,nextPageToken'
         VARIABLE_1 = 'variable-one'
         VARIABLE_2 = 'variable/two'
         PATH = 'projects/%s/configs/%s/variables' % (
@@ -273,8 +271,6 @@ def test_list_variables_explicit(self):
         variables, token = config.list_variables(
             page_size=3,
             page_token=TOKEN,
-            filter_=FILTER,
-            fields=FIELDS,
             client=client)
 
         self.assertEqual(len(variables), len(DATA['variables']))
@@ -295,8 +291,6 @@ def test_list_variables_explicit(self):
             {
                 'pageSize': 3,
                 'pageToken': TOKEN,
-                'filter': FILTER,
-                'fields': FIELDS
             })
 
 

runtimeconfig/unit_tests/test_variable.py

@@ -120,14 +120,14 @@ def test_reload_w_bound_client(self):
         self.assertEqual(req['path'], '/%s' % (self.PATH,))
         self._verifyResourceProperties(variable, RESOURCE)
 
-    def test_reload_w_no_fields(self):
+    def test_reload_w_empty_resource(self):
         RESOURCE = {}
         conn = _Connection(RESOURCE)
         client = _Client(project=self.PROJECT, connection=conn)
         config = Config(name=self.CONFIG_NAME, client=client)
         variable = self._makeOne(name=self.VARIABLE_NAME, config=config)
 
-        variable.reload(fields='')
+        variable.reload()
 
         # Name should not be overwritten.
         self.assertEqual(self.VARIABLE_NAME, variable.name)