Skip to content

Commit bcbdb37

Browse files
chore: use gapic-generator-python 0.53.4 (#75)
- [ ] 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 add1ddd commit bcbdb37

File tree

9 files changed

+89
-201
lines changed

9 files changed

+89
-201
lines changed

packages/google-cloud-service-management/google/cloud/servicemanagement_v1/services/service_manager/async_client.py

Lines changed: 48 additions & 46 deletions
Large diffs are not rendered by default.

packages/google-cloud-service-management/google/cloud/servicemanagement_v1/services/service_manager/client.py

Lines changed: 17 additions & 15 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.api import auth_pb2 # type: ignore
3537
from google.api import backend_pb2 # type: ignore
3638
from google.api import billing_pb2 # type: ignore
@@ -367,7 +369,7 @@ def list_services(
367369
*,
368370
producer_project_id: str = None,
369371
consumer_id: str = None,
370-
retry: retries.Retry = gapic_v1.method.DEFAULT,
372+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
371373
timeout: float = None,
372374
metadata: Sequence[Tuple[str, str]] = (),
373375
) -> pagers.ListServicesPager:
@@ -461,7 +463,7 @@ def get_service(
461463
request: Union[servicemanager.GetServiceRequest, dict] = None,
462464
*,
463465
service_name: str = None,
464-
retry: retries.Retry = gapic_v1.method.DEFAULT,
466+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
465467
timeout: float = None,
466468
metadata: Sequence[Tuple[str, str]] = (),
467469
) -> resources.ManagedService:
@@ -529,7 +531,7 @@ def create_service(
529531
request: Union[servicemanager.CreateServiceRequest, dict] = None,
530532
*,
531533
service: resources.ManagedService = None,
532-
retry: retries.Retry = gapic_v1.method.DEFAULT,
534+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
533535
timeout: float = None,
534536
metadata: Sequence[Tuple[str, str]] = (),
535537
) -> operation.Operation:
@@ -607,7 +609,7 @@ def delete_service(
607609
request: Union[servicemanager.DeleteServiceRequest, dict] = None,
608610
*,
609611
service_name: str = None,
610-
retry: retries.Retry = gapic_v1.method.DEFAULT,
612+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
611613
timeout: float = None,
612614
metadata: Sequence[Tuple[str, str]] = (),
613615
) -> operation.Operation:
@@ -702,7 +704,7 @@ def undelete_service(
702704
request: Union[servicemanager.UndeleteServiceRequest, dict] = None,
703705
*,
704706
service_name: str = None,
705-
retry: retries.Retry = gapic_v1.method.DEFAULT,
707+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
706708
timeout: float = None,
707709
metadata: Sequence[Tuple[str, str]] = (),
708710
) -> operation.Operation:
@@ -786,7 +788,7 @@ def list_service_configs(
786788
request: Union[servicemanager.ListServiceConfigsRequest, dict] = None,
787789
*,
788790
service_name: str = None,
789-
retry: retries.Retry = gapic_v1.method.DEFAULT,
791+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
790792
timeout: float = None,
791793
metadata: Sequence[Tuple[str, str]] = (),
792794
) -> pagers.ListServiceConfigsPager:
@@ -865,7 +867,7 @@ def get_service_config(
865867
service_name: str = None,
866868
config_id: str = None,
867869
view: servicemanager.GetServiceConfigRequest.ConfigView = None,
868-
retry: retries.Retry = gapic_v1.method.DEFAULT,
870+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
869871
timeout: float = None,
870872
metadata: Sequence[Tuple[str, str]] = (),
871873
) -> service_pb2.Service:
@@ -972,7 +974,7 @@ def create_service_config(
972974
*,
973975
service_name: str = None,
974976
service_config: service_pb2.Service = None,
975-
retry: retries.Retry = gapic_v1.method.DEFAULT,
977+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
976978
timeout: float = None,
977979
metadata: Sequence[Tuple[str, str]] = (),
978980
) -> service_pb2.Service:
@@ -1075,7 +1077,7 @@ def submit_config_source(
10751077
service_name: str = None,
10761078
config_source: resources.ConfigSource = None,
10771079
validate_only: bool = None,
1078-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1080+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10791081
timeout: float = None,
10801082
metadata: Sequence[Tuple[str, str]] = (),
10811083
) -> operation.Operation:
@@ -1186,7 +1188,7 @@ def list_service_rollouts(
11861188
*,
11871189
service_name: str = None,
11881190
filter: str = None,
1189-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1191+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11901192
timeout: float = None,
11911193
metadata: Sequence[Tuple[str, str]] = (),
11921194
) -> pagers.ListServiceRolloutsPager:
@@ -1281,7 +1283,7 @@ def get_service_rollout(
12811283
*,
12821284
service_name: str = None,
12831285
rollout_id: str = None,
1284-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1286+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12851287
timeout: float = None,
12861288
metadata: Sequence[Tuple[str, str]] = (),
12871289
) -> resources.Rollout:
@@ -1363,7 +1365,7 @@ def create_service_rollout(
13631365
*,
13641366
service_name: str = None,
13651367
rollout: resources.Rollout = None,
1366-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1368+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13671369
timeout: float = None,
13681370
metadata: Sequence[Tuple[str, str]] = (),
13691371
) -> operation.Operation:
@@ -1468,7 +1470,7 @@ def generate_config_report(
14681470
*,
14691471
new_config: any_pb2.Any = None,
14701472
old_config: any_pb2.Any = None,
1471-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1473+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14721474
timeout: float = None,
14731475
metadata: Sequence[Tuple[str, str]] = (),
14741476
) -> servicemanager.GenerateConfigReportResponse:
@@ -1562,7 +1564,7 @@ def enable_service(
15621564
*,
15631565
service_name: str = None,
15641566
consumer_id: str = None,
1565-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1567+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15661568
timeout: float = None,
15671569
metadata: Sequence[Tuple[str, str]] = (),
15681570
) -> operation.Operation:
@@ -1667,7 +1669,7 @@ def disable_service(
16671669
*,
16681670
service_name: str = None,
16691671
consumer_id: str = None,
1670-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1672+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16711673
timeout: float = None,
16721674
metadata: Sequence[Tuple[str, str]] = (),
16731675
) -> operation.Operation:

packages/google-cloud-service-management/google/cloud/servicemanagement_v1/services/service_manager/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
@@ -41,15 +40,6 @@
4140
except pkg_resources.DistributionNotFound:
4241
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4342

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

5444
class ServiceManagerTransport(abc.ABC):
5545
"""Abstract transport class for ServiceManager."""
@@ -104,7 +94,7 @@ def __init__(
10494
host += ":443"
10595
self._host = host
10696

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

10999
# Save the scopes.
110100
self._scopes = scopes
@@ -137,29 +127,6 @@ def __init__(
137127
# Save the credentials.
138128
self._credentials = credentials
139129

140-
# TODO(busunkim): This method is in the base transport
141-
# to avoid duplicating code across the transport classes. These functions
142-
# should be deleted once the minimum required versions of google-auth is increased.
143-
144-
# TODO: Remove this function once google-auth >= 1.25.0 is required
145-
@classmethod
146-
def _get_scopes_kwargs(
147-
cls, host: str, scopes: Optional[Sequence[str]]
148-
) -> Dict[str, Optional[Sequence[str]]]:
149-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
150-
151-
scopes_kwargs = {}
152-
153-
if _GOOGLE_AUTH_VERSION and (
154-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
155-
>= packaging.version.parse("1.25.0")
156-
):
157-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
158-
else:
159-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
160-
161-
return scopes_kwargs
162-
163130
def _prep_wrapped_messages(self, client_info):
164131
# Precompute the wrapped methods.
165132
self._wrapped_methods = {
@@ -232,7 +199,7 @@ def close(self):
232199
raise NotImplementedError()
233200

234201
@property
235-
def operations_client(self) -> operations_v1.OperationsClient:
202+
def operations_client(self):
236203
"""Return the client designed to process long-running operations."""
237204
raise NotImplementedError()
238205

packages/google-cloud-service-management/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc.py

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

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

packages/google-cloud-service-management/google/cloud/servicemanagement_v1/services/service_manager/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
@@ -162,7 +161,7 @@ def __init__(
162161
self._grpc_channel = None
163162
self._ssl_channel_credentials = ssl_channel_credentials
164163
self._stubs: Dict[str, Callable] = {}
165-
self._operations_client = None
164+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
166165

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

packages/google-cloud-service-management/google/cloud/servicemanagement_v1/types/resources.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,13 @@ class Rollout(proto.Message):
209209
create a new version of the service config, and then create a
210210
Rollout to push the service config.
211211
212+
This message has `oneof`_ fields (mutually exclusive fields).
213+
For each oneof, at most one member field can be set at the same time.
214+
Setting any member of the oneof automatically clears all other
215+
members.
216+
217+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
218+
212219
Attributes:
213220
rollout_id (str):
214221
Optional. Unique identifier of this Rollout. Must be no
@@ -233,9 +240,11 @@ class Rollout(proto.Message):
233240
traffic_percent_strategy (google.cloud.servicemanagement_v1.types.Rollout.TrafficPercentStrategy):
234241
Google Service Control selects service
235242
configurations based on traffic percentage.
243+
This field is a member of `oneof`_ ``strategy``.
236244
delete_service_strategy (google.cloud.servicemanagement_v1.types.Rollout.DeleteServiceStrategy):
237245
The strategy associated with a rollout to delete a
238246
``ManagedService``. Readonly.
247+
This field is a member of `oneof`_ ``strategy``.
239248
service_name (str):
240249
The name of the service associated with this
241250
Rollout.

packages/google-cloud-service-management/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@
2828
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
2929
# Until this issue is closed
3030
# https://github.com/googleapis/google-cloud-python/issues/10566
31-
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
31+
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
3232
"libcst >= 0.2.5",
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-service-management/testing/constraints-3.6.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#
2020
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
2121
# Then this file should have foo==1.14.0
22-
google-api-core==1.26.0
22+
google-api-core==1.28.0
2323
libcst==0.2.5
2424
proto-plus==1.15.0
25-
packaging==14.3
26-
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)