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

Commit 838a97b

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#164)
- [ ] 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 c1419c0 commit 838a97b

File tree

14 files changed

+331
-500
lines changed

14 files changed

+331
-500
lines changed

‎google/cloud/container_v1/services/cluster_manager/async_client.py

Lines changed: 99 additions & 97 deletions
Large diffs are not rendered by default.

‎google/cloud/container_v1/services/cluster_manager/client.py

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3232
from google.oauth2 import service_account # type: ignore
3333

34+
OptionalRetry = Union[retries.Retry, object]
35+
3436
from google.cloud.container_v1.services.cluster_manager import pagers
3537
from google.cloud.container_v1.types import cluster_service
3638
from .transports.base import ClusterManagerTransport, DEFAULT_CLIENT_INFO
@@ -339,7 +341,7 @@ def list_clusters(
339341
project_id: str = None,
340342
zone: str = None,
341343
parent: str = None,
342-
retry: retries.Retry = gapic_v1.method.DEFAULT,
344+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
343345
timeout: float = None,
344346
metadata: Sequence[Tuple[str, str]] = (),
345347
) -> cluster_service.ListClustersResponse:
@@ -439,7 +441,7 @@ def get_cluster(
439441
zone: str = None,
440442
cluster_id: str = None,
441443
name: str = None,
442-
retry: retries.Retry = gapic_v1.method.DEFAULT,
444+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
443445
timeout: float = None,
444446
metadata: Sequence[Tuple[str, str]] = (),
445447
) -> cluster_service.Cluster:
@@ -546,7 +548,7 @@ def create_cluster(
546548
zone: str = None,
547549
cluster: cluster_service.Cluster = None,
548550
parent: str = None,
549-
retry: retries.Retry = gapic_v1.method.DEFAULT,
551+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
550552
timeout: float = None,
551553
metadata: Sequence[Tuple[str, str]] = (),
552554
) -> cluster_service.Operation:
@@ -668,7 +670,7 @@ def update_cluster(
668670
cluster_id: str = None,
669671
update: cluster_service.ClusterUpdate = None,
670672
name: str = None,
671-
retry: retries.Retry = gapic_v1.method.DEFAULT,
673+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
672674
timeout: float = None,
673675
metadata: Sequence[Tuple[str, str]] = (),
674676
) -> cluster_service.Operation:
@@ -784,7 +786,7 @@ def update_node_pool(
784786
self,
785787
request: Union[cluster_service.UpdateNodePoolRequest, dict] = None,
786788
*,
787-
retry: retries.Retry = gapic_v1.method.DEFAULT,
789+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
788790
timeout: float = None,
789791
metadata: Sequence[Tuple[str, str]] = (),
790792
) -> cluster_service.Operation:
@@ -837,7 +839,7 @@ def set_node_pool_autoscaling(
837839
self,
838840
request: Union[cluster_service.SetNodePoolAutoscalingRequest, dict] = None,
839841
*,
840-
retry: retries.Retry = gapic_v1.method.DEFAULT,
842+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
841843
timeout: float = None,
842844
metadata: Sequence[Tuple[str, str]] = (),
843845
) -> cluster_service.Operation:
@@ -897,7 +899,7 @@ def set_logging_service(
897899
cluster_id: str = None,
898900
logging_service: str = None,
899901
name: str = None,
900-
retry: retries.Retry = gapic_v1.method.DEFAULT,
902+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
901903
timeout: float = None,
902904
metadata: Sequence[Tuple[str, str]] = (),
903905
) -> cluster_service.Operation:
@@ -1032,7 +1034,7 @@ def set_monitoring_service(
10321034
cluster_id: str = None,
10331035
monitoring_service: str = None,
10341036
name: str = None,
1035-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1037+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10361038
timeout: float = None,
10371039
metadata: Sequence[Tuple[str, str]] = (),
10381040
) -> cluster_service.Operation:
@@ -1169,7 +1171,7 @@ def set_addons_config(
11691171
cluster_id: str = None,
11701172
addons_config: cluster_service.AddonsConfig = None,
11711173
name: str = None,
1172-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1174+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11731175
timeout: float = None,
11741176
metadata: Sequence[Tuple[str, str]] = (),
11751177
) -> cluster_service.Operation:
@@ -1291,7 +1293,7 @@ def set_locations(
12911293
cluster_id: str = None,
12921294
locations: Sequence[str] = None,
12931295
name: str = None,
1294-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1296+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12951297
timeout: float = None,
12961298
metadata: Sequence[Tuple[str, str]] = (),
12971299
) -> cluster_service.Operation:
@@ -1425,7 +1427,7 @@ def update_master(
14251427
cluster_id: str = None,
14261428
master_version: str = None,
14271429
name: str = None,
1428-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1430+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14291431
timeout: float = None,
14301432
metadata: Sequence[Tuple[str, str]] = (),
14311433
) -> cluster_service.Operation:
@@ -1553,7 +1555,7 @@ def set_master_auth(
15531555
self,
15541556
request: Union[cluster_service.SetMasterAuthRequest, dict] = None,
15551557
*,
1556-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1558+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15571559
timeout: float = None,
15581560
metadata: Sequence[Tuple[str, str]] = (),
15591561
) -> cluster_service.Operation:
@@ -1612,7 +1614,7 @@ def delete_cluster(
16121614
zone: str = None,
16131615
cluster_id: str = None,
16141616
name: str = None,
1615-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1617+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16161618
timeout: float = None,
16171619
metadata: Sequence[Tuple[str, str]] = (),
16181620
) -> cluster_service.Operation:
@@ -1730,7 +1732,7 @@ def list_operations(
17301732
*,
17311733
project_id: str = None,
17321734
zone: str = None,
1733-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1735+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17341736
timeout: float = None,
17351737
metadata: Sequence[Tuple[str, str]] = (),
17361738
) -> cluster_service.ListOperationsResponse:
@@ -1820,7 +1822,7 @@ def get_operation(
18201822
zone: str = None,
18211823
operation_id: str = None,
18221824
name: str = None,
1823-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1825+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18241826
timeout: float = None,
18251827
metadata: Sequence[Tuple[str, str]] = (),
18261828
) -> cluster_service.Operation:
@@ -1930,7 +1932,7 @@ def cancel_operation(
19301932
zone: str = None,
19311933
operation_id: str = None,
19321934
name: str = None,
1933-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1935+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19341936
timeout: float = None,
19351937
metadata: Sequence[Tuple[str, str]] = (),
19361938
) -> None:
@@ -2030,7 +2032,7 @@ def get_server_config(
20302032
project_id: str = None,
20312033
zone: str = None,
20322034
name: str = None,
2033-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2035+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20342036
timeout: float = None,
20352037
metadata: Sequence[Tuple[str, str]] = (),
20362038
) -> cluster_service.ServerConfig:
@@ -2124,7 +2126,7 @@ def get_json_web_keys(
21242126
self,
21252127
request: Union[cluster_service.GetJSONWebKeysRequest, dict] = None,
21262128
*,
2127-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2129+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21282130
timeout: float = None,
21292131
metadata: Sequence[Tuple[str, str]] = (),
21302132
) -> cluster_service.GetJSONWebKeysResponse:
@@ -2185,7 +2187,7 @@ def list_node_pools(
21852187
zone: str = None,
21862188
cluster_id: str = None,
21872189
parent: str = None,
2188-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2190+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21892191
timeout: float = None,
21902192
metadata: Sequence[Tuple[str, str]] = (),
21912193
) -> cluster_service.ListNodePoolsResponse:
@@ -2294,7 +2296,7 @@ def get_node_pool(
22942296
cluster_id: str = None,
22952297
node_pool_id: str = None,
22962298
name: str = None,
2297-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2299+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22982300
timeout: float = None,
22992301
metadata: Sequence[Tuple[str, str]] = (),
23002302
) -> cluster_service.NodePool:
@@ -2421,7 +2423,7 @@ def create_node_pool(
24212423
cluster_id: str = None,
24222424
node_pool: cluster_service.NodePool = None,
24232425
parent: str = None,
2424-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2426+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24252427
timeout: float = None,
24262428
metadata: Sequence[Tuple[str, str]] = (),
24272429
) -> cluster_service.Operation:
@@ -2539,7 +2541,7 @@ def delete_node_pool(
25392541
cluster_id: str = None,
25402542
node_pool_id: str = None,
25412543
name: str = None,
2542-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2544+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25432545
timeout: float = None,
25442546
metadata: Sequence[Tuple[str, str]] = (),
25452547
) -> cluster_service.Operation:
@@ -2661,7 +2663,7 @@ def rollback_node_pool_upgrade(
26612663
cluster_id: str = None,
26622664
node_pool_id: str = None,
26632665
name: str = None,
2664-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2666+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26652667
timeout: float = None,
26662668
metadata: Sequence[Tuple[str, str]] = (),
26672669
) -> cluster_service.Operation:
@@ -2786,7 +2788,7 @@ def set_node_pool_management(
27862788
self,
27872789
request: Union[cluster_service.SetNodePoolManagementRequest, dict] = None,
27882790
*,
2789-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2791+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27902792
timeout: float = None,
27912793
metadata: Sequence[Tuple[str, str]] = (),
27922794
) -> cluster_service.Operation:
@@ -2838,7 +2840,7 @@ def set_labels(
28382840
self,
28392841
request: Union[cluster_service.SetLabelsRequest, dict] = None,
28402842
*,
2841-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2843+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28422844
timeout: float = None,
28432845
metadata: Sequence[Tuple[str, str]] = (),
28442846
) -> cluster_service.Operation:
@@ -2897,7 +2899,7 @@ def set_legacy_abac(
28972899
cluster_id: str = None,
28982900
enabled: bool = None,
28992901
name: str = None,
2900-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2902+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29012903
timeout: float = None,
29022904
metadata: Sequence[Tuple[str, str]] = (),
29032905
) -> cluster_service.Operation:
@@ -3018,7 +3020,7 @@ def start_ip_rotation(
30183020
zone: str = None,
30193021
cluster_id: str = None,
30203022
name: str = None,
3021-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3023+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30223024
timeout: float = None,
30233025
metadata: Sequence[Tuple[str, str]] = (),
30243026
) -> cluster_service.Operation:
@@ -3129,7 +3131,7 @@ def complete_ip_rotation(
31293131
zone: str = None,
31303132
cluster_id: str = None,
31313133
name: str = None,
3132-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3134+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
31333135
timeout: float = None,
31343136
metadata: Sequence[Tuple[str, str]] = (),
31353137
) -> cluster_service.Operation:
@@ -3235,7 +3237,7 @@ def set_node_pool_size(
32353237
self,
32363238
request: Union[cluster_service.SetNodePoolSizeRequest, dict] = None,
32373239
*,
3238-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3240+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
32393241
timeout: float = None,
32403242
metadata: Sequence[Tuple[str, str]] = (),
32413243
) -> cluster_service.Operation:
@@ -3292,7 +3294,7 @@ def set_network_policy(
32923294
cluster_id: str = None,
32933295
network_policy: cluster_service.NetworkPolicy = None,
32943296
name: str = None,
3295-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3297+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
32963298
timeout: float = None,
32973299
metadata: Sequence[Tuple[str, str]] = (),
32983300
) -> cluster_service.Operation:
@@ -3412,7 +3414,7 @@ def set_maintenance_policy(
34123414
cluster_id: str = None,
34133415
maintenance_policy: cluster_service.MaintenancePolicy = None,
34143416
name: str = None,
3415-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3417+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
34163418
timeout: float = None,
34173419
metadata: Sequence[Tuple[str, str]] = (),
34183420
) -> cluster_service.Operation:
@@ -3526,7 +3528,7 @@ def list_usable_subnetworks(
35263528
self,
35273529
request: Union[cluster_service.ListUsableSubnetworksRequest, dict] = None,
35283530
*,
3529-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3531+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
35303532
timeout: float = None,
35313533
metadata: Sequence[Tuple[str, str]] = (),
35323534
) -> pagers.ListUsableSubnetworksPager:

‎google/cloud/container_v1/services/cluster_manager/transports/base.py

Lines changed: 1 addition & 34 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
@@ -36,15 +35,6 @@
3635
except pkg_resources.DistributionNotFound:
3736
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3837

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

4939
class ClusterManagerTransport(abc.ABC):
5040
"""Abstract transport class for ClusterManager."""
@@ -94,7 +84,7 @@ def __init__(
9484
host += ":443"
9585
self._host = host
9686

97-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
87+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9888

9989
# Save the scopes.
10090
self._scopes = scopes
@@ -127,29 +117,6 @@ def __init__(
127117
# Save the credentials.
128118
self._credentials = credentials
129119

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

‎google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

0 commit comments

Comments
 (0)