Skip to content
This repository was archived by the owner on Sep 5, 2023. It is now read-only.

Commit 2069ea6

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#132)
- [ ] 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
1 parent fd6477a commit 2069ea6

16 files changed

Lines changed: 122 additions & 315 deletions

File tree

‎google/cloud/redis_v1/services/cloud_redis/async_client.py‎

Lines changed: 30 additions & 28 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.redis_v1.services.cloud_redis import pagers
@@ -183,10 +185,10 @@ def __init__(
183185

184186
async def list_instances(
185187
self,
186-
request: cloud_redis.ListInstancesRequest = None,
188+
request: Union[cloud_redis.ListInstancesRequest, dict] = None,
187189
*,
188190
parent: str = None,
189-
retry: retries.Retry = gapic_v1.method.DEFAULT,
191+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
190192
timeout: float = None,
191193
metadata: Sequence[Tuple[str, str]] = (),
192194
) -> pagers.ListInstancesAsyncPager:
@@ -202,7 +204,7 @@ async def list_instances(
202204
are aggregated.
203205
204206
Args:
205-
request (:class:`google.cloud.redis_v1.types.ListInstancesRequest`):
207+
request (Union[google.cloud.redis_v1.types.ListInstancesRequest, dict]):
206208
The request object. Request for
207209
[ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances].
208210
parent (:class:`str`):
@@ -274,17 +276,17 @@ async def list_instances(
274276

275277
async def get_instance(
276278
self,
277-
request: cloud_redis.GetInstanceRequest = None,
279+
request: Union[cloud_redis.GetInstanceRequest, dict] = None,
278280
*,
279281
name: str = None,
280-
retry: retries.Retry = gapic_v1.method.DEFAULT,
282+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
281283
timeout: float = None,
282284
metadata: Sequence[Tuple[str, str]] = (),
283285
) -> cloud_redis.Instance:
284286
r"""Gets the details of a specific Redis instance.
285287
286288
Args:
287-
request (:class:`google.cloud.redis_v1.types.GetInstanceRequest`):
289+
request (Union[google.cloud.redis_v1.types.GetInstanceRequest, dict]):
288290
The request object. Request for
289291
[GetInstance][google.cloud.redis.v1.CloudRedis.GetInstance].
290292
name (:class:`str`):
@@ -344,12 +346,12 @@ async def get_instance(
344346

345347
async def create_instance(
346348
self,
347-
request: cloud_redis.CreateInstanceRequest = None,
349+
request: Union[cloud_redis.CreateInstanceRequest, dict] = None,
348350
*,
349351
parent: str = None,
350352
instance_id: str = None,
351353
instance: cloud_redis.Instance = None,
352-
retry: retries.Retry = gapic_v1.method.DEFAULT,
354+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
353355
timeout: float = None,
354356
metadata: Sequence[Tuple[str, str]] = (),
355357
) -> operation_async.AsyncOperation:
@@ -369,7 +371,7 @@ async def create_instance(
369371
hours, so there is no need to call DeleteOperation.
370372
371373
Args:
372-
request (:class:`google.cloud.redis_v1.types.CreateInstanceRequest`):
374+
request (Union[google.cloud.redis_v1.types.CreateInstanceRequest, dict]):
373375
The request object. Request for
374376
[CreateInstance][google.cloud.redis.v1.CloudRedis.CreateInstance].
375377
parent (:class:`str`):
@@ -466,11 +468,11 @@ async def create_instance(
466468

467469
async def update_instance(
468470
self,
469-
request: cloud_redis.UpdateInstanceRequest = None,
471+
request: Union[cloud_redis.UpdateInstanceRequest, dict] = None,
470472
*,
471473
update_mask: field_mask_pb2.FieldMask = None,
472474
instance: cloud_redis.Instance = None,
473-
retry: retries.Retry = gapic_v1.method.DEFAULT,
475+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
474476
timeout: float = None,
475477
metadata: Sequence[Tuple[str, str]] = (),
476478
) -> operation_async.AsyncOperation:
@@ -482,7 +484,7 @@ async def update_instance(
482484
there is no need to call DeleteOperation.
483485
484486
Args:
485-
request (:class:`google.cloud.redis_v1.types.UpdateInstanceRequest`):
487+
request (Union[google.cloud.redis_v1.types.UpdateInstanceRequest, dict]):
486488
The request object. Request for
487489
[UpdateInstance][google.cloud.redis.v1.CloudRedis.UpdateInstance].
488490
update_mask (:class:`google.protobuf.field_mask_pb2.FieldMask`):
@@ -572,19 +574,19 @@ async def update_instance(
572574

573575
async def upgrade_instance(
574576
self,
575-
request: cloud_redis.UpgradeInstanceRequest = None,
577+
request: Union[cloud_redis.UpgradeInstanceRequest, dict] = None,
576578
*,
577579
name: str = None,
578580
redis_version: str = None,
579-
retry: retries.Retry = gapic_v1.method.DEFAULT,
581+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
580582
timeout: float = None,
581583
metadata: Sequence[Tuple[str, str]] = (),
582584
) -> operation_async.AsyncOperation:
583585
r"""Upgrades Redis instance to the newer Redis version
584586
specified in the request.
585587
586588
Args:
587-
request (:class:`google.cloud.redis_v1.types.UpgradeInstanceRequest`):
589+
request (Union[google.cloud.redis_v1.types.UpgradeInstanceRequest, dict]):
588590
The request object. Request for
589591
[UpgradeInstance][google.cloud.redis.v1.CloudRedis.UpgradeInstance].
590592
name (:class:`str`):
@@ -666,11 +668,11 @@ async def upgrade_instance(
666668

667669
async def import_instance(
668670
self,
669-
request: cloud_redis.ImportInstanceRequest = None,
671+
request: Union[cloud_redis.ImportInstanceRequest, dict] = None,
670672
*,
671673
name: str = None,
672674
input_config: cloud_redis.InputConfig = None,
673-
retry: retries.Retry = gapic_v1.method.DEFAULT,
675+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
674676
timeout: float = None,
675677
metadata: Sequence[Tuple[str, str]] = (),
676678
) -> operation_async.AsyncOperation:
@@ -685,7 +687,7 @@ async def import_instance(
685687
few hours, so there is no need to call DeleteOperation.
686688
687689
Args:
688-
request (:class:`google.cloud.redis_v1.types.ImportInstanceRequest`):
690+
request (Union[google.cloud.redis_v1.types.ImportInstanceRequest, dict]):
689691
The request object. Request for
690692
[Import][google.cloud.redis.v1.CloudRedis.ImportInstance].
691693
name (:class:`str`):
@@ -767,11 +769,11 @@ async def import_instance(
767769

768770
async def export_instance(
769771
self,
770-
request: cloud_redis.ExportInstanceRequest = None,
772+
request: Union[cloud_redis.ExportInstanceRequest, dict] = None,
771773
*,
772774
name: str = None,
773775
output_config: cloud_redis.OutputConfig = None,
774-
retry: retries.Retry = gapic_v1.method.DEFAULT,
776+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
775777
timeout: float = None,
776778
metadata: Sequence[Tuple[str, str]] = (),
777779
) -> operation_async.AsyncOperation:
@@ -782,7 +784,7 @@ async def export_instance(
782784
few hours, so there is no need to call DeleteOperation.
783785
784786
Args:
785-
request (:class:`google.cloud.redis_v1.types.ExportInstanceRequest`):
787+
request (Union[google.cloud.redis_v1.types.ExportInstanceRequest, dict]):
786788
The request object. Request for
787789
[Export][google.cloud.redis.v1.CloudRedis.ExportInstance].
788790
name (:class:`str`):
@@ -864,11 +866,11 @@ async def export_instance(
864866

865867
async def failover_instance(
866868
self,
867-
request: cloud_redis.FailoverInstanceRequest = None,
869+
request: Union[cloud_redis.FailoverInstanceRequest, dict] = None,
868870
*,
869871
name: str = None,
870872
data_protection_mode: cloud_redis.FailoverInstanceRequest.DataProtectionMode = None,
871-
retry: retries.Retry = gapic_v1.method.DEFAULT,
873+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
872874
timeout: float = None,
873875
metadata: Sequence[Tuple[str, str]] = (),
874876
) -> operation_async.AsyncOperation:
@@ -877,7 +879,7 @@ async def failover_instance(
877879
Memorystore for Redis instance.
878880
879881
Args:
880-
request (:class:`google.cloud.redis_v1.types.FailoverInstanceRequest`):
882+
request (Union[google.cloud.redis_v1.types.FailoverInstanceRequest, dict]):
881883
The request object. Request for
882884
[Failover][google.cloud.redis.v1.CloudRedis.FailoverInstance].
883885
name (:class:`str`):
@@ -960,18 +962,18 @@ async def failover_instance(
960962

961963
async def delete_instance(
962964
self,
963-
request: cloud_redis.DeleteInstanceRequest = None,
965+
request: Union[cloud_redis.DeleteInstanceRequest, dict] = None,
964966
*,
965967
name: str = None,
966-
retry: retries.Retry = gapic_v1.method.DEFAULT,
968+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
967969
timeout: float = None,
968970
metadata: Sequence[Tuple[str, str]] = (),
969971
) -> operation_async.AsyncOperation:
970972
r"""Deletes a specific Redis instance. Instance stops
971973
serving and data is deleted.
972974
973975
Args:
974-
request (:class:`google.cloud.redis_v1.types.DeleteInstanceRequest`):
976+
request (Union[google.cloud.redis_v1.types.DeleteInstanceRequest, dict]):
975977
The request object. Request for
976978
[DeleteInstance][google.cloud.redis.v1.CloudRedis.DeleteInstance].
977979
name (:class:`str`):

‎google/cloud/redis_v1/services/cloud_redis/client.py‎

Lines changed: 11 additions & 9 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.redis_v1.services.cloud_redis import pagers
@@ -376,7 +378,7 @@ def list_instances(
376378
request: Union[cloud_redis.ListInstancesRequest, dict] = None,
377379
*,
378380
parent: str = None,
379-
retry: retries.Retry = gapic_v1.method.DEFAULT,
381+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
380382
timeout: float = None,
381383
metadata: Sequence[Tuple[str, str]] = (),
382384
) -> pagers.ListInstancesPager:
@@ -467,7 +469,7 @@ def get_instance(
467469
request: Union[cloud_redis.GetInstanceRequest, dict] = None,
468470
*,
469471
name: str = None,
470-
retry: retries.Retry = gapic_v1.method.DEFAULT,
472+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
471473
timeout: float = None,
472474
metadata: Sequence[Tuple[str, str]] = (),
473475
) -> cloud_redis.Instance:
@@ -539,7 +541,7 @@ def create_instance(
539541
parent: str = None,
540542
instance_id: str = None,
541543
instance: cloud_redis.Instance = None,
542-
retry: retries.Retry = gapic_v1.method.DEFAULT,
544+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
543545
timeout: float = None,
544546
metadata: Sequence[Tuple[str, str]] = (),
545547
) -> operation.Operation:
@@ -660,7 +662,7 @@ def update_instance(
660662
*,
661663
update_mask: field_mask_pb2.FieldMask = None,
662664
instance: cloud_redis.Instance = None,
663-
retry: retries.Retry = gapic_v1.method.DEFAULT,
665+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
664666
timeout: float = None,
665667
metadata: Sequence[Tuple[str, str]] = (),
666668
) -> operation.Operation:
@@ -766,7 +768,7 @@ def upgrade_instance(
766768
*,
767769
name: str = None,
768770
redis_version: str = None,
769-
retry: retries.Retry = gapic_v1.method.DEFAULT,
771+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
770772
timeout: float = None,
771773
metadata: Sequence[Tuple[str, str]] = (),
772774
) -> operation.Operation:
@@ -860,7 +862,7 @@ def import_instance(
860862
*,
861863
name: str = None,
862864
input_config: cloud_redis.InputConfig = None,
863-
retry: retries.Retry = gapic_v1.method.DEFAULT,
865+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
864866
timeout: float = None,
865867
metadata: Sequence[Tuple[str, str]] = (),
866868
) -> operation.Operation:
@@ -961,7 +963,7 @@ def export_instance(
961963
*,
962964
name: str = None,
963965
output_config: cloud_redis.OutputConfig = None,
964-
retry: retries.Retry = gapic_v1.method.DEFAULT,
966+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
965967
timeout: float = None,
966968
metadata: Sequence[Tuple[str, str]] = (),
967969
) -> operation.Operation:
@@ -1058,7 +1060,7 @@ def failover_instance(
10581060
*,
10591061
name: str = None,
10601062
data_protection_mode: cloud_redis.FailoverInstanceRequest.DataProtectionMode = None,
1061-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1063+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10621064
timeout: float = None,
10631065
metadata: Sequence[Tuple[str, str]] = (),
10641066
) -> operation.Operation:
@@ -1153,7 +1155,7 @@ def delete_instance(
11531155
request: Union[cloud_redis.DeleteInstanceRequest, dict] = None,
11541156
*,
11551157
name: str = None,
1156-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1158+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11571159
timeout: float = None,
11581160
metadata: Sequence[Tuple[str, str]] = (),
11591161
) -> operation.Operation:

‎google/cloud/redis_v1/services/cloud_redis/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
@@ -37,15 +36,6 @@
3736
except pkg_resources.DistributionNotFound:
3837
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3938

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

5040
class CloudRedisTransport(abc.ABC):
5141
"""Abstract transport class for CloudRedis."""
@@ -95,7 +85,7 @@ def __init__(
9585
host += ":443"
9686
self._host = host
9787

98-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
88+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9989

10090
# Save the scopes.
10191
self._scopes = scopes
@@ -128,29 +118,6 @@ def __init__(
128118
# Save the credentials.
129119
self._credentials = credentials
130120

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

195162
@property
196-
def operations_client(self) -> operations_v1.OperationsClient:
163+
def operations_client(self):
197164
"""Return the client designed to process long-running operations."""
198165
raise NotImplementedError()
199166

‎google/cloud/redis_v1/services/cloud_redis/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def __init__(
132132
self._grpc_channel = None
133133
self._ssl_channel_credentials = ssl_channel_credentials
134134
self._stubs: Dict[str, Callable] = {}
135-
self._operations_client = None
135+
self._operations_client: Optional[operations_v1.OperationsClient] = None
136136

137137
if api_mtls_endpoint:
138138
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)