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

Commit 339c62c

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#114)
- [ ] 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 4ee9db9 commit 339c62c

11 files changed

Lines changed: 226 additions & 268 deletions

File tree

‎google/cloud/channel_v1/services/cloud_channel_service/async_client.py‎

Lines changed: 108 additions & 106 deletions
Large diffs are not rendered by default.

‎google/cloud/channel_v1/services/cloud_channel_service/client.py‎

Lines changed: 37 additions & 35 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.channel_v1.services.cloud_channel_service import pagers
@@ -450,7 +452,7 @@ def list_customers(
450452
self,
451453
request: Union[service.ListCustomersRequest, dict] = None,
452454
*,
453-
retry: retries.Retry = gapic_v1.method.DEFAULT,
455+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
454456
timeout: float = None,
455457
metadata: Sequence[Tuple[str, str]] = (),
456458
) -> pagers.ListCustomersPager:
@@ -521,7 +523,7 @@ def get_customer(
521523
request: Union[service.GetCustomerRequest, dict] = None,
522524
*,
523525
name: str = None,
524-
retry: retries.Retry = gapic_v1.method.DEFAULT,
526+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
525527
timeout: float = None,
526528
metadata: Sequence[Tuple[str, str]] = (),
527529
) -> customers.Customer:
@@ -605,7 +607,7 @@ def check_cloud_identity_accounts_exist(
605607
self,
606608
request: Union[service.CheckCloudIdentityAccountsExistRequest, dict] = None,
607609
*,
608-
retry: retries.Retry = gapic_v1.method.DEFAULT,
610+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
609611
timeout: float = None,
610612
metadata: Sequence[Tuple[str, str]] = (),
611613
) -> service.CheckCloudIdentityAccountsExistResponse:
@@ -676,7 +678,7 @@ def create_customer(
676678
self,
677679
request: Union[service.CreateCustomerRequest, dict] = None,
678680
*,
679-
retry: retries.Retry = gapic_v1.method.DEFAULT,
681+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
680682
timeout: float = None,
681683
metadata: Sequence[Tuple[str, str]] = (),
682684
) -> customers.Customer:
@@ -739,7 +741,7 @@ def update_customer(
739741
self,
740742
request: Union[service.UpdateCustomerRequest, dict] = None,
741743
*,
742-
retry: retries.Retry = gapic_v1.method.DEFAULT,
744+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
743745
timeout: float = None,
744746
metadata: Sequence[Tuple[str, str]] = (),
745747
) -> customers.Customer:
@@ -805,7 +807,7 @@ def delete_customer(
805807
request: Union[service.DeleteCustomerRequest, dict] = None,
806808
*,
807809
name: str = None,
808-
retry: retries.Retry = gapic_v1.method.DEFAULT,
810+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
809811
timeout: float = None,
810812
metadata: Sequence[Tuple[str, str]] = (),
811813
) -> None:
@@ -879,7 +881,7 @@ def import_customer(
879881
self,
880882
request: Union[service.ImportCustomerRequest, dict] = None,
881883
*,
882-
retry: retries.Retry = gapic_v1.method.DEFAULT,
884+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
883885
timeout: float = None,
884886
metadata: Sequence[Tuple[str, str]] = (),
885887
) -> customers.Customer:
@@ -945,7 +947,7 @@ def provision_cloud_identity(
945947
self,
946948
request: Union[service.ProvisionCloudIdentityRequest, dict] = None,
947949
*,
948-
retry: retries.Retry = gapic_v1.method.DEFAULT,
950+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
949951
timeout: float = None,
950952
metadata: Sequence[Tuple[str, str]] = (),
951953
) -> operation.Operation:
@@ -1028,7 +1030,7 @@ def list_entitlements(
10281030
self,
10291031
request: Union[service.ListEntitlementsRequest, dict] = None,
10301032
*,
1031-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1033+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10321034
timeout: float = None,
10331035
metadata: Sequence[Tuple[str, str]] = (),
10341036
) -> pagers.ListEntitlementsPager:
@@ -1098,7 +1100,7 @@ def list_transferable_skus(
10981100
self,
10991101
request: Union[service.ListTransferableSkusRequest, dict] = None,
11001102
*,
1101-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1103+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11021104
timeout: float = None,
11031105
metadata: Sequence[Tuple[str, str]] = (),
11041106
) -> pagers.ListTransferableSkusPager:
@@ -1179,7 +1181,7 @@ def list_transferable_offers(
11791181
self,
11801182
request: Union[service.ListTransferableOffersRequest, dict] = None,
11811183
*,
1182-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1184+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11831185
timeout: float = None,
11841186
metadata: Sequence[Tuple[str, str]] = (),
11851187
) -> pagers.ListTransferableOffersPager:
@@ -1262,7 +1264,7 @@ def get_entitlement(
12621264
self,
12631265
request: Union[service.GetEntitlementRequest, dict] = None,
12641266
*,
1265-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1267+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12661268
timeout: float = None,
12671269
metadata: Sequence[Tuple[str, str]] = (),
12681270
) -> entitlements.Entitlement:
@@ -1324,7 +1326,7 @@ def create_entitlement(
13241326
self,
13251327
request: Union[service.CreateEntitlementRequest, dict] = None,
13261328
*,
1327-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1329+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13281330
timeout: float = None,
13291331
metadata: Sequence[Tuple[str, str]] = (),
13301332
) -> operation.Operation:
@@ -1430,7 +1432,7 @@ def change_parameters(
14301432
self,
14311433
request: Union[service.ChangeParametersRequest, dict] = None,
14321434
*,
1433-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1435+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14341436
timeout: float = None,
14351437
metadata: Sequence[Tuple[str, str]] = (),
14361438
) -> operation.Operation:
@@ -1516,7 +1518,7 @@ def change_renewal_settings(
15161518
self,
15171519
request: Union[service.ChangeRenewalSettingsRequest, dict] = None,
15181520
*,
1519-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1521+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15201522
timeout: float = None,
15211523
metadata: Sequence[Tuple[str, str]] = (),
15221524
) -> operation.Operation:
@@ -1604,7 +1606,7 @@ def change_offer(
16041606
self,
16051607
request: Union[service.ChangeOfferRequest, dict] = None,
16061608
*,
1607-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1609+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16081610
timeout: float = None,
16091611
metadata: Sequence[Tuple[str, str]] = (),
16101612
) -> operation.Operation:
@@ -1688,7 +1690,7 @@ def start_paid_service(
16881690
self,
16891691
request: Union[service.StartPaidServiceRequest, dict] = None,
16901692
*,
1691-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1693+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16921694
timeout: float = None,
16931695
metadata: Sequence[Tuple[str, str]] = (),
16941696
) -> operation.Operation:
@@ -1775,7 +1777,7 @@ def suspend_entitlement(
17751777
self,
17761778
request: Union[service.SuspendEntitlementRequest, dict] = None,
17771779
*,
1778-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1780+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17791781
timeout: float = None,
17801782
metadata: Sequence[Tuple[str, str]] = (),
17811783
) -> operation.Operation:
@@ -1859,7 +1861,7 @@ def cancel_entitlement(
18591861
self,
18601862
request: Union[service.CancelEntitlementRequest, dict] = None,
18611863
*,
1862-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1864+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18631865
timeout: float = None,
18641866
metadata: Sequence[Tuple[str, str]] = (),
18651867
) -> operation.Operation:
@@ -1957,7 +1959,7 @@ def activate_entitlement(
19571959
self,
19581960
request: Union[service.ActivateEntitlementRequest, dict] = None,
19591961
*,
1960-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1962+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19611963
timeout: float = None,
19621964
metadata: Sequence[Tuple[str, str]] = (),
19631965
) -> operation.Operation:
@@ -2048,7 +2050,7 @@ def transfer_entitlements(
20482050
self,
20492051
request: Union[service.TransferEntitlementsRequest, dict] = None,
20502052
*,
2051-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2053+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20522054
timeout: float = None,
20532055
metadata: Sequence[Tuple[str, str]] = (),
20542056
) -> operation.Operation:
@@ -2144,7 +2146,7 @@ def transfer_entitlements_to_google(
21442146
self,
21452147
request: Union[service.TransferEntitlementsToGoogleRequest, dict] = None,
21462148
*,
2147-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2149+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21482150
timeout: float = None,
21492151
metadata: Sequence[Tuple[str, str]] = (),
21502152
) -> operation.Operation:
@@ -2252,7 +2254,7 @@ def list_channel_partner_links(
22522254
self,
22532255
request: Union[service.ListChannelPartnerLinksRequest, dict] = None,
22542256
*,
2255-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2257+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22562258
timeout: float = None,
22572259
metadata: Sequence[Tuple[str, str]] = (),
22582260
) -> pagers.ListChannelPartnerLinksPager:
@@ -2327,7 +2329,7 @@ def get_channel_partner_link(
23272329
self,
23282330
request: Union[service.GetChannelPartnerLinkRequest, dict] = None,
23292331
*,
2330-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2332+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23312333
timeout: float = None,
23322334
metadata: Sequence[Tuple[str, str]] = (),
23332335
) -> channel_partner_links.ChannelPartnerLink:
@@ -2393,7 +2395,7 @@ def create_channel_partner_link(
23932395
self,
23942396
request: Union[service.CreateChannelPartnerLinkRequest, dict] = None,
23952397
*,
2396-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2398+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23972399
timeout: float = None,
23982400
metadata: Sequence[Tuple[str, str]] = (),
23992401
) -> channel_partner_links.ChannelPartnerLink:
@@ -2470,7 +2472,7 @@ def update_channel_partner_link(
24702472
self,
24712473
request: Union[service.UpdateChannelPartnerLinkRequest, dict] = None,
24722474
*,
2473-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2475+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24742476
timeout: float = None,
24752477
metadata: Sequence[Tuple[str, str]] = (),
24762478
) -> channel_partner_links.ChannelPartnerLink:
@@ -2547,7 +2549,7 @@ def lookup_offer(
25472549
self,
25482550
request: Union[service.LookupOfferRequest, dict] = None,
25492551
*,
2550-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2552+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25512553
timeout: float = None,
25522554
metadata: Sequence[Tuple[str, str]] = (),
25532555
) -> offers.Offer:
@@ -2613,7 +2615,7 @@ def list_products(
26132615
self,
26142616
request: Union[service.ListProductsRequest, dict] = None,
26152617
*,
2616-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2618+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26172619
timeout: float = None,
26182620
metadata: Sequence[Tuple[str, str]] = (),
26192621
) -> pagers.ListProductsPager:
@@ -2669,7 +2671,7 @@ def list_skus(
26692671
self,
26702672
request: Union[service.ListSkusRequest, dict] = None,
26712673
*,
2672-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2674+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26732675
timeout: float = None,
26742676
metadata: Sequence[Tuple[str, str]] = (),
26752677
) -> pagers.ListSkusPager:
@@ -2731,7 +2733,7 @@ def list_offers(
27312733
self,
27322734
request: Union[service.ListOffersRequest, dict] = None,
27332735
*,
2734-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2736+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27352737
timeout: float = None,
27362738
metadata: Sequence[Tuple[str, str]] = (),
27372739
) -> pagers.ListOffersPager:
@@ -2793,7 +2795,7 @@ def list_purchasable_skus(
27932795
self,
27942796
request: Union[service.ListPurchasableSkusRequest, dict] = None,
27952797
*,
2796-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2798+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27972799
timeout: float = None,
27982800
metadata: Sequence[Tuple[str, str]] = (),
27992801
) -> pagers.ListPurchasableSkusPager:
@@ -2862,7 +2864,7 @@ def list_purchasable_offers(
28622864
self,
28632865
request: Union[service.ListPurchasableOffersRequest, dict] = None,
28642866
*,
2865-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2867+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28662868
timeout: float = None,
28672869
metadata: Sequence[Tuple[str, str]] = (),
28682870
) -> pagers.ListPurchasableOffersPager:
@@ -2931,7 +2933,7 @@ def register_subscriber(
29312933
self,
29322934
request: Union[service.RegisterSubscriberRequest, dict] = None,
29332935
*,
2934-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2936+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29352937
timeout: float = None,
29362938
metadata: Sequence[Tuple[str, str]] = (),
29372939
) -> service.RegisterSubscriberResponse:
@@ -2999,7 +3001,7 @@ def unregister_subscriber(
29993001
self,
30003002
request: Union[service.UnregisterSubscriberRequest, dict] = None,
30013003
*,
3002-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3004+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30033005
timeout: float = None,
30043006
metadata: Sequence[Tuple[str, str]] = (),
30053007
) -> service.UnregisterSubscriberResponse:
@@ -3070,7 +3072,7 @@ def list_subscribers(
30703072
self,
30713073
request: Union[service.ListSubscribersRequest, dict] = None,
30723074
*,
3073-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3075+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30743076
timeout: float = None,
30753077
metadata: Sequence[Tuple[str, str]] = (),
30763078
) -> pagers.ListSubscribersPager:

‎google/cloud/channel_v1/services/cloud_channel_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
@@ -42,15 +41,6 @@
4241
except pkg_resources.DistributionNotFound:
4342
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4443

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

5545
class CloudChannelServiceTransport(abc.ABC):
5646
"""Abstract transport class for CloudChannelService."""
@@ -100,7 +90,7 @@ def __init__(
10090
host += ":443"
10191
self._host = host
10292

103-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
93+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10494

10595
# Save the scopes.
10696
self._scopes = scopes
@@ -133,29 +123,6 @@ def __init__(
133123
# Save the credentials.
134124
self._credentials = credentials
135125

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

308275
@property
309-
def operations_client(self) -> operations_v1.OperationsClient:
276+
def operations_client(self):
310277
"""Return the client designed to process long-running operations."""
311278
raise NotImplementedError()
312279

0 commit comments

Comments
 (0)