From 9bed1a180b9f3c1d8d7c0ae58cb8e58b5ce2e05f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Wed, 14 Nov 2018 10:18:53 -0800 Subject: [PATCH] Pick up fixes in GAPIC generator. (#6491) Includes fixes from these PRs: - https://github.com/googleapis/gapic-generator/pull/2407 - https://github.com/googleapis/gapic-generator/pull/2396 --- .../gapic/data_transfer_service_client.py | 17 +- .../bigquery_datatransfer_v1/gapic/enums.py | 54 +++--- .../data_transfer_service_grpc_transport.py | 11 ++ .../test_data_transfer_service_client_v1.py | 157 ++++++++++++------ 4 files changed, 155 insertions(+), 84 deletions(-) diff --git a/google/cloud/bigquery_datatransfer_v1/gapic/data_transfer_service_client.py b/google/cloud/bigquery_datatransfer_v1/gapic/data_transfer_service_client.py index a51d4018..bc067602 100644 --- a/google/cloud/bigquery_datatransfer_v1/gapic/data_transfer_service_client.py +++ b/google/cloud/bigquery_datatransfer_v1/gapic/data_transfer_service_client.py @@ -120,7 +120,7 @@ def __init__(self, transport=None, channel=None, credentials=None, - client_config=data_transfer_service_client_config.config, + client_config=None, client_info=None): """Constructor. @@ -153,13 +153,20 @@ def __init__(self, your own client library. """ # Raise deprecation warnings for things we want to go away. - if client_config: - warnings.warn('The `client_config` argument is deprecated.', - PendingDeprecationWarning) + if client_config is not None: + warnings.warn( + 'The `client_config` argument is deprecated.', + PendingDeprecationWarning, + stacklevel=2) + else: + client_config = data_transfer_service_client_config.config + if channel: warnings.warn( 'The `channel` argument is deprecated; use ' - '`transport` instead.', PendingDeprecationWarning) + '`transport` instead.', + PendingDeprecationWarning, + stacklevel=2) # Instantiate the transport. # The transport is responsible for handling serialization and diff --git a/google/cloud/bigquery_datatransfer_v1/gapic/enums.py b/google/cloud/bigquery_datatransfer_v1/gapic/enums.py index 4ea7a98b..6a077038 100644 --- a/google/cloud/bigquery_datatransfer_v1/gapic/enums.py +++ b/google/cloud/bigquery_datatransfer_v1/gapic/enums.py @@ -18,19 +18,6 @@ import enum -class NullValue(enum.IntEnum): - """ - ``NullValue`` is a singleton enumeration to represent the null value for - the ``Value`` type union. - - The JSON representation for ``NullValue`` is JSON ``null``. - - Attributes: - NULL_VALUE (int): Null value. - """ - NULL_VALUE = 0 - - class TransferType(enum.IntEnum): """ DEPRECATED. Represents data transfer type. @@ -67,21 +54,17 @@ class TransferState(enum.IntEnum): CANCELLED = 6 -class TransferMessage(object): - class MessageSeverity(enum.IntEnum): - """ - Represents data transfer user facing message severity. +class NullValue(enum.IntEnum): + """ + ``NullValue`` is a singleton enumeration to represent the null value for + the ``Value`` type union. - Attributes: - MESSAGE_SEVERITY_UNSPECIFIED (int): No severity specified. - INFO (int): Informational message. - WARNING (int): Warning message. - ERROR (int): Error message. - """ - MESSAGE_SEVERITY_UNSPECIFIED = 0 - INFO = 1 - WARNING = 2 - ERROR = 3 + The JSON representation for ``NullValue`` is JSON ``null``. + + Attributes: + NULL_VALUE (int): Null value. + """ + NULL_VALUE = 0 class DataSourceParameter(object): @@ -153,3 +136,20 @@ class RunAttempt(enum.IntEnum): """ RUN_ATTEMPT_UNSPECIFIED = 0 LATEST = 1 + + +class TransferMessage(object): + class MessageSeverity(enum.IntEnum): + """ + Represents data transfer user facing message severity. + + Attributes: + MESSAGE_SEVERITY_UNSPECIFIED (int): No severity specified. + INFO (int): Informational message. + WARNING (int): Warning message. + ERROR (int): Error message. + """ + MESSAGE_SEVERITY_UNSPECIFIED = 0 + INFO = 1 + WARNING = 2 + ERROR = 3 diff --git a/google/cloud/bigquery_datatransfer_v1/gapic/transports/data_transfer_service_grpc_transport.py b/google/cloud/bigquery_datatransfer_v1/gapic/transports/data_transfer_service_grpc_transport.py index ff6d0899..ed7229bd 100644 --- a/google/cloud/bigquery_datatransfer_v1/gapic/transports/data_transfer_service_grpc_transport.py +++ b/google/cloud/bigquery_datatransfer_v1/gapic/transports/data_transfer_service_grpc_transport.py @@ -62,6 +62,8 @@ def __init__(self, credentials=credentials, ) + self._channel = channel + # gRPC uses objects called "stubs" that are bound to the # channel and provide a basic method for each RPC. self._stubs = { @@ -92,6 +94,15 @@ def create_channel(cls, scopes=cls._OAUTH_SCOPES, ) + @property + def channel(self): + """The gRPC channel used by the transport. + + Returns: + grpc.Channel: A gRPC channel object. + """ + return self._channel + @property def get_data_source(self): """Return the gRPC stub for {$apiMethod.name}. diff --git a/tests/unit/gapic/v1/test_data_transfer_service_client_v1.py b/tests/unit/gapic/v1/test_data_transfer_service_client_v1.py index d179bc19..abadfa21 100644 --- a/tests/unit/gapic/v1/test_data_transfer_service_client_v1.py +++ b/tests/unit/gapic/v1/test_data_transfer_service_client_v1.py @@ -15,6 +15,7 @@ # limitations under the License. """Unit tests.""" +import mock import pytest from google.cloud import bigquery_datatransfer_v1 @@ -98,8 +99,10 @@ def test_get_data_source(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request name = client.project_data_source_path('[PROJECT]', '[DATA_SOURCE]') @@ -115,8 +118,10 @@ def test_get_data_source(self): def test_get_data_source_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request name = client.project_data_source_path('[PROJECT]', '[DATA_SOURCE]') @@ -138,8 +143,10 @@ def test_list_data_sources(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request parent = client.project_path('[PROJECT]') @@ -158,8 +165,10 @@ def test_list_data_sources(self): def test_list_data_sources_exception(self): channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request parent = client.project_path('[PROJECT]') @@ -194,8 +203,10 @@ def test_create_transfer_config(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request parent = client.project_path('[PROJECT]') @@ -213,8 +224,10 @@ def test_create_transfer_config(self): def test_create_transfer_config_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request parent = client.project_path('[PROJECT]') @@ -249,8 +262,10 @@ def test_update_transfer_config(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request transfer_config = {} @@ -268,8 +283,10 @@ def test_update_transfer_config(self): def test_update_transfer_config_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request transfer_config = {} @@ -280,8 +297,10 @@ def test_update_transfer_config_exception(self): def test_delete_transfer_config(self): channel = ChannelStub() - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request name = client.project_transfer_config_path('[PROJECT]', @@ -298,8 +317,10 @@ def test_delete_transfer_config(self): def test_delete_transfer_config_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request name = client.project_transfer_config_path('[PROJECT]', @@ -334,8 +355,10 @@ def test_get_transfer_config(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request name = client.project_transfer_config_path('[PROJECT]', @@ -352,8 +375,10 @@ def test_get_transfer_config(self): def test_get_transfer_config_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request name = client.project_transfer_config_path('[PROJECT]', @@ -376,8 +401,10 @@ def test_list_transfer_configs(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request parent = client.project_path('[PROJECT]') @@ -396,8 +423,10 @@ def test_list_transfer_configs(self): def test_list_transfer_configs_exception(self): channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request parent = client.project_path('[PROJECT]') @@ -414,8 +443,10 @@ def test_schedule_transfer_runs(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request parent = client.project_transfer_config_path('[PROJECT]', @@ -435,8 +466,10 @@ def test_schedule_transfer_runs(self): def test_schedule_transfer_runs_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request parent = client.project_transfer_config_path('[PROJECT]', @@ -465,8 +498,10 @@ def test_get_transfer_run(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request name = client.project_run_path('[PROJECT]', '[TRANSFER_CONFIG]', @@ -483,8 +518,10 @@ def test_get_transfer_run(self): def test_get_transfer_run_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request name = client.project_run_path('[PROJECT]', '[TRANSFER_CONFIG]', @@ -495,8 +532,10 @@ def test_get_transfer_run_exception(self): def test_delete_transfer_run(self): channel = ChannelStub() - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request name = client.project_run_path('[PROJECT]', '[TRANSFER_CONFIG]', @@ -512,8 +551,10 @@ def test_delete_transfer_run(self): def test_delete_transfer_run_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request name = client.project_run_path('[PROJECT]', '[TRANSFER_CONFIG]', @@ -536,8 +577,10 @@ def test_list_transfer_runs(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request parent = client.project_transfer_config_path('[PROJECT]', @@ -557,8 +600,10 @@ def test_list_transfer_runs(self): def test_list_transfer_runs_exception(self): channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request parent = client.project_transfer_config_path('[PROJECT]', @@ -582,8 +627,10 @@ def test_list_transfer_logs(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request parent = client.project_run_path('[PROJECT]', '[TRANSFER_CONFIG]', @@ -603,8 +650,10 @@ def test_list_transfer_logs(self): def test_list_transfer_logs_exception(self): channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request parent = client.project_run_path('[PROJECT]', '[TRANSFER_CONFIG]', @@ -623,8 +672,10 @@ def test_check_valid_creds(self): # Mock the API response channel = ChannelStub(responses=[expected_response]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup Request name = client.project_data_source_path('[PROJECT]', '[DATA_SOURCE]') @@ -640,8 +691,10 @@ def test_check_valid_creds(self): def test_check_valid_creds_exception(self): # Mock the API response channel = ChannelStub(responses=[CustomException()]) - client = bigquery_datatransfer_v1.DataTransferServiceClient( - channel=channel) + patch = mock.patch('google.api_core.grpc_helpers.create_channel') + with patch as create_channel: + create_channel.return_value = channel + client = bigquery_datatransfer_v1.DataTransferServiceClient() # Setup request name = client.project_data_source_path('[PROJECT]', '[DATA_SOURCE]')