chore: use gapic-generator-python 0.53.4 (#60)

- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9

Author: gcf-owl-bot[bot]

google/cloud/resourcesettings_v1/services/resource_settings_service/async_client.py

@@ -19,13 +19,15 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-import google.api_core.client_options as ClientOptions  # type: ignore
+from google.api_core.client_options import ClientOptions  # 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.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.cloud.resourcesettings_v1.services.resource_settings_service import pagers
 from google.cloud.resourcesettings_v1.types import resource_settings
 from .transports.base import ResourceSettingsServiceTransport, DEFAULT_CLIENT_INFO
@@ -181,18 +183,18 @@ def __init__(
 
     async def list_settings(
         self,
-        request: resource_settings.ListSettingsRequest = None,
+        request: Union[resource_settings.ListSettingsRequest, 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.ListSettingsAsyncPager:
         r"""Lists all the settings that are available on the Cloud resource
         ``parent``.
 
         Args:
-            request (:class:`google.cloud.resourcesettings_v1.types.ListSettingsRequest`):
+            request (Union[google.cloud.resourcesettings_v1.types.ListSettingsRequest, dict]):
                 The request object. The request for ListSettings.
             parent (:class:`str`):
                 Required. The Cloud resource that parents the setting.
@@ -275,10 +277,10 @@ async def list_settings(
 
     async def get_setting(
         self,
-        request: resource_settings.GetSettingRequest = None,
+        request: Union[resource_settings.GetSettingRequest, 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]] = (),
     ) -> resource_settings.Setting:
@@ -288,7 +290,7 @@ async def get_setting(
         ``google.rpc.Code.NOT_FOUND`` if the setting does not exist.
 
         Args:
-            request (:class:`google.cloud.resourcesettings_v1.types.GetSettingRequest`):
+            request (Union[google.cloud.resourcesettings_v1.types.GetSettingRequest, dict]):
                 The request object. The request for GetSetting.
             name (:class:`str`):
                 Required. The name of the setting to get. See
@@ -357,9 +359,9 @@ async def get_setting(
 
     async def update_setting(
         self,
-        request: resource_settings.UpdateSettingRequest = None,
+        request: Union[resource_settings.UpdateSettingRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> resource_settings.Setting:
@@ -381,7 +383,7 @@ async def update_setting(
         ``local_value`` field.
 
         Args:
-            request (:class:`google.cloud.resourcesettings_v1.types.UpdateSettingRequest`):
+            request (Union[google.cloud.resourcesettings_v1.types.UpdateSettingRequest, dict]):
                 The request object. The request for UpdateSetting.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.

google/cloud/resourcesettings_v1/services/resource_settings_service/client.py

@@ -30,6 +30,8 @@
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.cloud.resourcesettings_v1.services.resource_settings_service import pagers
 from google.cloud.resourcesettings_v1.types import resource_settings
 from .transports.base import ResourceSettingsServiceTransport, DEFAULT_CLIENT_INFO
@@ -366,7 +368,7 @@ def list_settings(
         request: Union[resource_settings.ListSettingsRequest, 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.ListSettingsPager:
@@ -450,7 +452,7 @@ def get_setting(
         request: Union[resource_settings.GetSettingRequest, 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]] = (),
     ) -> resource_settings.Setting:
@@ -521,7 +523,7 @@ def update_setting(
         self,
         request: Union[resource_settings.UpdateSettingRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> resource_settings.Setting:

google/cloud/resourcesettings_v1/services/resource_settings_service/transports/base.py

@@ -15,7 +15,6 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import packaging.version
 import pkg_resources
 
 import google.auth  # type: ignore
@@ -37,15 +36,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 ResourceSettingsServiceTransport(abc.ABC):
     """Abstract transport class for ResourceSettingsService."""
@@ -95,7 +85,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
@@ -128,29 +118,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/resourcesettings_v1/services/resource_settings_service/transports/grpc_asyncio.py

@@ -20,7 +20,6 @@
 from google.api_core import grpc_helpers_async  # type: ignore
 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/resourcesettings_v1/types/resource_settings.py

@@ -141,15 +141,26 @@ class DataType(proto.Enum):
 class Value(proto.Message):
     r"""The data in a setting value.
 
+    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:
         boolean_value (bool):
             Defines this value as being a boolean value.
+            This field is a member of `oneof`_ ``value``.
         string_value (str):
             Defines this value as being a string value.
+            This field is a member of `oneof`_ ``value``.
         string_set_value (google.cloud.resourcesettings_v1.types.Value.StringSet):
             Defines this value as being a StringSet.
+            This field is a member of `oneof`_ ``value``.
         enum_value (google.cloud.resourcesettings_v1.types.Value.EnumValue):
             Defines this value as being a Enum.
+            This field is a member of `oneof`_ ``value``.
     """
 
     class StringSet(proto.Message):

setup.py

@@ -44,7 +44,7 @@
         # NOTE: Maintainers, please do not require google-api-core>=2.x.x
         # Until this issue is closed
         # https://github.com/googleapis/google-cloud-python/issues/10566
-        "google-api-core[grpc] >= 1.26.0, <3.0.0dev",
+        "google-api-core[grpc] >= 1.28.0, <3.0.0dev",
         "proto-plus >= 1.15.0",
     ),
     python_requires=">=3.6",

testing/constraints-3.6.txt

@@ -2,10 +2,7 @@
 # are correct in setup.py
 # List all library dependencies and extras in this file.
 # Pin the version to the lower bound.
-
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.26.0
+google-api-core==1.28.0
 proto-plus==1.15.0
-packaging==14.3
-google-auth==1.24.0 # TODO: remove when google-auth=1.25.0 is transitively required through google-auth