chore: use gapic-generator-python 0.62.1 (#71)

gcf-owl-bot[bot] · web-flow · commit ffbd3c967c50 · 2022-02-03T12:30:46.000Z
- [ ] Regenerate this pull request now. fix: resolve DuplicateCredentialArgs error when using credentials_file committer: parthea PiperOrigin-RevId: 425964861 Source-Link: googleapis/googleapis@84b1a5a Source-Link: https://github.com/googleapis/googleapis-gen/commit/4fb761bbd8506ac156f49bac5f18306aa8eb3aa8 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9
diff --git a/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc.py b/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc.py
@@ -162,8 +162,11 @@ def __init__(
         if not self._grpc_channel:
             self._grpc_channel = type(self).create_channel(
                 self._host,
+                # use the credentials which are saved
                 credentials=self._credentials,
-                credentials_file=credentials_file,
+                # Set ``credentials_file`` to ``None`` here as
+                # the credentials that we saved earlier should be used.
+                credentials_file=None,
                 scopes=self._scopes,
                 ssl_credentials=self._ssl_channel_credentials,
                 quota_project_id=quota_project_id,
@@ -236,7 +239,7 @@ def operations_client(self) -> operations_v1.OperationsClient:
         This property caches on the instance; repeated calls return the same
         client.
         """
-        # Sanity check: Only create a new client if we do not already have one.
+        # Quick check: Only create a new client if we do not already have one.
         if self._operations_client is None:
             self._operations_client = operations_v1.OperationsClient(self.grpc_channel)
 
diff --git a/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc_asyncio.py b/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc_asyncio.py
@@ -207,8 +207,11 @@ def __init__(
         if not self._grpc_channel:
             self._grpc_channel = type(self).create_channel(
                 self._host,
+                # use the credentials which are saved
                 credentials=self._credentials,
-                credentials_file=credentials_file,
+                # Set ``credentials_file`` to ``None`` here as
+                # the credentials that we saved earlier should be used.
+                credentials_file=None,
                 scopes=self._scopes,
                 ssl_credentials=self._ssl_channel_credentials,
                 quota_project_id=quota_project_id,
@@ -238,7 +241,7 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient:
         This property caches on the instance; repeated calls return the same
         client.
         """
-        # Sanity check: Only create a new client if we do not already have one.
+        # Quick check: Only create a new client if we do not already have one.
         if self._operations_client is None:
             self._operations_client = operations_v1.OperationsAsyncClient(
                 self.grpc_channel
diff --git a/google/cloud/lifesciences_v2beta/types/workflows.py b/google/cloud/lifesciences_v2beta/types/workflows.py
@@ -437,8 +437,7 @@ class VirtualMachine(proto.Message):
             a significant impact.
             For more information about the effect of this
             parameter, see
-            https://cloud.google.com/compute/docs/instances/specify-
-            min-cpu-platform.
+            https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform.
         boot_image (str):
             The host operating system image to use.
 
@@ -512,8 +511,8 @@ class ServiceAccount(proto.Message):
             account for the project will be used.
         scopes (Sequence[str]):
             List of scopes to be enabled for this service
-            account on the VM, in addition to the cloud-
-            platform API scope that will be added by
+            account on the VM, in addition to the
+            cloud-platform API scope that will be added by
             default.
     """
 
@@ -562,8 +561,9 @@ class Network(proto.Message):
             address, additional configuration is required to
             allow the VM to access Google services.
 
-            See https://cloud.google.com/vpc/docs/configure-
-            private-google-access for more information.
+            See
+            https://cloud.google.com/vpc/docs/configure-private-google-access
+            for more information.
         subnetwork (str):
             If the specified network is configured for custom subnet
             creation, the name of the subnetwork to attach the instance
diff --git a/tests/unit/gapic/lifesciences_v2beta/test_workflows_service_v2_beta.py b/tests/unit/gapic/lifesciences_v2beta/test_workflows_service_v2_beta.py
@@ -29,6 +29,7 @@
 from google.api_core import gapic_v1
 from google.api_core import grpc_helpers
 from google.api_core import grpc_helpers_async
+from google.api_core import operation
 from google.api_core import operation_async  # type: ignore
 from google.api_core import operations_v1
 from google.api_core import path_template
@@ -539,25 +540,28 @@ def test_workflows_service_v2_beta_client_client_options_scopes(
 
 
 @pytest.mark.parametrize(
-    "client_class,transport_class,transport_name",
+    "client_class,transport_class,transport_name,grpc_helpers",
     [
         (
             WorkflowsServiceV2BetaClient,
             transports.WorkflowsServiceV2BetaGrpcTransport,
             "grpc",
+            grpc_helpers,
         ),
         (
             WorkflowsServiceV2BetaAsyncClient,
             transports.WorkflowsServiceV2BetaGrpcAsyncIOTransport,
             "grpc_asyncio",
+            grpc_helpers_async,
         ),
     ],
 )
 def test_workflows_service_v2_beta_client_client_options_credentials_file(
-    client_class, transport_class, transport_name
+    client_class, transport_class, transport_name, grpc_helpers
 ):
     # Check the case credentials file is provided.
     options = client_options.ClientOptions(credentials_file="credentials.json")
+
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
         client = client_class(client_options=options, transport=transport_name)
@@ -593,6 +597,72 @@ def test_workflows_service_v2_beta_client_client_options_from_dict():
         )
 
 
+@pytest.mark.parametrize(
+    "client_class,transport_class,transport_name,grpc_helpers",
+    [
+        (
+            WorkflowsServiceV2BetaClient,
+            transports.WorkflowsServiceV2BetaGrpcTransport,
+            "grpc",
+            grpc_helpers,
+        ),
+        (
+            WorkflowsServiceV2BetaAsyncClient,
+            transports.WorkflowsServiceV2BetaGrpcAsyncIOTransport,
+            "grpc_asyncio",
+            grpc_helpers_async,
+        ),
+    ],
+)
+def test_workflows_service_v2_beta_client_create_channel_credentials_file(
+    client_class, transport_class, transport_name, grpc_helpers
+):
+    # Check the case credentials file is provided.
+    options = client_options.ClientOptions(credentials_file="credentials.json")
+
+    with mock.patch.object(transport_class, "__init__") as patched:
+        patched.return_value = None
+        client = client_class(client_options=options, transport=transport_name)
+        patched.assert_called_once_with(
+            credentials=None,
+            credentials_file="credentials.json",
+            host=client.DEFAULT_ENDPOINT,
+            scopes=None,
+            client_cert_source_for_mtls=None,
+            quota_project_id=None,
+            client_info=transports.base.DEFAULT_CLIENT_INFO,
+            always_use_jwt_access=True,
+        )
+
+    # test that the credentials from file are saved and used as the credentials.
+    with mock.patch.object(
+        google.auth, "load_credentials_from_file", autospec=True
+    ) as load_creds, mock.patch.object(
+        google.auth, "default", autospec=True
+    ) as adc, mock.patch.object(
+        grpc_helpers, "create_channel"
+    ) as create_channel:
+        creds = ga_credentials.AnonymousCredentials()
+        file_creds = ga_credentials.AnonymousCredentials()
+        load_creds.return_value = (file_creds, None)
+        adc.return_value = (creds, None)
+        client = client_class(client_options=options, transport=transport_name)
+        create_channel.assert_called_with(
+            "lifesciences.googleapis.com:443",
+            credentials=file_creds,
+            credentials_file=None,
+            quota_project_id=None,
+            default_scopes=("https://www.googleapis.com/auth/cloud-platform",),
+            scopes=None,
+            default_host="lifesciences.googleapis.com",
+            ssl_credentials=None,
+            options=[
+                ("grpc.max_send_message_length", -1),
+                ("grpc.max_receive_message_length", -1),
+            ],
+        )
+
+
 @pytest.mark.parametrize("request_type", [workflows.RunPipelineRequest, dict,])
 def test_run_pipeline(request_type, transport: str = "grpc"):
     client = WorkflowsServiceV2BetaClient(
