refactor: rename 'Client._get_path' -> '_get_resource'

For parity with forthcoming '_put_resource', '_patch_resource',
'_post_resource', and '_delete_resource' methods.

Toward #38.

google/cloud/storage/_helpers.py

@@ -215,7 +215,7 @@ def reload(
             if_metageneration_match=if_metageneration_match,
             if_metageneration_not_match=if_metageneration_not_match,
         )
-        api_response = client._get_path(
+        api_response = client._get_resource(
             self.path,
             query_params=query_params,
             headers=self._encryption_headers(),

google/cloud/storage/acl.py

@@ -466,7 +466,7 @@ def reload(self, client=None, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
 
         self.entities.clear()
 
-        found = client._get_path(
+        found = client._get_resource(
             path, query_params=query_params, timeout=timeout, retry=retry,
         )
         self.loaded = True

google/cloud/storage/blob.py

@@ -704,7 +704,7 @@ def exists(
         try:
             # We intentionally pass `_target_object=None` since fields=name
             # would limit the local properties.
-            client._get_path(
+            client._get_resource(
                 self.path,
                 query_params=query_params,
                 timeout=timeout,
@@ -2828,7 +2828,7 @@ def get_iam_policy(
         if requested_policy_version is not None:
             query_params["optionsRequestedPolicyVersion"] = requested_policy_version
 
-        info = client._get_path(
+        info = client._get_resource(
             "%s/iam" % (self.path,),
             query_params=query_params,
             timeout=timeout,
@@ -2968,7 +2968,7 @@ def test_iam_permissions(
             query_params["userProject"] = self.user_project
 
         path = "%s/iam/testPermissions" % (self.path,)
-        resp = client._get_path(
+        resp = client._get_resource(
             path,
             query_params=query_params,
             timeout=timeout,

google/cloud/storage/bucket.py

@@ -786,7 +786,7 @@ def exists(
         try:
             # We intentionally pass `_target_object=None` since fields=name
             # would limit the local properties.
-            client._get_path(
+            client._get_resource(
                 self.path,
                 query_params=query_params,
                 timeout=timeout,
@@ -2881,7 +2881,7 @@ def get_iam_policy(
         if requested_policy_version is not None:
             query_params["optionsRequestedPolicyVersion"] = requested_policy_version
 
-        info = client._get_path(
+        info = client._get_resource(
             "%s/iam" % (self.path,),
             query_params=query_params,
             timeout=timeout,
@@ -3006,7 +3006,7 @@ def test_iam_permissions(
             query_params["userProject"] = self.user_project
 
         path = "%s/iam/testPermissions" % (self.path,)
-        resp = client._get_path(
+        resp = client._get_resource(
             path,
             query_params=query_params,
             timeout=timeout,

google/cloud/storage/client.py

@@ -286,7 +286,7 @@ def get_service_account_email(
             project = self.project
 
         path = "/projects/%s/serviceAccount" % (project,)
-        api_response = self._get_path(path, timeout=timeout, retry=retry)
+        api_response = self._get_resource(path, timeout=timeout, retry=retry)
         return api_response["email_address"]
 
     def bucket(self, bucket_name, user_project=None):
@@ -320,7 +320,7 @@ def batch(self):
         """
         return Batch(client=self)
 
-    def _get_path(
+    def _get_resource(
         self,
         path,
         query_params=None,

google/cloud/storage/hmac_key.py

@@ -222,7 +222,7 @@ def exists(self, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
             if self.user_project is not None:
                 qs_params["userProject"] = self.user_project
 
-            self._client._get_path(
+            self._client._get_resource(
                 self.path, query_params=qs_params, timeout=timeout, retry=retry,
             )
         except NotFound:
@@ -262,7 +262,7 @@ def reload(self, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
         if self.user_project is not None:
             qs_params["userProject"] = self.user_project
 
-        self._properties = self._client._get_path(
+        self._properties = self._client._get_resource(
             self.path, query_params=qs_params, timeout=timeout, retry=retry,
         )
 

google/cloud/storage/notification.py

@@ -323,7 +323,7 @@ def exists(self, client=None, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
             query_params["userProject"] = self.bucket.user_project
 
         try:
-            client._get_path(
+            client._get_resource(
                 self.path, query_params=query_params, timeout=timeout, retry=retry,
             )
         except NotFound:
@@ -377,7 +377,7 @@ def reload(self, client=None, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
         if self.bucket.user_project is not None:
             query_params["userProject"] = self.bucket.user_project
 
-        response = client._get_path(
+        response = client._get_resource(
             self.path, query_params=query_params, timeout=timeout, retry=retry,
         )
         self._set_properties(response)

tests/unit/test__helpers.py

@@ -112,8 +112,8 @@ def test__query_params_w_user_project(self):
     def test_reload_w_defaults(self):
         path = "/path"
         response = {"foo": "Foo"}
-        client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = response
+        client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = response
         derived = self._derivedClass(path)()
         # Make sure changes is not a set instance before calling reload
         # (which will clear / replace it with an empty set), checked below.
@@ -127,7 +127,7 @@ def test_reload_w_defaults(self):
 
         expected_query_params = {"projection": "noAcl"}
         expected_headers = {}  # no encryption headers by default
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             path,
             query_params=expected_query_params,
             headers=expected_headers,
@@ -142,8 +142,8 @@ def test_reload_w_generation_match_w_timeout(self):
         path = "/path"
         timeout = 42
         response = {"foo": "Foo"}
-        client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = response
+        client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = response
         derived = self._derivedClass(path)()
         # Make sure changes is not a set instance before calling reload
         # (which will clear / replace it with an empty set), checked below.
@@ -165,7 +165,7 @@ def test_reload_w_generation_match_w_timeout(self):
             "ifMetagenerationMatch": metageneration_number,
         }
         expected_headers = {}  # no encryption headers by default
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             path,
             query_params=expected_query_params,
             headers=expected_headers,
@@ -179,8 +179,8 @@ def test_reload_w_user_project_w_retry(self):
         path = "/path"
         retry = mock.Mock(spec=[])
         response = {"foo": "Foo"}
-        client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = response
+        client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = response
         derived = self._derivedClass(path, user_project)()
         # Make sure changes is not a set instance before calling reload
         # (which will clear / replace it with an empty set), checked below.
@@ -197,7 +197,7 @@ def test_reload_w_user_project_w_retry(self):
             "userProject": user_project,
         }
         expected_headers = {}  # no encryption headers by default
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             path,
             query_params=expected_query_params,
             headers=expected_headers,
@@ -210,8 +210,8 @@ def test_reload_w_projection_w_explicit_client_w_enc_header(self):
         path = "/path"
         response = {"foo": "Foo"}
         encryption_headers = {"bar": "Bar"}
-        client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = response
+        client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = response
         derived = self._derivedClass(path)()
         # Make sure changes is not a set instance before calling reload
         # (which will clear / replace it with an empty set), checked below.
@@ -224,7 +224,7 @@ def test_reload_w_projection_w_explicit_client_w_enc_header(self):
         self.assertEqual(derived._changes, set())
 
         expected_query_params = {"projection": "full"}
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             path,
             query_params=expected_query_params,
             headers=encryption_headers,

tests/unit/test_acl.py

@@ -546,15 +546,15 @@ class Derived(self._get_target_class()):
         acl.reload_path = reload_path
         acl.loaded = True
         acl.entity("allUsers", role)
-        client = acl.client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = api_response
+        client = acl.client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = api_response
 
         acl.reload()
 
         self.assertEqual(list(acl), [])
 
         expected_query_params = {}
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             reload_path,
             query_params=expected_query_params,
             timeout=self._get_default_timeout(),
@@ -571,16 +571,16 @@ def test_reload_w_empty_result_w_timeout_w_retry_w_explicit_client(self):
         acl.reload_path = reload_path
         acl.loaded = True
         acl.entity("allUsers", role)
-        client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = api_response
+        client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = api_response
 
         acl.reload(client=client, timeout=timeout, retry=retry)
 
         self.assertTrue(acl.loaded)
         self.assertEqual(list(acl), [])
 
         expected_query_params = {}
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             reload_path,
             query_params=expected_query_params,
             timeout=timeout,
@@ -596,16 +596,16 @@ def test_reload_w_nonempty_result_w_user_project(self):
         acl.reload_path = reload_path
         acl.loaded = True
         acl.user_project = user_project
-        client = mock.Mock(spec=["_get_path"])
-        client._get_path.return_value = api_response
+        client = mock.Mock(spec=["_get_resource"])
+        client._get_resource.return_value = api_response
 
         acl.reload(client=client)
 
         self.assertTrue(acl.loaded)
         self.assertEqual(list(acl), [{"entity": "allUsers", "role": role}])
 
         expected_query_params = {"userProject": user_project}
-        client._get_path.assert_called_once_with(
+        client._get_resource.assert_called_once_with(
             reload_path,
             query_params=expected_query_params,
             timeout=self._get_default_timeout(),