Merge pull request #3326 from tseaver/3070-spanner-pass_explicit_cred…

…s_to_api_stubs Pass client credentials through to instance / database admin API instances
googleapis · Apr 25, 2017 · b657337 · b657337
2 parents d0ef6a9 + 59a165a
commit b657337
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/spanner/google/cloud/spanner/client.py b/spanner/google/cloud/spanner/client.py
@@ -154,6 +154,7 @@ def instance_admin_api(self):
         """Helper for session-related API calls."""
         if self._instance_admin_api is None:
             self._instance_admin_api = InstanceAdminClient(
+                credentials=self.credentials,
                 lib_name='gccl',
                 lib_version=__version__,
             )
@@ -164,6 +165,7 @@ def database_admin_api(self):
         """Helper for session-related API calls."""
         if self._database_admin_api is None:
             self._database_admin_api = DatabaseAdminClient(
+                credentials=self.credentials,
                 lib_name='gccl',
                 lib_version=__version__,
             )

diff --git a/spanner/tests/unit/test_client.py b/spanner/tests/unit/test_client.py
@@ -164,6 +164,7 @@ def __init__(self, *args, **kwargs):
         again = client.instance_admin_api
         self.assertTrue(again is api)
         self.assertEqual(api.kwargs['lib_name'], 'gccl')
+        self.assertIs(api.kwargs['credentials'], client.credentials)
 
     def test_database_admin_api(self):
         from google.cloud._testing import _Monkey
@@ -184,6 +185,7 @@ def __init__(self, *args, **kwargs):
         again = client.database_admin_api
         self.assertTrue(again is api)
         self.assertEqual(api.kwargs['lib_name'], 'gccl')
+        self.assertIs(api.kwargs['credentials'], client.credentials)
 
     def test_copy(self):
         credentials = _Credentials('value')