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

- [ ] 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

Author: gcf-owl-bot[bot]

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_service/async_client.py

@@ -224,8 +224,8 @@ async def get_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -358,8 +358,8 @@ async def post_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -492,8 +492,8 @@ async def delete_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -626,8 +626,8 @@ async def put_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -760,8 +760,8 @@ async def patch_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_service/client.py

@@ -407,8 +407,8 @@ def get_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -540,8 +540,8 @@ def post_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -673,8 +673,8 @@ def delete_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -806,8 +806,8 @@ def put_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is
@@ -939,8 +939,8 @@ def patch_resource(
  that can't be represented as JSON, such as raw binary or
  an HTML page.
 
- This message can be used both in streaming and non-
- streaming API methods in the request as well as the
+ This message can be used both in streaming and
+ non-streaming API methods in the request as well as the
  response.
 
  It can be used as a top-level request field, which is

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_service/transports/grpc.py

@@ -163,8 +163,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,

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_service/transports/grpc_asyncio.py

@@ -208,8 +208,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,

tests/unit/gapic/gateway_v1beta1/test_gateway_service.py

@@ -512,21 +512,28 @@ def test_gateway_service_client_client_options_scopes(
 
 
 @pytest.mark.parametrize(
- "client_class,transport_class,transport_name",
+ "client_class,transport_class,transport_name,grpc_helpers",
  [
- (GatewayServiceClient, transports.GatewayServiceGrpcTransport, "grpc"),
+ (
+ GatewayServiceClient,
+ transports.GatewayServiceGrpcTransport,
+ "grpc",
+ grpc_helpers,
+ ),
  (
  GatewayServiceAsyncClient,
  transports.GatewayServiceGrpcAsyncIOTransport,
  "grpc_asyncio",
+ grpc_helpers_async,
  ),
  ],
 )
 def test_gateway_service_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)
@@ -562,6 +569,72 @@ def test_gateway_service_client_client_options_from_dict():
  )
 
 
+@pytest.mark.parametrize(
+ "client_class,transport_class,transport_name,grpc_helpers",
+ [
+ (
+ GatewayServiceClient,
+ transports.GatewayServiceGrpcTransport,
+ "grpc",
+ grpc_helpers,
+ ),
+ (
+ GatewayServiceAsyncClient,
+ transports.GatewayServiceGrpcAsyncIOTransport,
+ "grpc_asyncio",
+ grpc_helpers_async,
+ ),
+ ],
+)
+def test_gateway_service_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(
+ "connectgateway.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="connectgateway.googleapis.com",
+ ssl_credentials=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
+ )
+
+
 @pytest.mark.parametrize("request_type", [httpbody_pb2.HttpBody, dict,])
 def test_get_resource(request_type, transport: str = "grpc"):
  client = GatewayServiceClient(