From 339c62c4a1b491bd86bb70530376b65183a2b7d4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 14:56:12 +0000 Subject: [PATCH] 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: https://github.com/googleapis/googleapis/commit/83d81b0c8fc22291a13398d6d77f02dc97a5b6f4 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9 --- .../cloud_channel_service/async_client.py | 214 +++++++++--------- .../services/cloud_channel_service/client.py | 72 +++--- .../cloud_channel_service/transports/base.py | 37 +-- .../cloud_channel_service/transports/grpc.py | 2 +- .../transports/grpc_asyncio.py | 3 +- google/cloud/channel_v1/types/common.py | 12 + google/cloud/channel_v1/types/service.py | 45 ++++ .../channel_v1/types/subscriber_event.py | 9 + setup.py | 3 +- testing/constraints-3.6.txt | 6 +- .../channel_v1/test_cloud_channel_service.py | 91 +------- 11 files changed, 226 insertions(+), 268 deletions(-) diff --git a/google/cloud/channel_v1/services/cloud_channel_service/async_client.py b/google/cloud/channel_v1/services/cloud_channel_service/async_client.py index faa6f62..283f05e 100644 --- a/google/cloud/channel_v1/services/cloud_channel_service/async_client.py +++ b/google/cloud/channel_v1/services/cloud_channel_service/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import pagers @@ -215,9 +217,9 @@ def __init__( async def list_customers( self, - request: service.ListCustomersRequest = None, + request: Union[service.ListCustomersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCustomersAsyncPager: @@ -235,7 +237,7 @@ async def list_customers( if there are no customers. Args: - request (:class:`google.cloud.channel_v1.types.ListCustomersRequest`): + request (Union[google.cloud.channel_v1.types.ListCustomersRequest, dict]): The request object. Request message for [CloudChannelService.ListCustomers][google.cloud.channel.v1.CloudChannelService.ListCustomers] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -284,10 +286,10 @@ async def list_customers( async def get_customer( self, - request: service.GetCustomerRequest = None, + request: Union[service.GetCustomerRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -307,7 +309,7 @@ async def get_customer( resource. Args: - request (:class:`google.cloud.channel_v1.types.GetCustomerRequest`): + request (Union[google.cloud.channel_v1.types.GetCustomerRequest, dict]): The request object. Request message for [CloudChannelService.GetCustomer][google.cloud.channel.v1.CloudChannelService.GetCustomer]. name (:class:`str`): @@ -369,9 +371,9 @@ async def get_customer( async def check_cloud_identity_accounts_exist( self, - request: service.CheckCloudIdentityAccountsExistRequest = None, + request: Union[service.CheckCloudIdentityAccountsExistRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.CheckCloudIdentityAccountsExistResponse: @@ -397,7 +399,7 @@ async def check_cloud_identity_accounts_exist( resources match the domain. Args: - request (:class:`google.cloud.channel_v1.types.CheckCloudIdentityAccountsExistRequest`): + request (Union[google.cloud.channel_v1.types.CheckCloudIdentityAccountsExistRequest, dict]): The request object. Request message for [CloudChannelService.CheckCloudIdentityAccountsExist][google.cloud.channel.v1.CloudChannelService.CheckCloudIdentityAccountsExist]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -437,9 +439,9 @@ async def check_cloud_identity_accounts_exist( async def create_customer( self, - request: service.CreateCustomerRequest = None, + request: Union[service.CreateCustomerRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -459,7 +461,7 @@ async def create_customer( [Customer][google.cloud.channel.v1.Customer] resource. Args: - request (:class:`google.cloud.channel_v1.types.CreateCustomerRequest`): + request (Union[google.cloud.channel_v1.types.CreateCustomerRequest, dict]): The request object. Request message for [CloudChannelService.CreateCustomer][google.cloud.channel.v1.CloudChannelService.CreateCustomer] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -499,9 +501,9 @@ async def create_customer( async def update_customer( self, - request: service.UpdateCustomerRequest = None, + request: Union[service.UpdateCustomerRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -521,7 +523,7 @@ async def update_customer( [Customer][google.cloud.channel.v1.Customer] resource. Args: - request (:class:`google.cloud.channel_v1.types.UpdateCustomerRequest`): + request (Union[google.cloud.channel_v1.types.UpdateCustomerRequest, dict]): The request object. Request message for [CloudChannelService.UpdateCustomer][google.cloud.channel.v1.CloudChannelService.UpdateCustomer]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -563,10 +565,10 @@ async def update_customer( async def delete_customer( self, - request: service.DeleteCustomerRequest = None, + request: Union[service.DeleteCustomerRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -584,7 +586,7 @@ async def delete_customer( resource found for the name in the request. Args: - request (:class:`google.cloud.channel_v1.types.DeleteCustomerRequest`): + request (Union[google.cloud.channel_v1.types.DeleteCustomerRequest, dict]): The request object. Request message for [CloudChannelService.DeleteCustomer][google.cloud.channel.v1.CloudChannelService.DeleteCustomer]. name (:class:`str`): @@ -638,9 +640,9 @@ async def delete_customer( async def import_customer( self, - request: service.ImportCustomerRequest = None, + request: Union[service.ImportCustomerRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -663,7 +665,7 @@ async def import_customer( Return value: The [Customer][google.cloud.channel.v1.Customer]. Args: - request (:class:`google.cloud.channel_v1.types.ImportCustomerRequest`): + request (Union[google.cloud.channel_v1.types.ImportCustomerRequest, dict]): The request object. Request message for [CloudChannelService.ImportCustomer][google.cloud.channel.v1.CloudChannelService.ImportCustomer] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -703,9 +705,9 @@ async def import_customer( async def provision_cloud_identity( self, - request: service.ProvisionCloudIdentityRequest = None, + request: Union[service.ProvisionCloudIdentityRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -734,7 +736,7 @@ async def provision_cloud_identity( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.ProvisionCloudIdentityRequest`): + request (Union[google.cloud.channel_v1.types.ProvisionCloudIdentityRequest, dict]): The request object. Request message for [CloudChannelService.ProvisionCloudIdentity][google.cloud.channel.v1.CloudChannelService.ProvisionCloudIdentity] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -785,9 +787,9 @@ async def provision_cloud_identity( async def list_entitlements( self, - request: service.ListEntitlementsRequest = None, + request: Union[service.ListEntitlementsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntitlementsAsyncPager: @@ -805,7 +807,7 @@ async def list_entitlements( [Entitlement][google.cloud.channel.v1.Entitlement]s. Args: - request (:class:`google.cloud.channel_v1.types.ListEntitlementsRequest`): + request (Union[google.cloud.channel_v1.types.ListEntitlementsRequest, dict]): The request object. Request message for [CloudChannelService.ListEntitlements][google.cloud.channel.v1.CloudChannelService.ListEntitlements] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -854,9 +856,9 @@ async def list_entitlements( async def list_transferable_skus( self, - request: service.ListTransferableSkusRequest = None, + request: Union[service.ListTransferableSkusRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTransferableSkusAsyncPager: @@ -885,7 +887,7 @@ async def list_transferable_skus( [TransferableSku][google.cloud.channel.v1.TransferableSku]. Args: - request (:class:`google.cloud.channel_v1.types.ListTransferableSkusRequest`): + request (Union[google.cloud.channel_v1.types.ListTransferableSkusRequest, dict]): The request object. Request message for [CloudChannelService.ListTransferableSkus][google.cloud.channel.v1.CloudChannelService.ListTransferableSkus] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -934,9 +936,9 @@ async def list_transferable_skus( async def list_transferable_offers( self, - request: service.ListTransferableOffersRequest = None, + request: Union[service.ListTransferableOffersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTransferableOffersAsyncPager: @@ -967,7 +969,7 @@ async def list_transferable_offers( for the given customer and SKU. Args: - request (:class:`google.cloud.channel_v1.types.ListTransferableOffersRequest`): + request (Union[google.cloud.channel_v1.types.ListTransferableOffersRequest, dict]): The request object. Request message for [CloudChannelService.ListTransferableOffers][google.cloud.channel.v1.CloudChannelService.ListTransferableOffers] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1016,9 +1018,9 @@ async def list_transferable_offers( async def get_entitlement( self, - request: service.GetEntitlementRequest = None, + request: Union[service.GetEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> entitlements.Entitlement: @@ -1037,7 +1039,7 @@ async def get_entitlement( [Entitlement][google.cloud.channel.v1.Entitlement] resource. Args: - request (:class:`google.cloud.channel_v1.types.GetEntitlementRequest`): + request (Union[google.cloud.channel_v1.types.GetEntitlementRequest, dict]): The request object. Request message for [CloudChannelService.GetEntitlement][google.cloud.channel.v1.CloudChannelService.GetEntitlement]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1077,9 +1079,9 @@ async def get_entitlement( async def create_entitlement( self, - request: service.CreateEntitlementRequest = None, + request: Union[service.CreateEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1130,7 +1132,7 @@ async def create_entitlement( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.CreateEntitlementRequest`): + request (Union[google.cloud.channel_v1.types.CreateEntitlementRequest, dict]): The request object. Request message for [CloudChannelService.CreateEntitlement][google.cloud.channel.v1.CloudChannelService.CreateEntitlement] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1182,9 +1184,9 @@ async def create_entitlement( async def change_parameters( self, - request: service.ChangeParametersRequest = None, + request: Union[service.ChangeParametersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1215,7 +1217,7 @@ async def change_parameters( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.ChangeParametersRequest`): + request (Union[google.cloud.channel_v1.types.ChangeParametersRequest, dict]): The request object. Request message for [CloudChannelService.ChangeParametersRequest][]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1267,9 +1269,9 @@ async def change_parameters( async def change_renewal_settings( self, - request: service.ChangeRenewalSettingsRequest = None, + request: Union[service.ChangeRenewalSettingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1302,7 +1304,7 @@ async def change_renewal_settings( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.ChangeRenewalSettingsRequest`): + request (Union[google.cloud.channel_v1.types.ChangeRenewalSettingsRequest, dict]): The request object. Request message for [CloudChannelService.ChangeRenewalSettings][google.cloud.channel.v1.CloudChannelService.ChangeRenewalSettings]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1354,9 +1356,9 @@ async def change_renewal_settings( async def change_offer( self, - request: service.ChangeOfferRequest = None, + request: Union[service.ChangeOfferRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1385,7 +1387,7 @@ async def change_offer( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.ChangeOfferRequest`): + request (Union[google.cloud.channel_v1.types.ChangeOfferRequest, dict]): The request object. Request message for [CloudChannelService.ChangeOffer][google.cloud.channel.v1.CloudChannelService.ChangeOffer]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1437,9 +1439,9 @@ async def change_offer( async def start_paid_service( self, - request: service.StartPaidServiceRequest = None, + request: Union[service.StartPaidServiceRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1471,7 +1473,7 @@ async def start_paid_service( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.StartPaidServiceRequest`): + request (Union[google.cloud.channel_v1.types.StartPaidServiceRequest, dict]): The request object. Request message for [CloudChannelService.StartPaidService][google.cloud.channel.v1.CloudChannelService.StartPaidService]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1523,9 +1525,9 @@ async def start_paid_service( async def suspend_entitlement( self, - request: service.SuspendEntitlementRequest = None, + request: Union[service.SuspendEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1554,7 +1556,7 @@ async def suspend_entitlement( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.SuspendEntitlementRequest`): + request (Union[google.cloud.channel_v1.types.SuspendEntitlementRequest, dict]): The request object. Request message for [CloudChannelService.SuspendEntitlement][google.cloud.channel.v1.CloudChannelService.SuspendEntitlement]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1606,9 +1608,9 @@ async def suspend_entitlement( async def cancel_entitlement( self, - request: service.CancelEntitlementRequest = None, + request: Union[service.CancelEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1642,7 +1644,7 @@ async def cancel_entitlement( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.CancelEntitlementRequest`): + request (Union[google.cloud.channel_v1.types.CancelEntitlementRequest, dict]): The request object. Request message for [CloudChannelService.CancelEntitlement][google.cloud.channel.v1.CloudChannelService.CancelEntitlement]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1703,9 +1705,9 @@ async def cancel_entitlement( async def activate_entitlement( self, - request: service.ActivateEntitlementRequest = None, + request: Union[service.ActivateEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1741,7 +1743,7 @@ async def activate_entitlement( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.ActivateEntitlementRequest`): + request (Union[google.cloud.channel_v1.types.ActivateEntitlementRequest, dict]): The request object. Request message for [CloudChannelService.ActivateEntitlement][google.cloud.channel.v1.CloudChannelService.ActivateEntitlement]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1793,9 +1795,9 @@ async def activate_entitlement( async def transfer_entitlements( self, - request: service.TransferEntitlementsRequest = None, + request: Union[service.TransferEntitlementsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1837,7 +1839,7 @@ async def transfer_entitlements( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.TransferEntitlementsRequest`): + request (Union[google.cloud.channel_v1.types.TransferEntitlementsRequest, dict]): The request object. Request message for [CloudChannelService.TransferEntitlements][google.cloud.channel.v1.CloudChannelService.TransferEntitlements]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1888,9 +1890,9 @@ async def transfer_entitlements( async def transfer_entitlements_to_google( self, - request: service.TransferEntitlementsToGoogleRequest = None, + request: Union[service.TransferEntitlementsToGoogleRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1932,7 +1934,7 @@ async def transfer_entitlements_to_google( [OperationMetadata][google.cloud.channel.v1.OperationMetadata]. Args: - request (:class:`google.cloud.channel_v1.types.TransferEntitlementsToGoogleRequest`): + request (Union[google.cloud.channel_v1.types.TransferEntitlementsToGoogleRequest, dict]): The request object. Request message for [CloudChannelService.TransferEntitlementsToGoogle][google.cloud.channel.v1.CloudChannelService.TransferEntitlementsToGoogle]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1993,9 +1995,9 @@ async def transfer_entitlements_to_google( async def list_channel_partner_links( self, - request: service.ListChannelPartnerLinksRequest = None, + request: Union[service.ListChannelPartnerLinksRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListChannelPartnerLinksAsyncPager: @@ -2016,7 +2018,7 @@ async def list_channel_partner_links( resources. Args: - request (:class:`google.cloud.channel_v1.types.ListChannelPartnerLinksRequest`): + request (Union[google.cloud.channel_v1.types.ListChannelPartnerLinksRequest, dict]): The request object. Request message for [CloudChannelService.ListChannelPartnerLinks][google.cloud.channel.v1.CloudChannelService.ListChannelPartnerLinks] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2065,9 +2067,9 @@ async def list_channel_partner_links( async def get_channel_partner_link( self, - request: service.GetChannelPartnerLinkRequest = None, + request: Union[service.GetChannelPartnerLinkRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> channel_partner_links.ChannelPartnerLink: @@ -2089,7 +2091,7 @@ async def get_channel_partner_link( resource. Args: - request (:class:`google.cloud.channel_v1.types.GetChannelPartnerLinkRequest`): + request (Union[google.cloud.channel_v1.types.GetChannelPartnerLinkRequest, dict]): The request object. Request message for [CloudChannelService.GetChannelPartnerLink][google.cloud.channel.v1.CloudChannelService.GetChannelPartnerLink]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2130,9 +2132,9 @@ async def get_channel_partner_link( async def create_channel_partner_link( self, - request: service.CreateChannelPartnerLinkRequest = None, + request: Union[service.CreateChannelPartnerLinkRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> channel_partner_links.ChannelPartnerLink: @@ -2163,7 +2165,7 @@ async def create_channel_partner_link( resource. Args: - request (:class:`google.cloud.channel_v1.types.CreateChannelPartnerLinkRequest`): + request (Union[google.cloud.channel_v1.types.CreateChannelPartnerLinkRequest, dict]): The request object. Request message for [CloudChannelService.CreateChannelPartnerLink][google.cloud.channel.v1.CloudChannelService.CreateChannelPartnerLink] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2204,9 +2206,9 @@ async def create_channel_partner_link( async def update_channel_partner_link( self, - request: service.UpdateChannelPartnerLinkRequest = None, + request: Union[service.UpdateChannelPartnerLinkRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> channel_partner_links.ChannelPartnerLink: @@ -2237,7 +2239,7 @@ async def update_channel_partner_link( resource. Args: - request (:class:`google.cloud.channel_v1.types.UpdateChannelPartnerLinkRequest`): + request (Union[google.cloud.channel_v1.types.UpdateChannelPartnerLinkRequest, dict]): The request object. Request message for [CloudChannelService.UpdateChannelPartnerLink][google.cloud.channel.v1.CloudChannelService.UpdateChannelPartnerLink] retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2278,9 +2280,9 @@ async def update_channel_partner_link( async def lookup_offer( self, - request: service.LookupOfferRequest = None, + request: Union[service.LookupOfferRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> offers.Offer: @@ -2299,7 +2301,7 @@ async def lookup_offer( resource. Args: - request (:class:`google.cloud.channel_v1.types.LookupOfferRequest`): + request (Union[google.cloud.channel_v1.types.LookupOfferRequest, dict]): The request object. Request message for LookupOffer. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -2343,9 +2345,9 @@ async def lookup_offer( async def list_products( self, - request: service.ListProductsRequest = None, + request: Union[service.ListProductsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListProductsAsyncPager: @@ -2357,7 +2359,7 @@ async def list_products( invalid. Args: - request (:class:`google.cloud.channel_v1.types.ListProductsRequest`): + request (Union[google.cloud.channel_v1.types.ListProductsRequest, dict]): The request object. Request message for ListProducts. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -2398,9 +2400,9 @@ async def list_products( async def list_skus( self, - request: service.ListSkusRequest = None, + request: Union[service.ListSkusRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListSkusAsyncPager: @@ -2412,7 +2414,7 @@ async def list_skus( invalid. Args: - request (:class:`google.cloud.channel_v1.types.ListSkusRequest`): + request (Union[google.cloud.channel_v1.types.ListSkusRequest, dict]): The request object. Request message for ListSkus. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -2459,9 +2461,9 @@ async def list_skus( async def list_offers( self, - request: service.ListOffersRequest = None, + request: Union[service.ListOffersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListOffersAsyncPager: @@ -2473,7 +2475,7 @@ async def list_offers( invalid. Args: - request (:class:`google.cloud.channel_v1.types.ListOffersRequest`): + request (Union[google.cloud.channel_v1.types.ListOffersRequest, dict]): The request object. Request message for ListOffers. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -2520,9 +2522,9 @@ async def list_offers( async def list_purchasable_skus( self, - request: service.ListPurchasableSkusRequest = None, + request: Union[service.ListPurchasableSkusRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPurchasableSkusAsyncPager: @@ -2539,7 +2541,7 @@ async def list_purchasable_skus( invalid. Args: - request (:class:`google.cloud.channel_v1.types.ListPurchasableSkusRequest`): + request (Union[google.cloud.channel_v1.types.ListPurchasableSkusRequest, dict]): The request object. Request message for ListPurchasableSkus. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2588,9 +2590,9 @@ async def list_purchasable_skus( async def list_purchasable_offers( self, - request: service.ListPurchasableOffersRequest = None, + request: Union[service.ListPurchasableOffersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPurchasableOffersAsyncPager: @@ -2607,7 +2609,7 @@ async def list_purchasable_offers( invalid. Args: - request (:class:`google.cloud.channel_v1.types.ListPurchasableOffersRequest`): + request (Union[google.cloud.channel_v1.types.ListPurchasableOffersRequest, dict]): The request object. Request message for ListPurchasableOffers. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2656,9 +2658,9 @@ async def list_purchasable_offers( async def register_subscriber( self, - request: service.RegisterSubscriberRequest = None, + request: Union[service.RegisterSubscriberRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.RegisterSubscriberResponse: @@ -2683,7 +2685,7 @@ async def register_subscriber( address. Args: - request (:class:`google.cloud.channel_v1.types.RegisterSubscriberRequest`): + request (Union[google.cloud.channel_v1.types.RegisterSubscriberRequest, dict]): The request object. Request Message for RegisterSubscriber. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2723,9 +2725,9 @@ async def register_subscriber( async def unregister_subscriber( self, - request: service.UnregisterSubscriberRequest = None, + request: Union[service.UnregisterSubscriberRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.UnregisterSubscriberResponse: @@ -2753,7 +2755,7 @@ async def unregister_subscriber( wasn't registered with the topic. Args: - request (:class:`google.cloud.channel_v1.types.UnregisterSubscriberRequest`): + request (Union[google.cloud.channel_v1.types.UnregisterSubscriberRequest, dict]): The request object. Request Message for UnregisterSubscriber. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2793,9 +2795,9 @@ async def unregister_subscriber( async def list_subscribers( self, - request: service.ListSubscribersRequest = None, + request: Union[service.ListSubscribersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListSubscribersAsyncPager: @@ -2818,7 +2820,7 @@ async def list_subscribers( Return value: A list of service email addresses. Args: - request (:class:`google.cloud.channel_v1.types.ListSubscribersRequest`): + request (Union[google.cloud.channel_v1.types.ListSubscribersRequest, dict]): The request object. Request Message for ListSubscribers. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. diff --git a/google/cloud/channel_v1/services/cloud_channel_service/client.py b/google/cloud/channel_v1/services/cloud_channel_service/client.py index 1d24eac..91961d8 100644 --- a/google/cloud/channel_v1/services/cloud_channel_service/client.py +++ b/google/cloud/channel_v1/services/cloud_channel_service/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import pagers @@ -450,7 +452,7 @@ def list_customers( self, request: Union[service.ListCustomersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCustomersPager: @@ -521,7 +523,7 @@ def get_customer( request: Union[service.GetCustomerRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -605,7 +607,7 @@ def check_cloud_identity_accounts_exist( self, request: Union[service.CheckCloudIdentityAccountsExistRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.CheckCloudIdentityAccountsExistResponse: @@ -676,7 +678,7 @@ def create_customer( self, request: Union[service.CreateCustomerRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -739,7 +741,7 @@ def update_customer( self, request: Union[service.UpdateCustomerRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -805,7 +807,7 @@ def delete_customer( request: Union[service.DeleteCustomerRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -879,7 +881,7 @@ def import_customer( self, request: Union[service.ImportCustomerRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> customers.Customer: @@ -945,7 +947,7 @@ def provision_cloud_identity( self, request: Union[service.ProvisionCloudIdentityRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1028,7 +1030,7 @@ def list_entitlements( self, request: Union[service.ListEntitlementsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListEntitlementsPager: @@ -1098,7 +1100,7 @@ def list_transferable_skus( self, request: Union[service.ListTransferableSkusRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTransferableSkusPager: @@ -1179,7 +1181,7 @@ def list_transferable_offers( self, request: Union[service.ListTransferableOffersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTransferableOffersPager: @@ -1262,7 +1264,7 @@ def get_entitlement( self, request: Union[service.GetEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> entitlements.Entitlement: @@ -1324,7 +1326,7 @@ def create_entitlement( self, request: Union[service.CreateEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1430,7 +1432,7 @@ def change_parameters( self, request: Union[service.ChangeParametersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1516,7 +1518,7 @@ def change_renewal_settings( self, request: Union[service.ChangeRenewalSettingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1604,7 +1606,7 @@ def change_offer( self, request: Union[service.ChangeOfferRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1688,7 +1690,7 @@ def start_paid_service( self, request: Union[service.StartPaidServiceRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1775,7 +1777,7 @@ def suspend_entitlement( self, request: Union[service.SuspendEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1859,7 +1861,7 @@ def cancel_entitlement( self, request: Union[service.CancelEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1957,7 +1959,7 @@ def activate_entitlement( self, request: Union[service.ActivateEntitlementRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2048,7 +2050,7 @@ def transfer_entitlements( self, request: Union[service.TransferEntitlementsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2144,7 +2146,7 @@ def transfer_entitlements_to_google( self, request: Union[service.TransferEntitlementsToGoogleRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2252,7 +2254,7 @@ def list_channel_partner_links( self, request: Union[service.ListChannelPartnerLinksRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListChannelPartnerLinksPager: @@ -2327,7 +2329,7 @@ def get_channel_partner_link( self, request: Union[service.GetChannelPartnerLinkRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> channel_partner_links.ChannelPartnerLink: @@ -2393,7 +2395,7 @@ def create_channel_partner_link( self, request: Union[service.CreateChannelPartnerLinkRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> channel_partner_links.ChannelPartnerLink: @@ -2470,7 +2472,7 @@ def update_channel_partner_link( self, request: Union[service.UpdateChannelPartnerLinkRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> channel_partner_links.ChannelPartnerLink: @@ -2547,7 +2549,7 @@ def lookup_offer( self, request: Union[service.LookupOfferRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> offers.Offer: @@ -2613,7 +2615,7 @@ def list_products( self, request: Union[service.ListProductsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListProductsPager: @@ -2669,7 +2671,7 @@ def list_skus( self, request: Union[service.ListSkusRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListSkusPager: @@ -2731,7 +2733,7 @@ def list_offers( self, request: Union[service.ListOffersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListOffersPager: @@ -2793,7 +2795,7 @@ def list_purchasable_skus( self, request: Union[service.ListPurchasableSkusRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPurchasableSkusPager: @@ -2862,7 +2864,7 @@ def list_purchasable_offers( self, request: Union[service.ListPurchasableOffersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPurchasableOffersPager: @@ -2931,7 +2933,7 @@ def register_subscriber( self, request: Union[service.RegisterSubscriberRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.RegisterSubscriberResponse: @@ -2999,7 +3001,7 @@ def unregister_subscriber( self, request: Union[service.UnregisterSubscriberRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.UnregisterSubscriberResponse: @@ -3070,7 +3072,7 @@ def list_subscribers( self, request: Union[service.ListSubscribersRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListSubscribersPager: diff --git a/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py b/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py index e0f2d36..4aae901 100644 --- a/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py +++ b/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -42,15 +41,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class CloudChannelServiceTransport(abc.ABC): """Abstract transport class for CloudChannelService.""" @@ -100,7 +90,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -133,29 +123,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { @@ -306,7 +273,7 @@ def close(self): raise NotImplementedError() @property - def operations_client(self) -> operations_v1.OperationsClient: + def operations_client(self): """Return the client designed to process long-running operations.""" raise NotImplementedError() diff --git a/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py b/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py index 6339fa7..eee7924 100644 --- a/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py +++ b/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py @@ -139,7 +139,7 @@ def __init__( self._grpc_channel = None self._ssl_channel_credentials = ssl_channel_credentials self._stubs: Dict[str, Callable] = {} - self._operations_client = None + self._operations_client: Optional[operations_v1.OperationsClient] = None if api_mtls_endpoint: warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning) diff --git a/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py b/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py index 18698f2..0bdf6f0 100644 --- a/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py +++ b/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py @@ -21,7 +21,6 @@ from google.api_core import operations_v1 # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore @@ -186,7 +185,7 @@ def __init__( self._grpc_channel = None self._ssl_channel_credentials = ssl_channel_credentials self._stubs: Dict[str, Callable] = {} - self._operations_client = None + self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None if api_mtls_endpoint: warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning) diff --git a/google/cloud/channel_v1/types/common.py b/google/cloud/channel_v1/types/common.py index f088211..3c28541 100644 --- a/google/cloud/channel_v1/types/common.py +++ b/google/cloud/channel_v1/types/common.py @@ -108,17 +108,29 @@ class CustomerType(proto.Enum): class Value(proto.Message): r"""Data type and value of a parameter. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: int64_value (int): Represents an int64 value. + This field is a member of `oneof`_ ``kind``. string_value (str): Represents a string value. + This field is a member of `oneof`_ ``kind``. double_value (float): Represents a double value. + This field is a member of `oneof`_ ``kind``. proto_value (google.protobuf.any_pb2.Any): Represents an 'Any' proto value. + This field is a member of `oneof`_ ``kind``. bool_value (bool): Represents a boolean value. + This field is a member of `oneof`_ ``kind``. """ int64_value = proto.Field(proto.INT64, number=1, oneof="kind",) diff --git a/google/cloud/channel_v1/types/service.py b/google/cloud/channel_v1/types/service.py index 82a9de7..7ad319e 100644 --- a/google/cloud/channel_v1/types/service.py +++ b/google/cloud/channel_v1/types/service.py @@ -264,11 +264,20 @@ class ImportCustomerRequest(proto.Message): r"""Request message for [CloudChannelService.ImportCustomer][google.cloud.channel.v1.CloudChannelService.ImportCustomer] + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: domain (str): Required. Customer domain. + This field is a member of `oneof`_ ``customer_identity``. cloud_identity_id (str): Required. Customer's Cloud Identity ID + This field is a member of `oneof`_ ``customer_identity``. parent (str): Required. The resource name of the reseller's account. Parent takes the format: accounts/{account_id} or @@ -388,14 +397,23 @@ class ListTransferableSkusRequest(proto.Message): r"""Request message for [CloudChannelService.ListTransferableSkus][google.cloud.channel.v1.CloudChannelService.ListTransferableSkus] + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: cloud_identity_id (str): Customer's Cloud Identity ID + This field is a member of `oneof`_ ``transferred_customer_identity``. customer_name (str): A reseller is required to create a customer and use the resource name of the created customer here. Customer_name uses the format: accounts/{account_id}/customers/{customer_id} + This field is a member of `oneof`_ ``transferred_customer_identity``. parent (str): Required. The reseller account's resource name. Parent uses the format: accounts/{account_id} @@ -469,12 +487,21 @@ class ListTransferableOffersRequest(proto.Message): r"""Request message for [CloudChannelService.ListTransferableOffers][google.cloud.channel.v1.CloudChannelService.ListTransferableOffers] + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: cloud_identity_id (str): Customer's Cloud Identity ID + This field is a member of `oneof`_ ``transferred_customer_identity``. customer_name (str): A reseller should create a customer and use the resource name of that customer here. + This field is a member of `oneof`_ ``transferred_customer_identity``. parent (str): Required. The resource name of the reseller's account. @@ -1234,12 +1261,21 @@ def raw_page(self): class ListPurchasableSkusRequest(proto.Message): r"""Request message for ListPurchasableSkus. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: create_entitlement_purchase (google.cloud.channel_v1.types.ListPurchasableSkusRequest.CreateEntitlementPurchase): List SKUs for CreateEntitlement purchase. + This field is a member of `oneof`_ ``purchase_option``. change_offer_purchase (google.cloud.channel_v1.types.ListPurchasableSkusRequest.ChangeOfferPurchase): List SKUs for ChangeOffer purchase with a new SKU. + This field is a member of `oneof`_ ``purchase_option``. customer (str): Required. The resource name of the customer to list SKUs for. Format: accounts/{account_id}/customers/{customer_id}. @@ -1348,11 +1384,20 @@ class PurchasableSku(proto.Message): class ListPurchasableOffersRequest(proto.Message): r"""Request message for ListPurchasableOffers. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: create_entitlement_purchase (google.cloud.channel_v1.types.ListPurchasableOffersRequest.CreateEntitlementPurchase): List Offers for CreateEntitlement purchase. + This field is a member of `oneof`_ ``purchase_option``. change_offer_purchase (google.cloud.channel_v1.types.ListPurchasableOffersRequest.ChangeOfferPurchase): List Offers for ChangeOffer purchase. + This field is a member of `oneof`_ ``purchase_option``. customer (str): Required. The resource name of the customer to list Offers for. Format: accounts/{account_id}/customers/{customer_id}. diff --git a/google/cloud/channel_v1/types/subscriber_event.py b/google/cloud/channel_v1/types/subscriber_event.py index 7f58760..c8b0294 100644 --- a/google/cloud/channel_v1/types/subscriber_event.py +++ b/google/cloud/channel_v1/types/subscriber_event.py @@ -81,13 +81,22 @@ class SubscriberEvent(proto.Message): r"""Represents information which resellers will get as part of notification from Cloud Pub/Sub. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: customer_event (google.cloud.channel_v1.types.CustomerEvent): Customer event send as part of Pub/Sub event to partners. + This field is a member of `oneof`_ ``event``. entitlement_event (google.cloud.channel_v1.types.EntitlementEvent): Entitlement event send as part of Pub/Sub event to partners. + This field is a member of `oneof`_ ``event``. """ customer_event = proto.Field( diff --git a/setup.py b/setup.py index 80bc0cb..0801a90 100644 --- a/setup.py +++ b/setup.py @@ -48,9 +48,8 @@ # NOTE: Maintainers, please do not require google-api-core>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 - "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "proto-plus >= 1.4.0", - "packaging >= 14.3", ), python_requires=">=3.6", classifiers=[ diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index cde1ce3..8fad4fc 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -19,9 +19,5 @@ # # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 -google-api-core==1.26.0 +google-api-core==1.28.0 proto-plus==1.4.0 -packaging==14.3 -# TODO: remove once google-auth>=1.25.0 is required transitively -# through google-api-core>=1.28.0 -google-auth==1.24.0 diff --git a/tests/unit/gapic/channel_v1/test_cloud_channel_service.py b/tests/unit/gapic/channel_v1/test_cloud_channel_service.py index dbc719d..1c88438 100644 --- a/tests/unit/gapic/channel_v1/test_cloud_channel_service.py +++ b/tests/unit/gapic/channel_v1/test_cloud_channel_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.channel_v1.services.cloud_channel_service import pagers from google.cloud.channel_v1.services.cloud_channel_service import transports -from google.cloud.channel_v1.services.cloud_channel_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.channel_v1.types import channel_partner_links from google.cloud.channel_v1.types import common from google.cloud.channel_v1.types import customers @@ -63,20 +59,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -238,7 +220,7 @@ def test_cloud_channel_service_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_cloud_channel_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -272,7 +254,7 @@ def test_cloud_channel_service_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -301,7 +283,7 @@ def test_cloud_channel_service_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -370,7 +352,7 @@ def test_cloud_channel_service_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -412,7 +394,7 @@ def test_cloud_channel_service_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -434,7 +416,7 @@ def test_cloud_channel_service_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -469,7 +451,7 @@ def test_cloud_channel_service_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -504,7 +486,7 @@ def test_cloud_channel_service_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -7573,7 +7555,6 @@ def test_cloud_channel_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_cloud_channel_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -7594,26 +7575,6 @@ def test_cloud_channel_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_cloud_channel_service_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.channel_v1.services.cloud_channel_service.transports.CloudChannelServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.CloudChannelServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/apps.order",), - quota_project_id="octopus", - ) - - def test_cloud_channel_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -7625,7 +7586,6 @@ def test_cloud_channel_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_cloud_channel_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -7638,18 +7598,6 @@ def test_cloud_channel_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_cloud_channel_service_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - CloudChannelServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/apps.order",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -7657,7 +7605,6 @@ def test_cloud_channel_service_auth_adc_old_google_auth(): transports.CloudChannelServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_cloud_channel_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -7671,26 +7618,6 @@ def test_cloud_channel_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.CloudChannelServiceGrpcTransport, - transports.CloudChannelServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_cloud_channel_service_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/apps.order",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [