Skip to content

Commit b9d9ce4

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#48)
- [ ] 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 f18ec93 commit b9d9ce4

9 files changed

Lines changed: 66 additions & 150 deletions

File tree

‎packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/async_client.py‎

Lines changed: 21 additions & 19 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.network_management_v1.services.reachability_service import pagers
@@ -184,17 +186,17 @@ def __init__(
184186

185187
async def list_connectivity_tests(
186188
self,
187-
request: reachability.ListConnectivityTestsRequest = None,
189+
request: Union[reachability.ListConnectivityTestsRequest, dict] = None,
188190
*,
189191
parent: str = None,
190-
retry: retries.Retry = gapic_v1.method.DEFAULT,
192+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
191193
timeout: float = None,
192194
metadata: Sequence[Tuple[str, str]] = (),
193195
) -> pagers.ListConnectivityTestsAsyncPager:
194196
r"""Lists all Connectivity Tests owned by a project.
195197
196198
Args:
197-
request (:class:`google.cloud.network_management_v1.types.ListConnectivityTestsRequest`):
199+
request (Union[google.cloud.network_management_v1.types.ListConnectivityTestsRequest, dict]):
198200
The request object. Request for the
199201
`ListConnectivityTests` method.
200202
parent (:class:`str`):
@@ -263,17 +265,17 @@ async def list_connectivity_tests(
263265

264266
async def get_connectivity_test(
265267
self,
266-
request: reachability.GetConnectivityTestRequest = None,
268+
request: Union[reachability.GetConnectivityTestRequest, dict] = None,
267269
*,
268270
name: str = None,
269-
retry: retries.Retry = gapic_v1.method.DEFAULT,
271+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
270272
timeout: float = None,
271273
metadata: Sequence[Tuple[str, str]] = (),
272274
) -> connectivity_test.ConnectivityTest:
273275
r"""Gets the details of a specific Connectivity Test.
274276
275277
Args:
276-
request (:class:`google.cloud.network_management_v1.types.GetConnectivityTestRequest`):
278+
request (Union[google.cloud.network_management_v1.types.GetConnectivityTestRequest, dict]):
277279
The request object. Request for the
278280
`GetConnectivityTest` method.
279281
name (:class:`str`):
@@ -335,12 +337,12 @@ async def get_connectivity_test(
335337

336338
async def create_connectivity_test(
337339
self,
338-
request: reachability.CreateConnectivityTestRequest = None,
340+
request: Union[reachability.CreateConnectivityTestRequest, dict] = None,
339341
*,
340342
parent: str = None,
341343
test_id: str = None,
342344
resource: connectivity_test.ConnectivityTest = None,
343-
retry: retries.Retry = gapic_v1.method.DEFAULT,
345+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
344346
timeout: float = None,
345347
metadata: Sequence[Tuple[str, str]] = (),
346348
) -> operation_async.AsyncOperation:
@@ -360,7 +362,7 @@ async def create_connectivity_test(
360362
documentation.
361363
362364
Args:
363-
request (:class:`google.cloud.network_management_v1.types.CreateConnectivityTestRequest`):
365+
request (Union[google.cloud.network_management_v1.types.CreateConnectivityTestRequest, dict]):
364366
The request object. Request for the
365367
`CreateConnectivityTest` method.
366368
parent (:class:`str`):
@@ -455,11 +457,11 @@ async def create_connectivity_test(
455457

456458
async def update_connectivity_test(
457459
self,
458-
request: reachability.UpdateConnectivityTestRequest = None,
460+
request: Union[reachability.UpdateConnectivityTestRequest, dict] = None,
459461
*,
460462
update_mask: field_mask_pb2.FieldMask = None,
461463
resource: connectivity_test.ConnectivityTest = None,
462-
retry: retries.Retry = gapic_v1.method.DEFAULT,
464+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
463465
timeout: float = None,
464466
metadata: Sequence[Tuple[str, str]] = (),
465467
) -> operation_async.AsyncOperation:
@@ -481,7 +483,7 @@ async def update_connectivity_test(
481483
for more details.
482484
483485
Args:
484-
request (:class:`google.cloud.network_management_v1.types.UpdateConnectivityTestRequest`):
486+
request (Union[google.cloud.network_management_v1.types.UpdateConnectivityTestRequest, dict]):
485487
The request object. Request for the
486488
`UpdateConnectivityTest` method.
487489
update_mask (:class:`google.protobuf.field_mask_pb2.FieldMask`):
@@ -565,9 +567,9 @@ async def update_connectivity_test(
565567

566568
async def rerun_connectivity_test(
567569
self,
568-
request: reachability.RerunConnectivityTestRequest = None,
570+
request: Union[reachability.RerunConnectivityTestRequest, dict] = None,
569571
*,
570-
retry: retries.Retry = gapic_v1.method.DEFAULT,
572+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
571573
timeout: float = None,
572574
metadata: Sequence[Tuple[str, str]] = (),
573575
) -> operation_async.AsyncOperation:
@@ -587,7 +589,7 @@ async def rerun_connectivity_test(
587589
returns a value of ``UNKNOWN``.
588590
589591
Args:
590-
request (:class:`google.cloud.network_management_v1.types.RerunConnectivityTestRequest`):
592+
request (Union[google.cloud.network_management_v1.types.RerunConnectivityTestRequest, dict]):
591593
The request object. Request for the
592594
`RerunConnectivityTest` method.
593595
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -638,17 +640,17 @@ async def rerun_connectivity_test(
638640

639641
async def delete_connectivity_test(
640642
self,
641-
request: reachability.DeleteConnectivityTestRequest = None,
643+
request: Union[reachability.DeleteConnectivityTestRequest, dict] = None,
642644
*,
643645
name: str = None,
644-
retry: retries.Retry = gapic_v1.method.DEFAULT,
646+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
645647
timeout: float = None,
646648
metadata: Sequence[Tuple[str, str]] = (),
647649
) -> operation_async.AsyncOperation:
648650
r"""Deletes a specific ``ConnectivityTest``.
649651
650652
Args:
651-
request (:class:`google.cloud.network_management_v1.types.DeleteConnectivityTestRequest`):
653+
request (Union[google.cloud.network_management_v1.types.DeleteConnectivityTestRequest, dict]):
652654
The request object. Request for the
653655
`DeleteConnectivityTest` method.
654656
name (:class:`str`):

‎packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/client.py‎

Lines changed: 8 additions & 6 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.network_management_v1.services.reachability_service import pagers
@@ -370,7 +372,7 @@ def list_connectivity_tests(
370372
request: Union[reachability.ListConnectivityTestsRequest, dict] = None,
371373
*,
372374
parent: str = None,
373-
retry: retries.Retry = gapic_v1.method.DEFAULT,
375+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
374376
timeout: float = None,
375377
metadata: Sequence[Tuple[str, str]] = (),
376378
) -> pagers.ListConnectivityTestsPager:
@@ -449,7 +451,7 @@ def get_connectivity_test(
449451
request: Union[reachability.GetConnectivityTestRequest, dict] = None,
450452
*,
451453
name: str = None,
452-
retry: retries.Retry = gapic_v1.method.DEFAULT,
454+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
453455
timeout: float = None,
454456
metadata: Sequence[Tuple[str, str]] = (),
455457
) -> connectivity_test.ConnectivityTest:
@@ -523,7 +525,7 @@ def create_connectivity_test(
523525
parent: str = None,
524526
test_id: str = None,
525527
resource: connectivity_test.ConnectivityTest = None,
526-
retry: retries.Retry = gapic_v1.method.DEFAULT,
528+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
527529
timeout: float = None,
528530
metadata: Sequence[Tuple[str, str]] = (),
529531
) -> operation.Operation:
@@ -642,7 +644,7 @@ def update_connectivity_test(
642644
*,
643645
update_mask: field_mask_pb2.FieldMask = None,
644646
resource: connectivity_test.ConnectivityTest = None,
645-
retry: retries.Retry = gapic_v1.method.DEFAULT,
647+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
646648
timeout: float = None,
647649
metadata: Sequence[Tuple[str, str]] = (),
648650
) -> operation.Operation:
@@ -750,7 +752,7 @@ def rerun_connectivity_test(
750752
self,
751753
request: Union[reachability.RerunConnectivityTestRequest, dict] = None,
752754
*,
753-
retry: retries.Retry = gapic_v1.method.DEFAULT,
755+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
754756
timeout: float = None,
755757
metadata: Sequence[Tuple[str, str]] = (),
756758
) -> operation.Operation:
@@ -825,7 +827,7 @@ def delete_connectivity_test(
825827
request: Union[reachability.DeleteConnectivityTestRequest, dict] = None,
826828
*,
827829
name: str = None,
828-
retry: retries.Retry = gapic_v1.method.DEFAULT,
830+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
829831
timeout: float = None,
830832
metadata: Sequence[Tuple[str, str]] = (),
831833
) -> operation.Operation:

‎packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/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
@@ -40,15 +39,6 @@
4039
except pkg_resources.DistributionNotFound:
4140
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4241

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

5343
class ReachabilityServiceTransport(abc.ABC):
5444
"""Abstract transport class for ReachabilityService."""
@@ -98,7 +88,7 @@ def __init__(
9888
host += ":443"
9989
self._host = host
10090

101-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
91+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10292

10393
# Save the scopes.
10494
self._scopes = scopes
@@ -131,29 +121,6 @@ def __init__(
131121
# Save the credentials.
132122
self._credentials = credentials
133123

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

201168
@property
202-
def operations_client(self) -> operations_v1.OperationsClient:
169+
def operations_client(self):
203170
"""Return the client designed to process long-running operations."""
204171
raise NotImplementedError()
205172

‎packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def __init__(
122122
self._grpc_channel = None
123123
self._ssl_channel_credentials = ssl_channel_credentials
124124
self._stubs: Dict[str, Callable] = {}
125-
self._operations_client = None
125+
self._operations_client: Optional[operations_v1.OperationsClient] = None
126126

127127
if api_mtls_endpoint:
128128
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/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
@@ -169,7 +168,7 @@ def __init__(
169168
self._grpc_channel = None
170169
self._ssl_channel_credentials = ssl_channel_credentials
171170
self._stubs: Dict[str, Callable] = {}
172-
self._operations_client = None
171+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
173172

174173
if api_mtls_endpoint:
175174
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ class Step(proto.Message):
8181
Each step has a well-defined state and an associated
8282
configuration.
8383
84+
This message has `oneof`_ fields (mutually exclusive fields).
85+
For each oneof, at most one member field can be set at the same time.
86+
Setting any member of the oneof automatically clears all other
87+
members.
88+
89+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
90+
8491
Attributes:
8592
description (str):
8693
A description of the step. Usually this is a
@@ -97,49 +104,64 @@ class Step(proto.Message):
97104
instance (google.cloud.network_management_v1.types.InstanceInfo):
98105
Display information of a Compute Engine
99106
instance.
107+
This field is a member of `oneof`_ ``step_info``.
100108
firewall (google.cloud.network_management_v1.types.FirewallInfo):
101109
Display information of a Compute Engine
102110
firewall rule.
111+
This field is a member of `oneof`_ ``step_info``.
103112
route (google.cloud.network_management_v1.types.RouteInfo):
104113
Display information of a Compute Engine
105114
route.
115+
This field is a member of `oneof`_ ``step_info``.
106116
endpoint (google.cloud.network_management_v1.types.EndpointInfo):
107117
Display information of the source and
108118
destination under analysis. The endpoint
109119
information in an intermediate state may differ
110120
with the initial input, as it might be modified
111121
by state like NAT, or Connection Proxy.
122+
This field is a member of `oneof`_ ``step_info``.
112123
forwarding_rule (google.cloud.network_management_v1.types.ForwardingRuleInfo):
113124
Display information of a Compute Engine
114125
forwarding rule.
126+
This field is a member of `oneof`_ ``step_info``.
115127
vpn_gateway (google.cloud.network_management_v1.types.VpnGatewayInfo):
116128
Display information of a Compute Engine VPN
117129
gateway.
130+
This field is a member of `oneof`_ ``step_info``.
118131
vpn_tunnel (google.cloud.network_management_v1.types.VpnTunnelInfo):
119132
Display information of a Compute Engine VPN
120133
tunnel.
134+
This field is a member of `oneof`_ ``step_info``.
121135
deliver (google.cloud.network_management_v1.types.DeliverInfo):
122136
Display information of the final state
123137
"deliver" and reason.
138+
This field is a member of `oneof`_ ``step_info``.
124139
forward (google.cloud.network_management_v1.types.ForwardInfo):
125140
Display information of the final state
126141
"forward" and reason.
142+
This field is a member of `oneof`_ ``step_info``.
127143
abort (google.cloud.network_management_v1.types.AbortInfo):
128144
Display information of the final state
129145
"abort" and reason.
146+
This field is a member of `oneof`_ ``step_info``.
130147
drop (google.cloud.network_management_v1.types.DropInfo):
131148
Display information of the final state "drop"
132149
and reason.
150+
This field is a member of `oneof`_ ``step_info``.
133151
load_balancer (google.cloud.network_management_v1.types.LoadBalancerInfo):
134152
Display information of the load balancers.
153+
This field is a member of `oneof`_ ``step_info``.
135154
network (google.cloud.network_management_v1.types.NetworkInfo):
136155
Display information of a Google Cloud
137156
network.
157+
This field is a member of `oneof`_ ``step_info``.
138158
gke_master (google.cloud.network_management_v1.types.GKEMasterInfo):
139159
Display information of a Google Kubernetes
140160
Engine cluster master.
161+
This field is a member of `oneof`_ ``step_info``.
141162
cloud_sql_instance (google.cloud.network_management_v1.types.CloudSQLInstanceInfo):
142163
Display information of a Cloud SQL instance.
164+
This field is a member of `oneof`_ ``step_info``.
143165
"""
144166

145167
class State(proto.Enum):

‎packages/google-cloud-network-management/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__))

0 commit comments

Comments
 (0)