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

- [ ] 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: googleapis/googleapis-gen@2ff001f
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_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.api import httpbody_pb2  # type: ignore
 from google.protobuf import any_pb2  # type: ignore
 from .transports.base import GatewayServiceTransport, DEFAULT_CLIENT_INFO
@@ -167,17 +169,17 @@ def __init__(
 
     async def get_resource(
         self,
-        request: httpbody_pb2.HttpBody = None,
+        request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
         r"""GetResource performs an HTTP GET request on the
         Kubernetes API Server.
 
         Args:
-            request (:class:`google.api.httpbody_pb2.HttpBody`):
+            request (Union[google.api.httpbody_pb2.HttpBody, dict]):
                 The request object. Message that represents an arbitrary
                 HTTP body. It should only be used for payload formats
                 that can't be represented as JSON, such as raw binary or
@@ -301,17 +303,17 @@ async def get_resource(
 
     async def post_resource(
         self,
-        request: httpbody_pb2.HttpBody = None,
+        request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
         r"""PostResource performs an HTTP POST on the Kubernetes
         API Server.
 
         Args:
-            request (:class:`google.api.httpbody_pb2.HttpBody`):
+            request (Union[google.api.httpbody_pb2.HttpBody, dict]):
                 The request object. Message that represents an arbitrary
                 HTTP body. It should only be used for payload formats
                 that can't be represented as JSON, such as raw binary or
@@ -435,17 +437,17 @@ async def post_resource(
 
     async def delete_resource(
         self,
-        request: httpbody_pb2.HttpBody = None,
+        request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
         r"""DeleteResource performs an HTTP DELETE on the
         Kubernetes API Server.
 
         Args:
-            request (:class:`google.api.httpbody_pb2.HttpBody`):
+            request (Union[google.api.httpbody_pb2.HttpBody, dict]):
                 The request object. Message that represents an arbitrary
                 HTTP body. It should only be used for payload formats
                 that can't be represented as JSON, such as raw binary or
@@ -569,17 +571,17 @@ async def delete_resource(
 
     async def put_resource(
         self,
-        request: httpbody_pb2.HttpBody = None,
+        request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
         r"""PutResource performs an HTTP PUT on the Kubernetes
         API Server.
 
         Args:
-            request (:class:`google.api.httpbody_pb2.HttpBody`):
+            request (Union[google.api.httpbody_pb2.HttpBody, dict]):
                 The request object. Message that represents an arbitrary
                 HTTP body. It should only be used for payload formats
                 that can't be represented as JSON, such as raw binary or
@@ -703,17 +705,17 @@ async def put_resource(
 
     async def patch_resource(
         self,
-        request: httpbody_pb2.HttpBody = None,
+        request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
         r"""PatchResource performs an HTTP PATCH on the
         Kubernetes API Server.
 
         Args:
-            request (:class:`google.api.httpbody_pb2.HttpBody`):
+            request (Union[google.api.httpbody_pb2.HttpBody, dict]):
                 The request object. Message that represents an arbitrary
                 HTTP body. It should only be used for payload formats
                 that can't be represented as JSON, such as raw binary or

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_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.api import httpbody_pb2  # type: ignore
 from google.protobuf import any_pb2  # type: ignore
 from .transports.base import GatewayServiceTransport, DEFAULT_CLIENT_INFO
@@ -341,7 +343,7 @@ def get_resource(
         self,
         request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
@@ -474,7 +476,7 @@ def post_resource(
         self,
         request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
@@ -607,7 +609,7 @@ def delete_resource(
         self,
         request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
@@ -740,7 +742,7 @@ def put_resource(
         self,
         request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:
@@ -873,7 +875,7 @@ def patch_resource(
         self,
         request: Union[httpbody_pb2.HttpBody, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> httpbody_pb2.HttpBody:

google/cloud/gkeconnect/gateway_v1beta1/services/gateway_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 GatewayServiceTransport(abc.ABC):
     """Abstract transport class for GatewayService."""
@@ -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/gkeconnect/gateway_v1beta1/services/gateway_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

setup.py

@@ -29,9 +29,8 @@
     # 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",
-    "packaging >= 14.3",
 ]
 
 package_root = os.path.abspath(os.path.dirname(__file__))

testing/constraints-3.6.txt

@@ -4,7 +4,5 @@
 # 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 required through google-api-core