chore: use gapic-generator-python 0.58.4 (#227)

- [ ] Regenerate this pull request now. fix: provide appropriate mock values for message body fields committer: dovs PiperOrigin-RevId: 419025932 Source-Link: googleapis/googleapis@73da669 Source-Link: https://github.com/googleapis/googleapis-gen/commit/46df624a54b9ed47c1a7eefb7a49413cf7b82f98 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9 fix(deps): require google-api-core>=1.28.0 fix(deps): require proto-plus>=1.15.0 fix(deps): drop packaging dependency docs: list oneofs in docstring

Author: gcf-owl-bot[bot]

google/cloud/iot_v1/services/device_manager/async_client.py

@@ -14,22 +14,26 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-from distutils import util
 import os
 import re
 from typing import Dict, Optional, Sequence, Tuple, Type, Union
 import pkg_resources
 
-from google.api_core import client_options as client_options_lib # type: ignore
-from google.api_core import exceptions as core_exceptions # type: ignore
-from google.api_core import gapic_v1 # type: ignore
-from google.api_core import retry as retries # type: ignore
+from google.api_core import client_options as client_options_lib
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials # type: ignore
 from google.auth.transport import mtls # type: ignore
 from google.auth.transport.grpc import SslCredentials # type: ignore
 from google.auth.exceptions import MutualTLSChannelError # type: ignore
 from google.oauth2 import service_account # type: ignore
 
+try:
+ OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError: # pragma: NO COVER
+ OptionalRetry = Union[retries.Retry, object] # type: ignore
+
 from google.cloud.iot_v1.services.device_manager import pagers
 from google.cloud.iot_v1.types import device_manager
 from google.cloud.iot_v1.types import resources
@@ -303,8 +307,15 @@ def __init__(
  client_options = client_options_lib.ClientOptions()
 
  # Create SSL credentials for mutual TLS if needed.
- use_client_cert = bool(
- util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
+ if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
+ "true",
+ "false",
+ ):
+ raise ValueError(
+ "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
+ )
+ use_client_cert = (
+ os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
  )
 
  client_cert_source_func = None
@@ -375,7 +386,7 @@ def create_device_registry(
  *,
  parent: str = None,
  device_registry: resources.DeviceRegistry = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.DeviceRegistry:
@@ -455,7 +466,7 @@ def get_device_registry(
  request: Union[device_manager.GetDeviceRegistryRequest, dict] = None,
  *,
  name: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.DeviceRegistry:
@@ -524,7 +535,7 @@ def update_device_registry(
  *,
  device_registry: resources.DeviceRegistry = None,
  update_mask: field_mask_pb2.FieldMask = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.DeviceRegistry:
@@ -609,7 +620,7 @@ def delete_device_registry(
  request: Union[device_manager.DeleteDeviceRegistryRequest, dict] = None,
  *,
  name: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> None:
@@ -672,7 +683,7 @@ def list_device_registries(
  request: Union[device_manager.ListDeviceRegistriesRequest, dict] = None,
  *,
  parent: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListDeviceRegistriesPager:
@@ -752,7 +763,7 @@ def create_device(
  *,
  parent: str = None,
  device: resources.Device = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.Device:
@@ -832,7 +843,7 @@ def get_device(
  request: Union[device_manager.GetDeviceRequest, dict] = None,
  *,
  name: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.Device:
@@ -903,7 +914,7 @@ def update_device(
  *,
  device: resources.Device = None,
  update_mask: field_mask_pb2.FieldMask = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.Device:
@@ -988,7 +999,7 @@ def delete_device(
  request: Union[device_manager.DeleteDeviceRequest, dict] = None,
  *,
  name: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> None:
@@ -1053,7 +1064,7 @@ def list_devices(
  request: Union[device_manager.ListDevicesRequest, dict] = None,
  *,
  parent: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListDevicesPager:
@@ -1133,7 +1144,7 @@ def modify_cloud_to_device_config(
  *,
  name: str = None,
  binary_data: bytes = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> resources.DeviceConfig:
@@ -1219,7 +1230,7 @@ def list_device_config_versions(
  request: Union[device_manager.ListDeviceConfigVersionsRequest, dict] = None,
  *,
  name: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> device_manager.ListDeviceConfigVersionsResponse:
@@ -1293,7 +1304,7 @@ def list_device_states(
  request: Union[device_manager.ListDeviceStatesRequest, dict] = None,
  *,
  name: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> device_manager.ListDeviceStatesResponse:
@@ -1364,7 +1375,7 @@ def set_iam_policy(
  request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
  *,
  resource: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> policy_pb2.Policy:
@@ -1490,7 +1501,7 @@ def get_iam_policy(
  request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
  *,
  resource: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> policy_pb2.Policy:
@@ -1618,7 +1629,7 @@ def test_iam_permissions(
  *,
  resource: str = None,
  permissions: Sequence[str] = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> iam_policy_pb2.TestIamPermissionsResponse:
@@ -1703,7 +1714,7 @@ def send_command_to_device(
  name: str = None,
  binary_data: bytes = None,
  subfolder: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> device_manager.SendCommandToDeviceResponse:
@@ -1817,7 +1828,7 @@ def bind_device_to_gateway(
  parent: str = None,
  gateway_id: str = None,
  device_id: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> device_manager.BindDeviceToGatewayResponse:
@@ -1906,7 +1917,7 @@ def unbind_device_from_gateway(
  parent: str = None,
  gateway_id: str = None,
  device_id: str = None,
- retry: retries.Retry = gapic_v1.method.DEFAULT,
+ retry: OptionalRetry = gapic_v1.method.DEFAULT,
  timeout: float = None,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> device_manager.UnbindDeviceFromGatewayResponse:

google/cloud/iot_v1/services/device_manager/client.py

@@ -15,14 +15,13 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import packaging.version
 import pkg_resources
 
 import google.auth # type: ignore
-import google.api_core # type: ignore
-from google.api_core import exceptions as core_exceptions # type: ignore
-from google.api_core import gapic_v1 # type: ignore
-from google.api_core import retry as retries # type: ignore
+import google.api_core
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
 
@@ -39,15 +38,6 @@
 except pkg_resources.DistributionNotFound:
  DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
 
-try:
- # google.auth.__version__ was added in 1.26.0
- _GOOGLE_AUTH_VERSION = google.auth.__version__
-except AttributeError:
- try: # try pkg_resources if it is available
- _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
- except pkg_resources.DistributionNotFound: # pragma: NO COVER
- _GOOGLE_AUTH_VERSION = None
-
 
 class DeviceManagerTransport(abc.ABC):
  """Abstract transport class for DeviceManager."""
@@ -100,7 +90,7 @@ def __init__(
  host += ":443"
  self._host = host
 
- scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
+ scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
  # Save the scopes.
  self._scopes = scopes
@@ -116,7 +106,6 @@ def __init__(
  credentials, _ = google.auth.load_credentials_from_file(
  credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
  )
-
  elif credentials is None:
  credentials, _ = google.auth.default(
  **scopes_kwargs, quota_project_id=quota_project_id
@@ -133,29 +122,6 @@ def __init__(
  # Save the credentials.
  self._credentials = credentials
 
- # TODO(busunkim): This method is in the base transport
- # to avoid duplicating code across the transport classes. These functions
- # should be deleted once the minimum required versions of google-auth is increased.
-
- # TODO: Remove this function once google-auth >= 1.25.0 is required
- @classmethod
- def _get_scopes_kwargs(
- cls, host: str, scopes: Optional[Sequence[str]]
- ) -> Dict[str, Optional[Sequence[str]]]:
- """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
-
- scopes_kwargs = {}
-
- if _GOOGLE_AUTH_VERSION and (
- packaging.version.parse(_GOOGLE_AUTH_VERSION)
- >= packaging.version.parse("1.25.0")
- ):
- scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
- else:
- scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
-
- return scopes_kwargs
-
  def _prep_wrapped_messages(self, client_info):
  # Precompute the wrapped methods.
  self._wrapped_methods = {

google/cloud/iot_v1/services/device_manager/transports/base.py

@@ -16,8 +16,8 @@
 import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import grpc_helpers # type: ignore
-from google.api_core import gapic_v1 # type: ignore
+from google.api_core import grpc_helpers
+from google.api_core import gapic_v1
 import google.auth # type: ignore
 from google.auth import credentials as ga_credentials # type: ignore
 from google.auth.transport.grpc import SslCredentials # type: ignore

google/cloud/iot_v1/services/device_manager/transports/grpc.py

@@ -16,11 +16,10 @@
 import warnings
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import gapic_v1 # type: ignore
-from google.api_core import grpc_helpers_async # type: ignore
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers_async
 from google.auth import credentials as ga_credentials # type: ignore
 from google.auth.transport.grpc import SslCredentials # type: ignore
-import packaging.version
 
 import grpc # type: ignore
 from grpc.experimental import aio # type: ignore

google/cloud/iot_v1/services/device_manager/transports/grpc_asyncio.py

@@ -292,24 +292,37 @@ class GatewayListOptions(proto.Message):
  r"""Options for limiting the list based on gateway type and
  associations.
 
+ This message has `oneof`_ fields (mutually exclusive fields).
+ For each oneof, at most one member field can be set at the same time.
+ Setting any member of the oneof automatically clears all other
+ members.
+
+ .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
  Attributes:
  gateway_type (google.cloud.iot_v1.types.GatewayType):
  If ``GATEWAY`` is specified, only gateways are returned. If
  ``NON_GATEWAY`` is specified, only non-gateway devices are
  returned. If ``GATEWAY_TYPE_UNSPECIFIED`` is specified, all
  devices are returned.
+
+ This field is a member of `oneof`_ ``filter``.
  associations_gateway_id (str):
  If set, only devices associated with the specified gateway
  are returned. The gateway ID can be numeric (``num_id``) or
  the user-defined string (``id``). For example, if ``123`` is
  specified, only devices bound to the gateway with ``num_id``
  123 are returned.
+
+ This field is a member of `oneof`_ ``filter``.
  associations_device_id (str):
  If set, returns only the gateways with which the specified
  device is associated. The device ID can be numeric
  (``num_id``) or the user-defined string (``id``). For
  example, if ``456`` is specified, returns only the gateways
  to which the device with ``num_id`` 456 is bound.
+
+ This field is a member of `oneof`_ ``filter``.
  """
 
  gateway_type = proto.Field(

google/cloud/iot_v1/types/device_manager.py

@@ -418,10 +418,15 @@ class RegistryCredential(proto.Message):
  r"""A server-stored registry credential used to validate device
  credentials.
 
+
+ .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
  Attributes:
  public_key_certificate (google.cloud.iot_v1.types.PublicKeyCertificate):
  A public key certificate used to verify the
  device credentials.
+
+ This field is a member of `oneof`_ ``credential``.
  """
 
  public_key_certificate = proto.Field(
@@ -480,6 +485,8 @@ class PublicKeyCertificate(proto.Message):
 class DeviceCredential(proto.Message):
  r"""A server-stored device credential used for authentication.
 
+ .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
  Attributes:
  public_key (google.cloud.iot_v1.types.PublicKeyCredential):
  A public key used to verify the signature of
@@ -498,6 +505,8 @@ class DeviceCredential(proto.Message):
  keys will be accepted. New device credentials
  must be different from every registry-level
  certificate.
+
+ This field is a member of `oneof`_ ``credential``.
  expiration_time (google.protobuf.timestamp_pb2.Timestamp):
  [Optional] The time at which this credential becomes
  invalid. This credential will be ignored for new client