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

- [ ] 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/storage_transfer_v1/services/storage_transfer_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_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.storage_transfer_v1.services.storage_transfer_service import pagers
@@ -172,9 +174,9 @@ def __init__(
 
     async def get_google_service_account(
         self,
-        request: transfer.GetGoogleServiceAccountRequest = None,
+        request: Union[transfer.GetGoogleServiceAccountRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.GoogleServiceAccount:
@@ -190,7 +192,7 @@ async def get_google_service_account(
         Service.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.GetGoogleServiceAccountRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.GetGoogleServiceAccountRequest, dict]):
                 The request object. Request passed to
                 GetGoogleServiceAccount.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -222,16 +224,16 @@ async def get_google_service_account(
 
     async def create_transfer_job(
         self,
-        request: transfer.CreateTransferJobRequest = None,
+        request: Union[transfer.CreateTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.TransferJob:
         r"""Creates a transfer job that runs periodically.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.CreateTransferJobRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.CreateTransferJobRequest, dict]):
                 The request object. Request passed to CreateTransferJob.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -265,9 +267,9 @@ async def create_transfer_job(
 
     async def update_transfer_job(
         self,
-        request: transfer.UpdateTransferJobRequest = None,
+        request: Union[transfer.UpdateTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.TransferJob:
@@ -284,7 +286,7 @@ async def update_transfer_job(
         [ENABLED][google.storagetransfer.v1.TransferJob.Status.ENABLED]).
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.UpdateTransferJobRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.UpdateTransferJobRequest, dict]):
                 The request object. Request passed to UpdateTransferJob.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -324,16 +326,16 @@ async def update_transfer_job(
 
     async def get_transfer_job(
         self,
-        request: transfer.GetTransferJobRequest = None,
+        request: Union[transfer.GetTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.TransferJob:
         r"""Gets a transfer job.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.GetTransferJobRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.GetTransferJobRequest, dict]):
                 The request object. Request passed to GetTransferJob.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -373,16 +375,16 @@ async def get_transfer_job(
 
     async def list_transfer_jobs(
         self,
-        request: transfer.ListTransferJobsRequest = None,
+        request: Union[transfer.ListTransferJobsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListTransferJobsAsyncPager:
         r"""Lists transfer jobs.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.ListTransferJobsRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.ListTransferJobsRequest, dict]):
                 The request object. `projectId`, `jobNames`, and
                 `jobStatuses` are query parameters that can be specified
                 when listing transfer jobs.
@@ -425,16 +427,16 @@ async def list_transfer_jobs(
 
     async def pause_transfer_operation(
         self,
-        request: transfer.PauseTransferOperationRequest = None,
+        request: Union[transfer.PauseTransferOperationRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Pauses a transfer operation.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.PauseTransferOperationRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.PauseTransferOperationRequest, dict]):
                 The request object. Request passed to
                 PauseTransferOperation.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -467,16 +469,16 @@ async def pause_transfer_operation(
 
     async def resume_transfer_operation(
         self,
-        request: transfer.ResumeTransferOperationRequest = None,
+        request: Union[transfer.ResumeTransferOperationRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Resumes a transfer operation that is paused.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.ResumeTransferOperationRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.ResumeTransferOperationRequest, dict]):
                 The request object. Request passed to
                 ResumeTransferOperation.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -509,9 +511,9 @@ async def resume_transfer_operation(
 
     async def run_transfer_job(
         self,
-        request: transfer.RunTransferJobRequest = None,
+        request: Union[transfer.RunTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
@@ -521,7 +523,7 @@ async def run_transfer_job(
         a TransferOperation is active, an error wil be returned.
 
         Args:
-            request (:class:`google.cloud.storage_transfer_v1.types.RunTransferJobRequest`):
+            request (Union[google.cloud.storage_transfer_v1.types.RunTransferJobRequest, dict]):
                 The request object. Request passed to RunTransferJob.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.

google/cloud/storage_transfer_v1/services/storage_transfer_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_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.storage_transfer_v1.services.storage_transfer_service import pagers
@@ -345,7 +347,7 @@ def get_google_service_account(
         self,
         request: Union[transfer.GetGoogleServiceAccountRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.GoogleServiceAccount:
@@ -398,7 +400,7 @@ def create_transfer_job(
         self,
         request: Union[transfer.CreateTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.TransferJob:
@@ -442,7 +444,7 @@ def update_transfer_job(
         self,
         request: Union[transfer.UpdateTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.TransferJob:
@@ -502,7 +504,7 @@ def get_transfer_job(
         self,
         request: Union[transfer.GetTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> transfer_types.TransferJob:
@@ -552,7 +554,7 @@ def list_transfer_jobs(
         self,
         request: Union[transfer.ListTransferJobsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListTransferJobsPager:
@@ -605,7 +607,7 @@ def pause_transfer_operation(
         self,
         request: Union[transfer.PauseTransferOperationRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
@@ -648,7 +650,7 @@ def resume_transfer_operation(
         self,
         request: Union[transfer.ResumeTransferOperationRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
@@ -693,7 +695,7 @@ def run_transfer_job(
         self,
         request: Union[transfer.RunTransferJobRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:

google/cloud/storage_transfer_v1/services/storage_transfer_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
@@ -41,15 +40,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 StorageTransferServiceTransport(abc.ABC):
     """Abstract transport class for StorageTransferService."""
@@ -99,7 +89,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
@@ -132,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 = {
@@ -200,7 +167,7 @@ def close(self):
         raise NotImplementedError()
 
     @property
-    def operations_client(self) -> operations_v1.OperationsClient:
+    def operations_client(self):
         """Return the client designed to process long-running operations."""
         raise NotImplementedError()
 

google/cloud/storage_transfer_v1/services/storage_transfer_service/transports/grpc.py

@@ -116,7 +116,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

google/cloud/storage_transfer_v1/services/storage_transfer_service/transports/grpc_asyncio.py

@@ -21,7 +21,6 @@
 from google.api_core import operations_v1  # 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
@@ -163,7 +162,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

google/cloud/storage_transfer_v1/types/transfer_types.py

@@ -448,17 +448,29 @@ class TransferOptions(proto.Message):
 class TransferSpec(proto.Message):
     r"""Configuration for running a transfer.
 
+    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:
         gcs_data_sink (google.cloud.storage_transfer_v1.types.GcsData):
             A Cloud Storage data sink.
+            This field is a member of `oneof`_ ``data_sink``.
         gcs_data_source (google.cloud.storage_transfer_v1.types.GcsData):
             A Cloud Storage data source.
+            This field is a member of `oneof`_ ``data_source``.
         aws_s3_data_source (google.cloud.storage_transfer_v1.types.AwsS3Data):
             An AWS S3 data source.
+            This field is a member of `oneof`_ ``data_source``.
         http_data_source (google.cloud.storage_transfer_v1.types.HttpData):
             An HTTP URL data source.
+            This field is a member of `oneof`_ ``data_source``.
         azure_blob_storage_data_source (google.cloud.storage_transfer_v1.types.AzureBlobStorageData):
             An Azure Blob Storage data source.
+            This field is a member of `oneof`_ ``data_source``.
         object_conditions (google.cloud.storage_transfer_v1.types.ObjectConditions):
             Only objects that satisfy these object
             conditions are included in the set of data

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.27.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__))