fix: Allow Protobuf 5.x (#507)

* chore: Update gapic-generator-python to v1.17.1 PiperOrigin-RevId: 629071173 Source-Link: googleapis/googleapis@4afa392 Source-Link: googleapis/googleapis-gen@16dbbb4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTZkYmJiNGQwNDU3ZGI1ZTYxYWM5Zjk5YjBkNTJhNDYxNTQ0NTVhYyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Update gapic-generator-python to v1.18.0 PiperOrigin-RevId: 638650618 Source-Link: googleapis/googleapis@6330f03 Source-Link: googleapis/googleapis-gen@44fa4f1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDRmYTRmMTk3OWRjNDVjMTc3OGZkN2NhZjEzZjhlNjFjNmQxY2FlOCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat(spanner): Add support for Cloud Spanner Scheduled Backups PiperOrigin-RevId: 649277844 Source-Link: googleapis/googleapis@fd7efa2 Source-Link: googleapis/googleapis-gen@50be251 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * allow protobuf 5.x * update constraints --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>

Author: gcf-owl-bot[bot]

google/cloud/errorreporting_v1beta1/services/error_group_service/async_client.py

@@ -18,6 +18,7 @@
 import re
 from typing import (
  Dict,
+ Callable,
  Mapping,
  MutableMapping,
  MutableSequence,
@@ -37,6 +38,7 @@
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
 
+
 try:
  OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError: # pragma: NO COVER
@@ -195,7 +197,13 @@ def __init__(
  self,
  *,
  credentials: Optional[ga_credentials.Credentials] = None,
- transport: Union[str, ErrorGroupServiceTransport] = "grpc_asyncio",
+ transport: Optional[
+ Union[
+ str,
+ ErrorGroupServiceTransport,
+ Callable[..., ErrorGroupServiceTransport],
+ ]
+ ] = "grpc_asyncio",
  client_options: Optional[ClientOptions] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  ) -> None:
@@ -207,9 +215,11 @@ def __init__(
  credentials identify the application to the service; if none
  are specified, the client will attempt to ascertain the
  credentials from the environment.
- transport (Union[str, ~.ErrorGroupServiceTransport]): The
- transport to use. If set to None, a transport is chosen
- automatically.
+ transport (Optional[Union[str,ErrorGroupServiceTransport,Callable[..., ErrorGroupServiceTransport]]]):
+ The transport to use, or a Callable that constructs and returns a new transport to use.
+ If a Callable is given, it will be called with the same set of initialization
+ arguments as used in the ErrorGroupServiceTransport constructor.
+ If set to None, a transport is chosen automatically.
  client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]):
  Custom options for the client.
 
@@ -318,16 +328,19 @@ async def sample_get_group():
 
  """
  # Create or coerce a protobuf request object.
- # Quick check: If we got a request object, we should *not* have
- # gotten any keyword arguments that map to the request.
+ # - Quick check: If we got a request object, we should *not* have
+ #  gotten any keyword arguments that map to the request.
  has_flattened_params = any([group_name])
  if request is not None and has_flattened_params:
  raise ValueError(
  "If the `request` argument is set, then none of "
  "the individual field arguments should be set."
  )
 
- request = error_group_service.GetGroupRequest(request)
+ # - Use the request object if provided (there's no risk of modifying the input as
+ # there are no flattened fields), or create one.
+ if not isinstance(request, error_group_service.GetGroupRequest):
+ request = error_group_service.GetGroupRequest(request)
 
  # If we have keyword arguments corresponding to fields on the
  # request, apply these.
@@ -336,11 +349,9 @@ async def sample_get_group():
 
  # Wrap the RPC method; this adds retry and timeout information,
  # and friendly error handling.
- rpc = gapic_v1.method_async.wrap_method(
- self._client._transport.get_group,
- default_timeout=None,
- client_info=DEFAULT_CLIENT_INFO,
- )
+ rpc = self._client._transport._wrapped_methods[
+ self._client._transport.get_group
+ ]
 
  # Certain fields should be provided within the metadata header;
  # add these here.
@@ -425,16 +436,19 @@ async def sample_update_group():
 
  """
  # Create or coerce a protobuf request object.
- # Quick check: If we got a request object, we should *not* have
- # gotten any keyword arguments that map to the request.
+ # - Quick check: If we got a request object, we should *not* have
+ #  gotten any keyword arguments that map to the request.
  has_flattened_params = any([group])
  if request is not None and has_flattened_params:
  raise ValueError(
  "If the `request` argument is set, then none of "
  "the individual field arguments should be set."
  )
 
- request = error_group_service.UpdateGroupRequest(request)
+ # - Use the request object if provided (there's no risk of modifying the input as
+ # there are no flattened fields), or create one.
+ if not isinstance(request, error_group_service.UpdateGroupRequest):
+ request = error_group_service.UpdateGroupRequest(request)
 
  # If we have keyword arguments corresponding to fields on the
  # request, apply these.
@@ -443,11 +457,9 @@ async def sample_update_group():
 
  # Wrap the RPC method; this adds retry and timeout information,
  # and friendly error handling.
- rpc = gapic_v1.method_async.wrap_method(
- self._client._transport.update_group,
- default_timeout=None,
- client_info=DEFAULT_CLIENT_INFO,
- )
+ rpc = self._client._transport._wrapped_methods[
+ self._client._transport.update_group
+ ]
 
  # Certain fields should be provided within the metadata header;
  # add these here.

google/cloud/errorreporting_v1beta1/services/error_group_service/client.py

@@ -18,6 +18,7 @@
 import re
 from typing import (
  Dict,
+ Callable,
  Mapping,
  MutableMapping,
  MutableSequence,
@@ -523,7 +524,13 @@ def __init__(
  self,
  *,
  credentials: Optional[ga_credentials.Credentials] = None,
- transport: Optional[Union[str, ErrorGroupServiceTransport]] = None,
+ transport: Optional[
+ Union[
+ str,
+ ErrorGroupServiceTransport,
+ Callable[..., ErrorGroupServiceTransport],
+ ]
+ ] = None,
  client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  ) -> None:
@@ -535,9 +542,11 @@ def __init__(
  credentials identify the application to the service; if none
  are specified, the client will attempt to ascertain the
  credentials from the environment.
- transport (Union[str, ErrorGroupServiceTransport]): The
- transport to use. If set to None, a transport is chosen
- automatically.
+ transport (Optional[Union[str,ErrorGroupServiceTransport,Callable[..., ErrorGroupServiceTransport]]]):
+ The transport to use, or a Callable that constructs and returns a new transport.
+ If a Callable is given, it will be called with the same set of initialization
+ arguments as used in the ErrorGroupServiceTransport constructor.
+ If set to None, a transport is chosen automatically.
  client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]):
  Custom options for the client.
 
@@ -646,8 +655,16 @@ def __init__(
  api_key_value
  )
 
- Transport = type(self).get_transport_class(cast(str, transport))
- self._transport = Transport(
+ transport_init: Union[
+ Type[ErrorGroupServiceTransport],
+ Callable[..., ErrorGroupServiceTransport],
+ ] = (
+ type(self).get_transport_class(transport)
+ if isinstance(transport, str) or transport is None
+ else cast(Callable[..., ErrorGroupServiceTransport], transport)
+ )
+ # initialize with the provided callable or the passed in class
+ self._transport = transport_init(
  credentials=credentials,
  credentials_file=self._client_options.credentials_file,
  host=self._api_endpoint,
@@ -724,19 +741,17 @@ def sample_get_group():
 
  """
  # Create or coerce a protobuf request object.
- # Quick check: If we got a request object, we should *not* have
- # gotten any keyword arguments that map to the request.
+ # - Quick check: If we got a request object, we should *not* have
+ #  gotten any keyword arguments that map to the request.
  has_flattened_params = any([group_name])
  if request is not None and has_flattened_params:
  raise ValueError(
  "If the `request` argument is set, then none of "
  "the individual field arguments should be set."
  )
 
- # Minor optimization to avoid making a copy if the user passes
- # in a error_group_service.GetGroupRequest.
- # There's no risk of modifying the input as we've already verified
- # there are no flattened fields.
+ # - Use the request object if provided (there's no risk of modifying the input as
+ # there are no flattened fields), or create one.
  if not isinstance(request, error_group_service.GetGroupRequest):
  request = error_group_service.GetGroupRequest(request)
  # If we have keyword arguments corresponding to fields on the
@@ -831,19 +846,17 @@ def sample_update_group():
 
  """
  # Create or coerce a protobuf request object.
- # Quick check: If we got a request object, we should *not* have
- # gotten any keyword arguments that map to the request.
+ # - Quick check: If we got a request object, we should *not* have
+ #  gotten any keyword arguments that map to the request.
  has_flattened_params = any([group])
  if request is not None and has_flattened_params:
  raise ValueError(
  "If the `request` argument is set, then none of "
  "the individual field arguments should be set."
  )
 
- # Minor optimization to avoid making a copy if the user passes
- # in a error_group_service.UpdateGroupRequest.
- # There's no risk of modifying the input as we've already verified
- # there are no flattened fields.
+ # - Use the request object if provided (there's no risk of modifying the input as
+ # there are no flattened fields), or create one.
  if not isinstance(request, error_group_service.UpdateGroupRequest):
  request = error_group_service.UpdateGroupRequest(request)
  # If we have keyword arguments corresponding to fields on the

google/cloud/errorreporting_v1beta1/services/error_group_service/transports/base.py

@@ -83,6 +83,8 @@ def __init__(
 
  # Save the scopes.
  self._scopes = scopes
+ if not hasattr(self, "_ignore_credentials"):
+ self._ignore_credentials: bool = False
 
  # If no credentials are provided, then determine the appropriate
  # defaults.
@@ -95,7 +97,7 @@ def __init__(
  credentials, _ = google.auth.load_credentials_from_file(
  credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
  )
- elif credentials is None:
+ elif credentials is None and not self._ignore_credentials:
  credentials, _ = google.auth.default(
  **scopes_kwargs, quota_project_id=quota_project_id
  )

google/cloud/errorreporting_v1beta1/services/error_group_service/transports/grpc.py

@@ -51,7 +51,7 @@ def __init__(
  credentials: Optional[ga_credentials.Credentials] = None,
  credentials_file: Optional[str] = None,
  scopes: Optional[Sequence[str]] = None,
- channel: Optional[grpc.Channel] = None,
+ channel: Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]] = None,
  api_mtls_endpoint: Optional[str] = None,
  client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None,
  ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None,
@@ -71,14 +71,17 @@ def __init__(
  credentials identify the application to the service; if none
  are specified, the client will attempt to ascertain the
  credentials from the environment.
- This argument is ignored if ``channel`` is provided.
+ This argument is ignored if a ``channel`` instance is provided.
  credentials_file (Optional[str]): A file with credentials that can
  be loaded with :func:`google.auth.load_credentials_from_file`.
- This argument is ignored if ``channel`` is provided.
+ This argument is ignored if a ``channel`` instance is provided.
  scopes (Optional(Sequence[str])): A list of scopes. This argument is
- ignored if ``channel`` is provided.
- channel (Optional[grpc.Channel]): A ``Channel`` instance through
- which to make calls.
+ ignored if a ``channel`` instance is provided.
+ channel (Optional[Union[grpc.Channel, Callable[..., grpc.Channel]]]):
+ A ``Channel`` instance through which to make calls, or a Callable
+ that constructs and returns one. If set to None, ``self.create_channel``
+ is used to create the channel. If a Callable is given, it will be called
+ with the same arguments as used in ``self.create_channel``.
  api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint.
  If provided, it overrides the ``host`` argument and tries to create
  a mutual TLS channel with client SSL credentials from
@@ -88,11 +91,11 @@ def __init__(
  private key bytes, both in PEM format. It is ignored if
  ``api_mtls_endpoint`` is None.
  ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials
- for the grpc channel. It is ignored if ``channel`` is provided.
+ for the grpc channel. It is ignored if a ``channel`` instance is provided.
  client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]):
  A callback to provide client certificate bytes and private key bytes,
  both in PEM format. It is used to configure a mutual TLS channel. It is
- ignored if ``channel`` or ``ssl_channel_credentials`` is provided.
+ ignored if a ``channel`` instance or ``ssl_channel_credentials`` is provided.
  quota_project_id (Optional[str]): An optional project to use for billing
  and quota.
  client_info (google.api_core.gapic_v1.client_info.ClientInfo):
@@ -118,9 +121,10 @@ def __init__(
  if client_cert_source:
  warnings.warn("client_cert_source is deprecated", DeprecationWarning)
 
- if channel:
+ if isinstance(channel, grpc.Channel):
  # Ignore credentials if a channel was passed.
- credentials = False
+ credentials = None
+ self._ignore_credentials = True
  # If a channel was explicitly provided, set it.
  self._grpc_channel = channel
  self._ssl_channel_credentials = None
@@ -159,7 +163,9 @@ def __init__(
  )
 
  if not self._grpc_channel:
- self._grpc_channel = type(self).create_channel(
+ # initialize with the provided callable or the default channel
+ channel_init = channel or type(self).create_channel
+ self._grpc_channel = channel_init(
  self._host,
  # use the credentials which are saved
  credentials=self._credentials,