Skip to content

Commit aab3fd0

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#45)
- [ ] 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
1 parent 3e417f4 commit aab3fd0

8 files changed

Lines changed: 48 additions & 151 deletions

File tree

‎packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.api_core import operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.data_fusion_v1.services.data_fusion import pagers
@@ -165,18 +167,18 @@ def __init__(
165167

166168
async def list_available_versions(
167169
self,
168-
request: datafusion.ListAvailableVersionsRequest = None,
170+
request: Union[datafusion.ListAvailableVersionsRequest, dict] = None,
169171
*,
170172
parent: str = None,
171-
retry: retries.Retry = gapic_v1.method.DEFAULT,
173+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
172174
timeout: float = None,
173175
metadata: Sequence[Tuple[str, str]] = (),
174176
) -> pagers.ListAvailableVersionsAsyncPager:
175177
r"""Lists possible versions for Data Fusion instances in
176178
the specified project and location.
177179
178180
Args:
179-
request (:class:`google.cloud.data_fusion_v1.types.ListAvailableVersionsRequest`):
181+
request (Union[google.cloud.data_fusion_v1.types.ListAvailableVersionsRequest, dict]):
180182
The request object. Request message for the list
181183
available versions request.
182184
parent (:class:`str`):
@@ -248,17 +250,17 @@ async def list_available_versions(
248250

249251
async def list_instances(
250252
self,
251-
request: datafusion.ListInstancesRequest = None,
253+
request: Union[datafusion.ListInstancesRequest, dict] = None,
252254
*,
253-
retry: retries.Retry = gapic_v1.method.DEFAULT,
255+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
254256
timeout: float = None,
255257
metadata: Sequence[Tuple[str, str]] = (),
256258
) -> pagers.ListInstancesAsyncPager:
257259
r"""Lists Data Fusion instances in the specified project
258260
and location.
259261
260262
Args:
261-
request (:class:`google.cloud.data_fusion_v1.types.ListInstancesRequest`):
263+
request (Union[google.cloud.data_fusion_v1.types.ListInstancesRequest, dict]):
262264
The request object. Request message for listing Data
263265
Fusion instances.
264266
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -307,16 +309,16 @@ async def list_instances(
307309

308310
async def get_instance(
309311
self,
310-
request: datafusion.GetInstanceRequest = None,
312+
request: Union[datafusion.GetInstanceRequest, dict] = None,
311313
*,
312-
retry: retries.Retry = gapic_v1.method.DEFAULT,
314+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
313315
timeout: float = None,
314316
metadata: Sequence[Tuple[str, str]] = (),
315317
) -> datafusion.Instance:
316318
r"""Gets details of a single Data Fusion instance.
317319
318320
Args:
319-
request (:class:`google.cloud.data_fusion_v1.types.GetInstanceRequest`):
321+
request (Union[google.cloud.data_fusion_v1.types.GetInstanceRequest, dict]):
320322
The request object. Request message for getting details
321323
about a Data Fusion instance.
322324
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -354,20 +356,20 @@ async def get_instance(
354356

355357
async def create_instance(
356358
self,
357-
request: datafusion.CreateInstanceRequest = None,
359+
request: Union[datafusion.CreateInstanceRequest, dict] = None,
358360
*,
359361
parent: str = None,
360362
instance: datafusion.Instance = None,
361363
instance_id: str = None,
362-
retry: retries.Retry = gapic_v1.method.DEFAULT,
364+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
363365
timeout: float = None,
364366
metadata: Sequence[Tuple[str, str]] = (),
365367
) -> operation_async.AsyncOperation:
366368
r"""Creates a new Data Fusion instance in the specified
367369
project and location.
368370
369371
Args:
370-
request (:class:`google.cloud.data_fusion_v1.types.CreateInstanceRequest`):
372+
request (Union[google.cloud.data_fusion_v1.types.CreateInstanceRequest, dict]):
371373
The request object. Request message for creating a Data
372374
Fusion instance.
373375
parent (:class:`str`):
@@ -454,17 +456,17 @@ async def create_instance(
454456

455457
async def delete_instance(
456458
self,
457-
request: datafusion.DeleteInstanceRequest = None,
459+
request: Union[datafusion.DeleteInstanceRequest, dict] = None,
458460
*,
459461
name: str = None,
460-
retry: retries.Retry = gapic_v1.method.DEFAULT,
462+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
461463
timeout: float = None,
462464
metadata: Sequence[Tuple[str, str]] = (),
463465
) -> operation_async.AsyncOperation:
464466
r"""Deletes a single Date Fusion instance.
465467
466468
Args:
467-
request (:class:`google.cloud.data_fusion_v1.types.DeleteInstanceRequest`):
469+
request (Union[google.cloud.data_fusion_v1.types.DeleteInstanceRequest, dict]):
468470
The request object. Request message for deleting a Data
469471
Fusion instance.
470472
name (:class:`str`):
@@ -547,18 +549,18 @@ async def delete_instance(
547549

548550
async def update_instance(
549551
self,
550-
request: datafusion.UpdateInstanceRequest = None,
552+
request: Union[datafusion.UpdateInstanceRequest, dict] = None,
551553
*,
552554
instance: datafusion.Instance = None,
553555
update_mask: field_mask_pb2.FieldMask = None,
554-
retry: retries.Retry = gapic_v1.method.DEFAULT,
556+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
555557
timeout: float = None,
556558
metadata: Sequence[Tuple[str, str]] = (),
557559
) -> operation_async.AsyncOperation:
558560
r"""Updates a single Data Fusion instance.
559561
560562
Args:
561-
request (:class:`google.cloud.data_fusion_v1.types.UpdateInstanceRequest`):
563+
request (Union[google.cloud.data_fusion_v1.types.UpdateInstanceRequest, dict]):
562564
The request object.
563565
instance (:class:`google.cloud.data_fusion_v1.types.Instance`):
564566
The instance resource that replaces
@@ -649,17 +651,17 @@ async def update_instance(
649651

650652
async def restart_instance(
651653
self,
652-
request: datafusion.RestartInstanceRequest = None,
654+
request: Union[datafusion.RestartInstanceRequest, dict] = None,
653655
*,
654-
retry: retries.Retry = gapic_v1.method.DEFAULT,
656+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
655657
timeout: float = None,
656658
metadata: Sequence[Tuple[str, str]] = (),
657659
) -> operation_async.AsyncOperation:
658660
r"""Restart a single Data Fusion instance.
659661
At the end of an operation instance is fully restarted.
660662
661663
Args:
662-
request (:class:`google.cloud.data_fusion_v1.types.RestartInstanceRequest`):
664+
request (Union[google.cloud.data_fusion_v1.types.RestartInstanceRequest, dict]):
663665
The request object. Request message for restarting a
664666
Data Fusion instance.
665667
retry (google.api_core.retry.Retry): Designation of what errors, if any,

‎packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.data_fusion_v1.services.data_fusion import pagers
@@ -358,7 +360,7 @@ def list_available_versions(
358360
request: Union[datafusion.ListAvailableVersionsRequest, dict] = None,
359361
*,
360362
parent: str = None,
361-
retry: retries.Retry = gapic_v1.method.DEFAULT,
363+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
362364
timeout: float = None,
363365
metadata: Sequence[Tuple[str, str]] = (),
364366
) -> pagers.ListAvailableVersionsPager:
@@ -440,7 +442,7 @@ def list_instances(
440442
self,
441443
request: Union[datafusion.ListInstancesRequest, dict] = None,
442444
*,
443-
retry: retries.Retry = gapic_v1.method.DEFAULT,
445+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
444446
timeout: float = None,
445447
metadata: Sequence[Tuple[str, str]] = (),
446448
) -> pagers.ListInstancesPager:
@@ -500,7 +502,7 @@ def get_instance(
500502
self,
501503
request: Union[datafusion.GetInstanceRequest, dict] = None,
502504
*,
503-
retry: retries.Retry = gapic_v1.method.DEFAULT,
505+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
504506
timeout: float = None,
505507
metadata: Sequence[Tuple[str, str]] = (),
506508
) -> datafusion.Instance:
@@ -551,7 +553,7 @@ def create_instance(
551553
parent: str = None,
552554
instance: datafusion.Instance = None,
553555
instance_id: str = None,
554-
retry: retries.Retry = gapic_v1.method.DEFAULT,
556+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
555557
timeout: float = None,
556558
metadata: Sequence[Tuple[str, str]] = (),
557559
) -> operation.Operation:
@@ -649,7 +651,7 @@ def delete_instance(
649651
request: Union[datafusion.DeleteInstanceRequest, dict] = None,
650652
*,
651653
name: str = None,
652-
retry: retries.Retry = gapic_v1.method.DEFAULT,
654+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
653655
timeout: float = None,
654656
metadata: Sequence[Tuple[str, str]] = (),
655657
) -> operation.Operation:
@@ -743,7 +745,7 @@ def update_instance(
743745
*,
744746
instance: datafusion.Instance = None,
745747
update_mask: field_mask_pb2.FieldMask = None,
746-
retry: retries.Retry = gapic_v1.method.DEFAULT,
748+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
747749
timeout: float = None,
748750
metadata: Sequence[Tuple[str, str]] = (),
749751
) -> operation.Operation:
@@ -843,7 +845,7 @@ def restart_instance(
843845
self,
844846
request: Union[datafusion.RestartInstanceRequest, dict] = None,
845847
*,
846-
retry: retries.Retry = gapic_v1.method.DEFAULT,
848+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
847849
timeout: float = None,
848850
metadata: Sequence[Tuple[str, str]] = (),
849851
) -> operation.Operation:

‎packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -39,15 +38,6 @@
3938
except pkg_resources.DistributionNotFound:
4039
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4140

42-
try:
43-
# google.auth.__version__ was added in 1.26.0
44-
_GOOGLE_AUTH_VERSION = google.auth.__version__
45-
except AttributeError:
46-
try: # try pkg_resources if it is available
47-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
48-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
49-
_GOOGLE_AUTH_VERSION = None
50-
5141

5242
class DataFusionTransport(abc.ABC):
5343
"""Abstract transport class for DataFusion."""
@@ -97,7 +87,7 @@ def __init__(
9787
host += ":443"
9888
self._host = host
9989

100-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
90+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10191

10292
# Save the scopes.
10393
self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
130120
# Save the credentials.
131121
self._credentials = credentials
132122

133-
# TODO(busunkim): This method is in the base transport
134-
# to avoid duplicating code across the transport classes. These functions
135-
# should be deleted once the minimum required versions of google-auth is increased.
136-
137-
# TODO: Remove this function once google-auth >= 1.25.0 is required
138-
@classmethod
139-
def _get_scopes_kwargs(
140-
cls, host: str, scopes: Optional[Sequence[str]]
141-
) -> Dict[str, Optional[Sequence[str]]]:
142-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
143-
144-
scopes_kwargs = {}
145-
146-
if _GOOGLE_AUTH_VERSION and (
147-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
148-
>= packaging.version.parse("1.25.0")
149-
):
150-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
151-
else:
152-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
153-
154-
return scopes_kwargs
155-
156123
def _prep_wrapped_messages(self, client_info):
157124
# Precompute the wrapped methods.
158125
self._wrapped_methods = {
@@ -191,7 +158,7 @@ def close(self):
191158
raise NotImplementedError()
192159

193160
@property
194-
def operations_client(self) -> operations_v1.OperationsClient:
161+
def operations_client(self):
195162
"""Return the client designed to process long-running operations."""
196163
raise NotImplementedError()
197164

‎packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def __init__(
114114
self._grpc_channel = None
115115
self._ssl_channel_credentials = ssl_channel_credentials
116116
self._stubs: Dict[str, Callable] = {}
117-
self._operations_client = None
117+
self._operations_client: Optional[operations_v1.OperationsClient] = None
118118

119119
if api_mtls_endpoint:
120120
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -161,7 +160,7 @@ def __init__(
161160
self._grpc_channel = None
162161
self._ssl_channel_credentials = ssl_channel_credentials
163162
self._stubs: Dict[str, Callable] = {}
164-
self._operations_client = None
163+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
165164

166165
if api_mtls_endpoint:
167166
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎packages/google-cloud-data-fusion/setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
3030
# Until this issue is closed
3131
# https://github.com/googleapis/google-cloud-python/issues/10566
32-
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
32+
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
3333
"proto-plus >= 1.15.0",
34-
"packaging >= 14.3",
3534
]
3635

3736
package_root = os.path.abspath(os.path.dirname(__file__))

‎packages/google-cloud-data-fusion/testing/constraints-3.6.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# Pin the version to the lower bound.
55
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
66
# Then this file should have google-cloud-foo==1.14.0
7-
google-api-core==1.26.0
7+
google-api-core==1.28.0
88
proto-plus==1.15.0
9-
packaging==14.3
10-
google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 si transitively required through google-api-core

0 commit comments

Comments
 (0)