fix(zb-experimental): pass creds to grpc channel (#1623)

fix(zb-experimental): pass creds to grpc channel

Author: chandra-siri

google/cloud/storage/_experimental/asyncio/async_grpc_client.py

@@ -65,8 +65,10 @@ def _create_async_grpc_client(
 transport_cls=storage_v2.StorageAsyncClient.get_transport_class(
 "grpc_asyncio"
  )
-channel=transport_cls.create_channel(attempt_direct_path=attempt_direct_path)
-transport=transport_cls(credentials=credentials, channel=channel)
+channel=transport_cls.create_channel(
+attempt_direct_path=attempt_direct_path, credentials=credentials
+ )
+transport=transport_cls(channel=channel)
 
 returnstorage_v2.StorageAsyncClient(
 transport=transport,

tests/unit/asyncio/test_async_grpc_client.py

@@ -15,6 +15,7 @@
 importunittest
 fromunittestimportmock
 fromgoogle.authimportcredentialsasauth_credentials
+fromgoogle.auth.credentialsimportAnonymousCredentials
 
 
 def_make_credentials(spec=None):
@@ -38,12 +39,10 @@ def test_constructor_default_options(self, mock_async_storage_client):
 "grpc_asyncio"
  )
 mock_transport_cls.create_channel.assert_called_once_with(
-attempt_direct_path=True
+attempt_direct_path=True, credentials=mock_creds
  )
 mock_channel=mock_transport_cls.create_channel.return_value
-mock_transport_cls.assert_called_once_with(
-credentials=mock_creds, channel=mock_channel
- )
+mock_transport_cls.assert_called_once_with(channel=mock_channel)
 mock_transport=mock_transport_cls.return_value
 mock_async_storage_client.assert_called_once_with(
 transport=mock_transport,
@@ -64,21 +63,77 @@ def test_constructor_disables_directpath(self, mock_async_storage_client):
  )
 
 mock_transport_cls.create_channel.assert_called_once_with(
-attempt_direct_path=False
+attempt_direct_path=False, credentials=mock_creds
  )
 mock_channel=mock_transport_cls.create_channel.return_value
-mock_transport_cls.assert_called_once_with(
-credentials=mock_creds, channel=mock_channel
- )
+mock_transport_cls.assert_called_once_with(channel=mock_channel)
 
 @mock.patch("google.cloud._storage_v2.StorageAsyncClient")
-deftest_grpc_client_property(self, mock_async_storage_client):
+deftest_grpc_client_property(self, mock_grpc_gapic_client):
 fromgoogle.cloud.storage._experimental.asyncioimportasync_grpc_client
 
+# Arrange
+mock_transport_cls=mock.MagicMock()
+mock_grpc_gapic_client.get_transport_class.return_value=mock_transport_cls
+channel_sentinel=mock.sentinel.channel
+
+mock_transport_cls.create_channel.return_value=channel_sentinel
+mock_transport_cls.return_value=mock.sentinel.transport
+
 mock_creds=_make_credentials()
+mock_client_info=mock.sentinel.client_info
+mock_client_options=mock.sentinel.client_options
+mock_attempt_direct_path=mock.sentinel.attempt_direct_path
+
+# Act
+client=async_grpc_client.AsyncGrpcClient(
+credentials=mock_creds,
+client_info=mock_client_info,
+client_options=mock_client_options,
+attempt_direct_path=mock_attempt_direct_path,
+ )
+
+mock_grpc_gapic_client.get_transport_class.return_value=mock_transport_cls
+
+mock_transport_cls.create_channel.return_value=channel_sentinel
+mock_transport_instance=mock.sentinel.transport
+mock_transport_cls.return_value=mock_transport_instance
+
+retrieved_client=client.grpc_client
+
+# Assert
+mock_transport_cls.create_channel.assert_called_once_with(
+attempt_direct_path=mock_attempt_direct_path, credentials=mock_creds
+ )
+mock_transport_cls.assere_with(channel=channel_sentinel)
+mock_grpc_gapic_client.assert_called_once_with(
+transport=mock_transport_instance,
+client_info=mock_client_info,
+client_options=mock_client_options,
+ )
+self.assertIs(retrieved_client, mock_grpc_gapic_client.return_value)
 
-client=async_grpc_client.AsyncGrpcClient(credentials=mock_creds)
+@mock.patch("google.cloud._storage_v2.StorageAsyncClient")
+deftest_grpc_client_with_anon_creds(self, mock_grpc_gapic_client):
+fromgoogle.cloud.storage._experimental.asyncioimportasync_grpc_client
 
+# Arrange
+mock_transport_cls=mock.MagicMock()
+mock_grpc_gapic_client.get_transport_class.return_value=mock_transport_cls
+channel_sentinel=mock.sentinel.channel
+
+mock_transport_cls.create_channel.return_value=channel_sentinel
+mock_transport_cls.return_value=mock.sentinel.transport
+
+# Act
+anonymous_creds=AnonymousCredentials()
+client=async_grpc_client.AsyncGrpcClient(credentials=anonymous_creds)
 retrieved_client=client.grpc_client
 
-self.assertIs(retrieved_client, mock_async_storage_client.return_value)
+# Assert
+self.assertIs(retrieved_client, mock_grpc_gapic_client.return_value)
+
+mock_transport_cls.create_channel.assert_called_once_with(
+attempt_direct_path=True, credentials=anonymous_creds
+ )
+mock_transport_cls.assert_called_once_with(channel=channel_sentinel)