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

Commit 22d4eab

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#243)
- [ ] 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 9e8aeeb commit 22d4eab

44 files changed

Lines changed: 450 additions & 1109 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎google/cloud/monitoring_v3/services/alert_policy_service/async_client.py‎

Lines changed: 18 additions & 16 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.cloud.monitoring_v3.services.alert_policy_service import pagers
3032
from google.cloud.monitoring_v3.types import alert
3133
from google.cloud.monitoring_v3.types import alert_service
@@ -186,18 +188,18 @@ def __init__(
186188

187189
async def list_alert_policies(
188190
self,
189-
request: alert_service.ListAlertPoliciesRequest = None,
191+
request: Union[alert_service.ListAlertPoliciesRequest, dict] = None,
190192
*,
191193
name: str = None,
192-
retry: retries.Retry = gapic_v1.method.DEFAULT,
194+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
193195
timeout: float = None,
194196
metadata: Sequence[Tuple[str, str]] = (),
195197
) -> pagers.ListAlertPoliciesAsyncPager:
196198
r"""Lists the existing alerting policies for the
197199
workspace.
198200
199201
Args:
200-
request (:class:`google.cloud.monitoring_v3.types.ListAlertPoliciesRequest`):
202+
request (Union[google.cloud.monitoring_v3.types.ListAlertPoliciesRequest, dict]):
201203
The request object. The protocol for the
202204
`ListAlertPolicies` request.
203205
name (:class:`str`):
@@ -286,17 +288,17 @@ async def list_alert_policies(
286288

287289
async def get_alert_policy(
288290
self,
289-
request: alert_service.GetAlertPolicyRequest = None,
291+
request: Union[alert_service.GetAlertPolicyRequest, dict] = None,
290292
*,
291293
name: str = None,
292-
retry: retries.Retry = gapic_v1.method.DEFAULT,
294+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
293295
timeout: float = None,
294296
metadata: Sequence[Tuple[str, str]] = (),
295297
) -> alert.AlertPolicy:
296298
r"""Gets a single alerting policy.
297299
298300
Args:
299-
request (:class:`google.cloud.monitoring_v3.types.GetAlertPolicyRequest`):
301+
request (Union[google.cloud.monitoring_v3.types.GetAlertPolicyRequest, dict]):
300302
The request object. The protocol for the
301303
`GetAlertPolicy` request.
302304
name (:class:`str`):
@@ -373,18 +375,18 @@ async def get_alert_policy(
373375

374376
async def create_alert_policy(
375377
self,
376-
request: alert_service.CreateAlertPolicyRequest = None,
378+
request: Union[alert_service.CreateAlertPolicyRequest, dict] = None,
377379
*,
378380
name: str = None,
379381
alert_policy: alert.AlertPolicy = None,
380-
retry: retries.Retry = gapic_v1.method.DEFAULT,
382+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
381383
timeout: float = None,
382384
metadata: Sequence[Tuple[str, str]] = (),
383385
) -> alert.AlertPolicy:
384386
r"""Creates a new alerting policy.
385387
386388
Args:
387-
request (:class:`google.cloud.monitoring_v3.types.CreateAlertPolicyRequest`):
389+
request (Union[google.cloud.monitoring_v3.types.CreateAlertPolicyRequest, dict]):
388390
The request object. The protocol for the
389391
`CreateAlertPolicy` request.
390392
name (:class:`str`):
@@ -474,17 +476,17 @@ async def create_alert_policy(
474476

475477
async def delete_alert_policy(
476478
self,
477-
request: alert_service.DeleteAlertPolicyRequest = None,
479+
request: Union[alert_service.DeleteAlertPolicyRequest, dict] = None,
478480
*,
479481
name: str = None,
480-
retry: retries.Retry = gapic_v1.method.DEFAULT,
482+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
481483
timeout: float = None,
482484
metadata: Sequence[Tuple[str, str]] = (),
483485
) -> None:
484486
r"""Deletes an alerting policy.
485487
486488
Args:
487-
request (:class:`google.cloud.monitoring_v3.types.DeleteAlertPolicyRequest`):
489+
request (Union[google.cloud.monitoring_v3.types.DeleteAlertPolicyRequest, dict]):
488490
The request object. The protocol for the
489491
`DeleteAlertPolicy` request.
490492
name (:class:`str`):
@@ -553,11 +555,11 @@ async def delete_alert_policy(
553555

554556
async def update_alert_policy(
555557
self,
556-
request: alert_service.UpdateAlertPolicyRequest = None,
558+
request: Union[alert_service.UpdateAlertPolicyRequest, dict] = None,
557559
*,
558560
update_mask: field_mask_pb2.FieldMask = None,
559561
alert_policy: alert.AlertPolicy = None,
560-
retry: retries.Retry = gapic_v1.method.DEFAULT,
562+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
561563
timeout: float = None,
562564
metadata: Sequence[Tuple[str, str]] = (),
563565
) -> alert.AlertPolicy:
@@ -567,7 +569,7 @@ async def update_alert_policy(
567569
via ``updateMask``. Returns the updated alerting policy.
568570
569571
Args:
570-
request (:class:`google.cloud.monitoring_v3.types.UpdateAlertPolicyRequest`):
572+
request (Union[google.cloud.monitoring_v3.types.UpdateAlertPolicyRequest, dict]):
571573
The request object. The protocol for the
572574
`UpdateAlertPolicy` request.
573575
update_mask (:class:`google.protobuf.field_mask_pb2.FieldMask`):

‎google/cloud/monitoring_v3/services/alert_policy_service/client.py‎

Lines changed: 7 additions & 5 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.cloud.monitoring_v3.services.alert_policy_service import pagers
3436
from google.cloud.monitoring_v3.types import alert
3537
from google.cloud.monitoring_v3.types import alert_service
@@ -385,7 +387,7 @@ def list_alert_policies(
385387
request: Union[alert_service.ListAlertPoliciesRequest, dict] = None,
386388
*,
387389
name: str = None,
388-
retry: retries.Retry = gapic_v1.method.DEFAULT,
390+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
389391
timeout: float = None,
390392
metadata: Sequence[Tuple[str, str]] = (),
391393
) -> pagers.ListAlertPoliciesPager:
@@ -476,7 +478,7 @@ def get_alert_policy(
476478
request: Union[alert_service.GetAlertPolicyRequest, dict] = None,
477479
*,
478480
name: str = None,
479-
retry: retries.Retry = gapic_v1.method.DEFAULT,
481+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
480482
timeout: float = None,
481483
metadata: Sequence[Tuple[str, str]] = (),
482484
) -> alert.AlertPolicy:
@@ -555,7 +557,7 @@ def create_alert_policy(
555557
*,
556558
name: str = None,
557559
alert_policy: alert.AlertPolicy = None,
558-
retry: retries.Retry = gapic_v1.method.DEFAULT,
560+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
559561
timeout: float = None,
560562
metadata: Sequence[Tuple[str, str]] = (),
561563
) -> alert.AlertPolicy:
@@ -655,7 +657,7 @@ def delete_alert_policy(
655657
request: Union[alert_service.DeleteAlertPolicyRequest, dict] = None,
656658
*,
657659
name: str = None,
658-
retry: retries.Retry = gapic_v1.method.DEFAULT,
660+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
659661
timeout: float = None,
660662
metadata: Sequence[Tuple[str, str]] = (),
661663
) -> None:
@@ -726,7 +728,7 @@ def update_alert_policy(
726728
*,
727729
update_mask: field_mask_pb2.FieldMask = None,
728730
alert_policy: alert.AlertPolicy = None,
729-
retry: retries.Retry = gapic_v1.method.DEFAULT,
731+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
730732
timeout: float = None,
731733
metadata: Sequence[Tuple[str, str]] = (),
732734
) -> alert.AlertPolicy:

‎google/cloud/monitoring_v3/services/alert_policy_service/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
@@ -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 AlertPolicyServiceTransport(abc.ABC):
5343
"""Abstract transport class for AlertPolicyService."""
@@ -101,7 +91,7 @@ def __init__(
10191
host += ":443"
10292
self._host = host
10393

104-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
94+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10595

10696
# Save the scopes.
10797
self._scopes = scopes
@@ -134,29 +124,6 @@ def __init__(
134124
# Save the credentials.
135125
self._credentials = credentials
136126

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

‎google/cloud/monitoring_v3/services/alert_policy_service/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

‎google/cloud/monitoring_v3/services/group_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 import monitored_resource_pb2 # type: ignore
3032
from google.cloud.monitoring_v3.services.group_service import pagers
3133
from google.cloud.monitoring_v3.types import group
@@ -174,17 +176,17 @@ def __init__(
174176

175177
async def list_groups(
176178
self,
177-
request: group_service.ListGroupsRequest = None,
179+
request: Union[group_service.ListGroupsRequest, dict] = None,
178180
*,
179181
name: str = None,
180-
retry: retries.Retry = gapic_v1.method.DEFAULT,
182+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
181183
timeout: float = None,
182184
metadata: Sequence[Tuple[str, str]] = (),
183185
) -> pagers.ListGroupsAsyncPager:
184186
r"""Lists the existing groups.
185187
186188
Args:
187-
request (:class:`google.cloud.monitoring_v3.types.ListGroupsRequest`):
189+
request (Union[google.cloud.monitoring_v3.types.ListGroupsRequest, dict]):
188190
The request object. The `ListGroup` request.
189191
name (:class:`str`):
190192
Required. The
@@ -266,17 +268,17 @@ async def list_groups(
266268

267269
async def get_group(
268270
self,
269-
request: group_service.GetGroupRequest = None,
271+
request: Union[group_service.GetGroupRequest, dict] = None,
270272
*,
271273
name: str = None,
272-
retry: retries.Retry = gapic_v1.method.DEFAULT,
274+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
273275
timeout: float = None,
274276
metadata: Sequence[Tuple[str, str]] = (),
275277
) -> group.Group:
276278
r"""Gets a single group.
277279
278280
Args:
279-
request (:class:`google.cloud.monitoring_v3.types.GetGroupRequest`):
281+
request (Union[google.cloud.monitoring_v3.types.GetGroupRequest, dict]):
280282
The request object. The `GetGroup` request.
281283
name (:class:`str`):
282284
Required. The group to retrieve. The format is:
@@ -379,18 +381,18 @@ async def get_group(
379381

380382
async def create_group(
381383
self,
382-
request: group_service.CreateGroupRequest = None,
384+
request: Union[group_service.CreateGroupRequest, dict] = None,
383385
*,
384386
name: str = None,
385387
group: gm_group.Group = None,
386-
retry: retries.Retry = gapic_v1.method.DEFAULT,
388+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
387389
timeout: float = None,
388390
metadata: Sequence[Tuple[str, str]] = (),
389391
) -> gm_group.Group:
390392
r"""Creates a new group.
391393
392394
Args:
393-
request (:class:`google.cloud.monitoring_v3.types.CreateGroupRequest`):
395+
request (Union[google.cloud.monitoring_v3.types.CreateGroupRequest, dict]):
394396
The request object. The `CreateGroup` request.
395397
name (:class:`str`):
396398
Required. The
@@ -495,18 +497,18 @@ async def create_group(
495497

496498
async def update_group(
497499
self,
498-
request: group_service.UpdateGroupRequest = None,
500+
request: Union[group_service.UpdateGroupRequest, dict] = None,
499501
*,
500502
group: gm_group.Group = None,
501-
retry: retries.Retry = gapic_v1.method.DEFAULT,
503+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
502504
timeout: float = None,
503505
metadata: Sequence[Tuple[str, str]] = (),
504506
) -> gm_group.Group:
505507
r"""Updates an existing group. You can change any group attributes
506508
except ``name``.
507509
508510
Args:
509-
request (:class:`google.cloud.monitoring_v3.types.UpdateGroupRequest`):
511+
request (Union[google.cloud.monitoring_v3.types.UpdateGroupRequest, dict]):
510512
The request object. The `UpdateGroup` request.
511513
group (:class:`google.cloud.monitoring_v3.types.Group`):
512514
Required. The new definition of the group. All fields of
@@ -609,17 +611,17 @@ async def update_group(
609611

610612
async def delete_group(
611613
self,
612-
request: group_service.DeleteGroupRequest = None,
614+
request: Union[group_service.DeleteGroupRequest, dict] = None,
613615
*,
614616
name: str = None,
615-
retry: retries.Retry = gapic_v1.method.DEFAULT,
617+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
616618
timeout: float = None,
617619
metadata: Sequence[Tuple[str, str]] = (),
618620
) -> None:
619621
r"""Deletes an existing group.
620622
621623
Args:
622-
request (:class:`google.cloud.monitoring_v3.types.DeleteGroupRequest`):
624+
request (Union[google.cloud.monitoring_v3.types.DeleteGroupRequest, dict]):
623625
The request object. The `DeleteGroup` request. The
624626
default behavior is to be able to delete a single group
625627
without any descendants.
@@ -686,18 +688,18 @@ async def delete_group(
686688

687689
async def list_group_members(
688690
self,
689-
request: group_service.ListGroupMembersRequest = None,
691+
request: Union[group_service.ListGroupMembersRequest, dict] = None,
690692
*,
691693
name: str = None,
692-
retry: retries.Retry = gapic_v1.method.DEFAULT,
694+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
693695
timeout: float = None,
694696
metadata: Sequence[Tuple[str, str]] = (),
695697
) -> pagers.ListGroupMembersAsyncPager:
696698
r"""Lists the monitored resources that are members of a
697699
group.
698700
699701
Args:
700-
request (:class:`google.cloud.monitoring_v3.types.ListGroupMembersRequest`):
702+
request (Union[google.cloud.monitoring_v3.types.ListGroupMembersRequest, dict]):
701703
The request object. The `ListGroupMembers` request.
702704
name (:class:`str`):
703705
Required. The group whose members are listed. The format

0 commit comments

Comments
 (0)