diff --git a/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py b/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py index a863393..d588f9c 100644 --- a/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py +++ b/google/cloud/security/privateca_v1/services/certificate_authority_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.security.privateca_v1.services.certificate_authority_service import ( @@ -206,12 +208,12 @@ def __init__( async def create_certificate( self, - request: service.CreateCertificateRequest = None, + request: Union[service.CreateCertificateRequest, dict] = None, *, parent: str = None, certificate: resources.Certificate = None, certificate_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -221,7 +223,7 @@ async def create_certificate( [CaPool][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.CreateCertificateRequest`): + request (Union[google.cloud.security.privateca_v1.types.CreateCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.CreateCertificate][google.cloud.security.privateca.v1.CertificateAuthorityService.CreateCertificate]. parent (:class:`str`): @@ -308,10 +310,10 @@ async def create_certificate( async def get_certificate( self, - request: service.GetCertificateRequest = None, + request: Union[service.GetCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -319,7 +321,7 @@ async def get_certificate( [Certificate][google.cloud.security.privateca.v1.Certificate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.GetCertificateRequest`): + request (Union[google.cloud.security.privateca_v1.types.GetCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificate][google.cloud.security.privateca.v1.CertificateAuthorityService.GetCertificate]. name (:class:`str`): @@ -383,10 +385,10 @@ async def get_certificate( async def list_certificates( self, - request: service.ListCertificatesRequest = None, + request: Union[service.ListCertificatesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificatesAsyncPager: @@ -394,7 +396,7 @@ async def list_certificates( [Certificates][google.cloud.security.privateca.v1.Certificate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.ListCertificatesRequest`): + request (Union[google.cloud.security.privateca_v1.types.ListCertificatesRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificates][google.cloud.security.privateca.v1.CertificateAuthorityService.ListCertificates]. parent (:class:`str`): @@ -466,10 +468,10 @@ async def list_certificates( async def revoke_certificate( self, - request: service.RevokeCertificateRequest = None, + request: Union[service.RevokeCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -477,7 +479,7 @@ async def revoke_certificate( [Certificate][google.cloud.security.privateca.v1.Certificate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.RevokeCertificateRequest`): + request (Union[google.cloud.security.privateca_v1.types.RevokeCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.RevokeCertificate][google.cloud.security.privateca.v1.CertificateAuthorityService.RevokeCertificate]. name (:class:`str`): @@ -540,11 +542,11 @@ async def revoke_certificate( async def update_certificate( self, - request: service.UpdateCertificateRequest = None, + request: Union[service.UpdateCertificateRequest, dict] = None, *, certificate: resources.Certificate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -555,7 +557,7 @@ async def update_certificate( field. Args: - request (:class:`google.cloud.security.privateca_v1.types.UpdateCertificateRequest`): + request (Union[google.cloud.security.privateca_v1.types.UpdateCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificate][google.cloud.security.privateca.v1.CertificateAuthorityService.UpdateCertificate]. certificate (:class:`google.cloud.security.privateca_v1.types.Certificate`): @@ -628,10 +630,10 @@ async def update_certificate( async def activate_certificate_authority( self, - request: service.ActivateCertificateAuthorityRequest = None, + request: Union[service.ActivateCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -647,7 +649,7 @@ async def activate_certificate_authority( this method can complete the activation process. Args: - request (:class:`google.cloud.security.privateca_v1.types.ActivateCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.ActivateCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.ActivateCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.ActivateCertificateAuthority]. name (:class:`str`): @@ -723,12 +725,12 @@ async def activate_certificate_authority( async def create_certificate_authority( self, - request: service.CreateCertificateAuthorityRequest = None, + request: Union[service.CreateCertificateAuthorityRequest, dict] = None, *, parent: str = None, certificate_authority: resources.CertificateAuthority = None, certificate_authority_id: str = 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: @@ -737,7 +739,7 @@ async def create_certificate_authority( in a given Project and Location. Args: - request (:class:`google.cloud.security.privateca_v1.types.CreateCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.CreateCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.CreateCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.CreateCertificateAuthority]. parent (:class:`str`): @@ -835,10 +837,10 @@ async def create_certificate_authority( async def disable_certificate_authority( self, - request: service.DisableCertificateAuthorityRequest = None, + request: Union[service.DisableCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -846,7 +848,7 @@ async def disable_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.DisableCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.DisableCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.DisableCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.DisableCertificateAuthority]. name (:class:`str`): @@ -922,10 +924,10 @@ async def disable_certificate_authority( async def enable_certificate_authority( self, - request: service.EnableCertificateAuthorityRequest = None, + request: Union[service.EnableCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -933,7 +935,7 @@ async def enable_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.EnableCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.EnableCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.EnableCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.EnableCertificateAuthority]. name (:class:`str`): @@ -1009,10 +1011,10 @@ async def enable_certificate_authority( async def fetch_certificate_authority_csr( self, - request: service.FetchCertificateAuthorityCsrRequest = None, + request: Union[service.FetchCertificateAuthorityCsrRequest, 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]] = (), ) -> service.FetchCertificateAuthorityCsrResponse: @@ -1029,7 +1031,7 @@ async def fetch_certificate_authority_csr( [ActivateCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.ActivateCertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.FetchCertificateAuthorityCsrRequest`): + request (Union[google.cloud.security.privateca_v1.types.FetchCertificateAuthorityCsrRequest, dict]): The request object. Request message for [CertificateAuthorityService.FetchCertificateAuthorityCsr][google.cloud.security.privateca.v1.CertificateAuthorityService.FetchCertificateAuthorityCsr]. name (:class:`str`): @@ -1092,10 +1094,10 @@ async def fetch_certificate_authority_csr( async def get_certificate_authority( self, - request: service.GetCertificateAuthorityRequest = None, + request: Union[service.GetCertificateAuthorityRequest, 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]] = (), ) -> resources.CertificateAuthority: @@ -1103,7 +1105,7 @@ async def get_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.GetCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.GetCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.GetCertificateAuthority]. name (:class:`str`): @@ -1170,10 +1172,10 @@ async def get_certificate_authority( async def list_certificate_authorities( self, - request: service.ListCertificateAuthoritiesRequest = None, + request: Union[service.ListCertificateAuthoritiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateAuthoritiesAsyncPager: @@ -1181,7 +1183,7 @@ async def list_certificate_authorities( [CertificateAuthorities][google.cloud.security.privateca.v1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.ListCertificateAuthoritiesRequest`): + request (Union[google.cloud.security.privateca_v1.types.ListCertificateAuthoritiesRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificateAuthorities][google.cloud.security.privateca.v1.CertificateAuthorityService.ListCertificateAuthorities]. parent (:class:`str`): @@ -1254,10 +1256,10 @@ async def list_certificate_authorities( async def undelete_certificate_authority( self, - request: service.UndeleteCertificateAuthorityRequest = None, + request: Union[service.UndeleteCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -1266,7 +1268,7 @@ async def undelete_certificate_authority( that has been deleted. Args: - request (:class:`google.cloud.security.privateca_v1.types.UndeleteCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.UndeleteCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.UndeleteCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.UndeleteCertificateAuthority]. name (:class:`str`): @@ -1342,10 +1344,10 @@ async def undelete_certificate_authority( async def delete_certificate_authority( self, - request: service.DeleteCertificateAuthorityRequest = None, + request: Union[service.DeleteCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -1353,7 +1355,7 @@ async def delete_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.DeleteCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.DeleteCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.DeleteCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.DeleteCertificateAuthority]. name (:class:`str`): @@ -1429,11 +1431,11 @@ async def delete_certificate_authority( async def update_certificate_authority( self, - request: service.UpdateCertificateAuthorityRequest = None, + request: Union[service.UpdateCertificateAuthorityRequest, dict] = None, *, certificate_authority: resources.CertificateAuthority = None, update_mask: field_mask_pb2.FieldMask = 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: @@ -1441,7 +1443,7 @@ async def update_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1.types.UpdateCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1.types.UpdateCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthorityService.UpdateCertificateAuthority]. certificate_authority (:class:`google.cloud.security.privateca_v1.types.CertificateAuthority`): @@ -1527,19 +1529,19 @@ async def update_certificate_authority( async def create_ca_pool( self, - request: service.CreateCaPoolRequest = None, + request: Union[service.CreateCaPoolRequest, dict] = None, *, parent: str = None, ca_pool: resources.CaPool = None, ca_pool_id: str = 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: r"""Create a [CaPool][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.CreateCaPoolRequest`): + request (Union[google.cloud.security.privateca_v1.types.CreateCaPoolRequest, dict]): The request object. Request message for [CertificateAuthorityService.CreateCaPool][google.cloud.security.privateca.v1.CertificateAuthorityService.CreateCaPool]. parent (:class:`str`): @@ -1638,18 +1640,18 @@ async def create_ca_pool( async def update_ca_pool( self, - request: service.UpdateCaPoolRequest = None, + request: Union[service.UpdateCaPoolRequest, dict] = None, *, ca_pool: resources.CaPool = None, update_mask: field_mask_pb2.FieldMask = 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: r"""Update a [CaPool][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.UpdateCaPoolRequest`): + request (Union[google.cloud.security.privateca_v1.types.UpdateCaPoolRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCaPool][google.cloud.security.privateca.v1.CertificateAuthorityService.UpdateCaPool]. ca_pool (:class:`google.cloud.security.privateca_v1.types.CaPool`): @@ -1739,17 +1741,17 @@ async def update_ca_pool( async def get_ca_pool( self, - request: service.GetCaPoolRequest = None, + request: Union[service.GetCaPoolRequest, 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]] = (), ) -> resources.CaPool: r"""Returns a [CaPool][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.GetCaPoolRequest`): + request (Union[google.cloud.security.privateca_v1.types.GetCaPoolRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCaPool][google.cloud.security.privateca.v1.CertificateAuthorityService.GetCaPool]. name (:class:`str`): @@ -1820,17 +1822,17 @@ async def get_ca_pool( async def list_ca_pools( self, - request: service.ListCaPoolsRequest = None, + request: Union[service.ListCaPoolsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCaPoolsAsyncPager: r"""Lists [CaPools][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.ListCaPoolsRequest`): + request (Union[google.cloud.security.privateca_v1.types.ListCaPoolsRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCaPools][google.cloud.security.privateca.v1.CertificateAuthorityService.ListCaPools]. parent (:class:`str`): @@ -1902,17 +1904,17 @@ async def list_ca_pools( async def delete_ca_pool( self, - request: service.DeleteCaPoolRequest = None, + request: Union[service.DeleteCaPoolRequest, 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]] = (), ) -> operation_async.AsyncOperation: r"""Delete a [CaPool][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.DeleteCaPoolRequest`): + request (Union[google.cloud.security.privateca_v1.types.DeleteCaPoolRequest, dict]): The request object. Request message for [CertificateAuthorityService.DeleteCaPool][google.cloud.security.privateca.v1.CertificateAuthorityService.DeleteCaPool]. name (:class:`str`): @@ -1995,10 +1997,10 @@ async def delete_ca_pool( async def fetch_ca_certs( self, - request: service.FetchCaCertsRequest = None, + request: Union[service.FetchCaCertsRequest, dict] = None, *, ca_pool: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.FetchCaCertsResponse: @@ -2010,7 +2012,7 @@ async def fetch_ca_certs( [CaPool][google.cloud.security.privateca.v1.CaPool]. Args: - request (:class:`google.cloud.security.privateca_v1.types.FetchCaCertsRequest`): + request (Union[google.cloud.security.privateca_v1.types.FetchCaCertsRequest, dict]): The request object. Request message for [CertificateAuthorityService.FetchCaCerts][google.cloud.security.privateca.v1.CertificateAuthorityService.FetchCaCerts]. ca_pool (:class:`str`): @@ -2072,10 +2074,10 @@ async def fetch_ca_certs( async def get_certificate_revocation_list( self, - request: service.GetCertificateRevocationListRequest = None, + request: Union[service.GetCertificateRevocationListRequest, 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]] = (), ) -> resources.CertificateRevocationList: @@ -2083,7 +2085,7 @@ async def get_certificate_revocation_list( [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList]. Args: - request (:class:`google.cloud.security.privateca_v1.types.GetCertificateRevocationListRequest`): + request (Union[google.cloud.security.privateca_v1.types.GetCertificateRevocationListRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificateRevocationList][google.cloud.security.privateca.v1.CertificateAuthorityService.GetCertificateRevocationList]. name (:class:`str`): @@ -2149,10 +2151,10 @@ async def get_certificate_revocation_list( async def list_certificate_revocation_lists( self, - request: service.ListCertificateRevocationListsRequest = None, + request: Union[service.ListCertificateRevocationListsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateRevocationListsAsyncPager: @@ -2160,7 +2162,7 @@ async def list_certificate_revocation_lists( [CertificateRevocationLists][google.cloud.security.privateca.v1.CertificateRevocationList]. Args: - request (:class:`google.cloud.security.privateca_v1.types.ListCertificateRevocationListsRequest`): + request (Union[google.cloud.security.privateca_v1.types.ListCertificateRevocationListsRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificateRevocationLists][google.cloud.security.privateca.v1.CertificateAuthorityService.ListCertificateRevocationLists]. parent (:class:`str`): @@ -2233,11 +2235,11 @@ async def list_certificate_revocation_lists( async def update_certificate_revocation_list( self, - request: service.UpdateCertificateRevocationListRequest = None, + request: Union[service.UpdateCertificateRevocationListRequest, dict] = None, *, certificate_revocation_list: resources.CertificateRevocationList = None, update_mask: field_mask_pb2.FieldMask = 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: @@ -2245,7 +2247,7 @@ async def update_certificate_revocation_list( [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList]. Args: - request (:class:`google.cloud.security.privateca_v1.types.UpdateCertificateRevocationListRequest`): + request (Union[google.cloud.security.privateca_v1.types.UpdateCertificateRevocationListRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificateRevocationList][google.cloud.security.privateca.v1.CertificateAuthorityService.UpdateCertificateRevocationList]. certificate_revocation_list (:class:`google.cloud.security.privateca_v1.types.CertificateRevocationList`): @@ -2335,12 +2337,12 @@ async def update_certificate_revocation_list( async def create_certificate_template( self, - request: service.CreateCertificateTemplateRequest = None, + request: Union[service.CreateCertificateTemplateRequest, dict] = None, *, parent: str = None, certificate_template: resources.CertificateTemplate = None, certificate_template_id: str = 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: @@ -2349,7 +2351,7 @@ async def create_certificate_template( in a given Project and Location. Args: - request (:class:`google.cloud.security.privateca_v1.types.CreateCertificateTemplateRequest`): + request (Union[google.cloud.security.privateca_v1.types.CreateCertificateTemplateRequest, dict]): The request object. Request message for [CertificateAuthorityService.CreateCertificateTemplate][google.cloud.security.privateca.v1.CertificateAuthorityService.CreateCertificateTemplate]. parent (:class:`str`): @@ -2443,10 +2445,10 @@ async def create_certificate_template( async def delete_certificate_template( self, - request: service.DeleteCertificateTemplateRequest = None, + request: Union[service.DeleteCertificateTemplateRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -2454,7 +2456,7 @@ async def delete_certificate_template( [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.DeleteCertificateTemplateRequest`): + request (Union[google.cloud.security.privateca_v1.types.DeleteCertificateTemplateRequest, dict]): The request object. Request message for [CertificateAuthorityService.DeleteCertificateTemplate][google.cloud.security.privateca.v1.CertificateAuthorityService.DeleteCertificateTemplate]. name (:class:`str`): @@ -2538,10 +2540,10 @@ async def delete_certificate_template( async def get_certificate_template( self, - request: service.GetCertificateTemplateRequest = None, + request: Union[service.GetCertificateTemplateRequest, 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]] = (), ) -> resources.CertificateTemplate: @@ -2549,7 +2551,7 @@ async def get_certificate_template( [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.GetCertificateTemplateRequest`): + request (Union[google.cloud.security.privateca_v1.types.GetCertificateTemplateRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificateTemplate][google.cloud.security.privateca.v1.CertificateAuthorityService.GetCertificateTemplate]. name (:class:`str`): @@ -2613,10 +2615,10 @@ async def get_certificate_template( async def list_certificate_templates( self, - request: service.ListCertificateTemplatesRequest = None, + request: Union[service.ListCertificateTemplatesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateTemplatesAsyncPager: @@ -2624,7 +2626,7 @@ async def list_certificate_templates( [CertificateTemplates][google.cloud.security.privateca.v1.CertificateTemplate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.ListCertificateTemplatesRequest`): + request (Union[google.cloud.security.privateca_v1.types.ListCertificateTemplatesRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificateTemplates][google.cloud.security.privateca.v1.CertificateAuthorityService.ListCertificateTemplates]. parent (:class:`str`): @@ -2696,11 +2698,11 @@ async def list_certificate_templates( async def update_certificate_template( self, - request: service.UpdateCertificateTemplateRequest = None, + request: Union[service.UpdateCertificateTemplateRequest, dict] = None, *, certificate_template: resources.CertificateTemplate = None, update_mask: field_mask_pb2.FieldMask = 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: @@ -2708,7 +2710,7 @@ async def update_certificate_template( [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate]. Args: - request (:class:`google.cloud.security.privateca_v1.types.UpdateCertificateTemplateRequest`): + request (Union[google.cloud.security.privateca_v1.types.UpdateCertificateTemplateRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificateTemplate][google.cloud.security.privateca.v1.CertificateAuthorityService.UpdateCertificateTemplate]. certificate_template (:class:`google.cloud.security.privateca_v1.types.CertificateTemplate`): diff --git a/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py b/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py index 9dd86cb..ae81887 100644 --- a/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py +++ b/google/cloud/security/privateca_v1/services/certificate_authority_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.security.privateca_v1.services.certificate_authority_service import ( @@ -460,7 +462,7 @@ def create_certificate( parent: str = None, certificate: resources.Certificate = None, certificate_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -560,7 +562,7 @@ def get_certificate( request: Union[service.GetCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -635,7 +637,7 @@ def list_certificates( request: Union[service.ListCertificatesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificatesPager: @@ -718,7 +720,7 @@ def revoke_certificate( request: Union[service.RevokeCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -793,7 +795,7 @@ def update_certificate( *, certificate: resources.Certificate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -880,7 +882,7 @@ def activate_certificate_authority( request: Union[service.ActivateCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -979,7 +981,7 @@ def create_certificate_authority( parent: str = None, certificate_authority: resources.CertificateAuthority = None, certificate_authority_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1091,7 +1093,7 @@ def disable_certificate_authority( request: Union[service.DisableCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1180,7 +1182,7 @@ def enable_certificate_authority( request: Union[service.EnableCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1269,7 +1271,7 @@ def fetch_certificate_authority_csr( request: Union[service.FetchCertificateAuthorityCsrRequest, 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]] = (), ) -> service.FetchCertificateAuthorityCsrResponse: @@ -1354,7 +1356,7 @@ def get_certificate_authority( request: Union[service.GetCertificateAuthorityRequest, 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]] = (), ) -> resources.CertificateAuthority: @@ -1434,7 +1436,7 @@ def list_certificate_authorities( request: Union[service.ListCertificateAuthoritiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateAuthoritiesPager: @@ -1520,7 +1522,7 @@ def undelete_certificate_authority( request: Union[service.UndeleteCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1610,7 +1612,7 @@ def delete_certificate_authority( request: Union[service.DeleteCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1700,7 +1702,7 @@ def update_certificate_authority( *, certificate_authority: resources.CertificateAuthority = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1801,7 +1803,7 @@ def create_ca_pool( parent: str = None, ca_pool: resources.CaPool = None, ca_pool_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1911,7 +1913,7 @@ def update_ca_pool( *, ca_pool: resources.CaPool = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2011,7 +2013,7 @@ def get_ca_pool( request: Union[service.GetCaPoolRequest, 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]] = (), ) -> resources.CaPool: @@ -2092,7 +2094,7 @@ def list_ca_pools( request: Union[service.ListCaPoolsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCaPoolsPager: @@ -2174,7 +2176,7 @@ def delete_ca_pool( request: Union[service.DeleteCaPoolRequest, 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]] = (), ) -> operation.Operation: @@ -2267,7 +2269,7 @@ def fetch_ca_certs( request: Union[service.FetchCaCertsRequest, dict] = None, *, ca_pool: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.FetchCaCertsResponse: @@ -2344,7 +2346,7 @@ def get_certificate_revocation_list( request: Union[service.GetCertificateRevocationListRequest, 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]] = (), ) -> resources.CertificateRevocationList: @@ -2423,7 +2425,7 @@ def list_certificate_revocation_lists( request: Union[service.ListCertificateRevocationListsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateRevocationListsPager: @@ -2510,7 +2512,7 @@ def update_certificate_revocation_list( *, certificate_revocation_list: resources.CertificateRevocationList = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2615,7 +2617,7 @@ def create_certificate_template( parent: str = None, certificate_template: resources.CertificateTemplate = None, certificate_template_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2723,7 +2725,7 @@ def delete_certificate_template( request: Union[service.DeleteCertificateTemplateRequest, 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]] = (), ) -> operation.Operation: @@ -2820,7 +2822,7 @@ def get_certificate_template( request: Union[service.GetCertificateTemplateRequest, 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]] = (), ) -> resources.CertificateTemplate: @@ -2895,7 +2897,7 @@ def list_certificate_templates( request: Union[service.ListCertificateTemplatesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateTemplatesPager: @@ -2981,7 +2983,7 @@ def update_certificate_template( *, certificate_template: resources.CertificateTemplate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: diff --git a/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py b/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py index b3ae798..77edb02 100644 --- a/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py +++ b/google/cloud/security/privateca_v1/services/certificate_authority_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 @@ -40,15 +39,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 CertificateAuthorityServiceTransport(abc.ABC): """Abstract transport class for CertificateAuthorityService.""" @@ -98,7 +88,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 @@ -131,29 +121,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 = { @@ -292,7 +259,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/security/privateca_v1/services/certificate_authority_service/transports/grpc.py b/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py index d6ffb2c..371ca01 100644 --- a/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py +++ b/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py @@ -115,7 +115,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/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py b/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py index d430a03..95fb386 100644 --- a/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py +++ b/google/cloud/security/privateca_v1/services/certificate_authority_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 @@ -164,7 +163,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/security/privateca_v1/types/resources.py b/google/cloud/security/privateca_v1/types/resources.py index 2d0b661..12d1973 100644 --- a/google/cloud/security/privateca_v1/types/resources.py +++ b/google/cloud/security/privateca_v1/types/resources.py @@ -251,6 +251,13 @@ class KeyVersionSpec(proto.Message): [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] will use. + 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_kms_key_version (str): The resource name for an existing Cloud KMS CryptoKeyVersion @@ -258,12 +265,14 @@ class KeyVersionSpec(proto.Message): ``projects/*/locations/*/keyRings/*/cryptoKeys/*/cryptoKeyVersions/*``. This option enables full flexibility in the key's capabilities and properties. + This field is a member of `oneof`_ ``KeyVersion``. algorithm (google.cloud.security.privateca_v1.types.CertificateAuthority.SignHashAlgorithm): The algorithm to use for creating a managed Cloud KMS key for a for a simplified experience. All managed keys will be have their [ProtectionLevel][google.cloud.kms.v1.ProtectionLevel] as ``HSM``. + This field is a member of `oneof`_ ``KeyVersion``. """ cloud_kms_key_version = proto.Field(proto.STRING, number=1, oneof="KeyVersion",) @@ -464,12 +473,21 @@ class AllowedKeyType(proto.Message): may refer to either a fully-qualified key algorithm, such as RSA 4096, or a family of key algorithms, such as any RSA key. + 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: rsa (google.cloud.security.privateca_v1.types.CaPool.IssuancePolicy.AllowedKeyType.RsaKeyType): Represents an allowed RSA key type. + This field is a member of `oneof`_ ``key_type``. elliptic_curve (google.cloud.security.privateca_v1.types.CaPool.IssuancePolicy.AllowedKeyType.EcKeyType): Represents an allowed Elliptic Curve key type. + This field is a member of `oneof`_ ``key_type``. """ class RsaKeyType(proto.Message): @@ -681,6 +699,13 @@ class Certificate(proto.Message): corresponds to a signed X.509 certificate issued by a [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. + 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: name (str): Output only. The resource name for this @@ -690,9 +715,11 @@ class Certificate(proto.Message): pem_csr (str): Immutable. A pem-encoded X.509 certificate signing request (CSR). + This field is a member of `oneof`_ ``certificate_config``. config (google.cloud.security.privateca_v1.types.CertificateConfig): Immutable. A description of the certificate and key that does not require X.509 or ASN.1. + This field is a member of `oneof`_ ``certificate_config``. issuer_certificate_authority (str): Output only. The resource name of the issuing [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] @@ -911,6 +938,7 @@ class CaOptions(proto.Message): which is a boolean value. When this value is missing, the extension will be omitted from the CA certificate. + This field is a member of `oneof`_ ``_is_ca``. max_issuer_path_length (int): Optional. Refers to the path length restriction X.509 extension. For a CA @@ -919,6 +947,7 @@ class CaOptions(proto.Message): If this value is less than 0, the request will fail. If this value is missing, the max path length will be omitted from the CA certificate. + This field is a member of `oneof`_ ``_max_issuer_path_length``. """ is_ca = proto.Field(proto.BOOL, number=1, optional=True,) @@ -939,6 +968,13 @@ class SubordinateConfig(proto.Message): [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority], or a PEM issuer certificate chain. + 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: certificate_authority (str): Required. This can refer to a @@ -948,11 +984,13 @@ class SubordinateConfig(proto.Message): This field is used for information and usability purposes only. The resource name is in the format ``projects/*/locations/*/caPools/*/certificateAuthorities/*``. + This field is a member of `oneof`_ ``subordinate_config``. pem_issuer_chain (google.cloud.security.privateca_v1.types.SubordinateConfig.SubordinateConfigChain): Required. Contains the PEM certificate chain for the issuers of this [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority], but not pem certificate for this CA itself. + This field is a member of `oneof`_ ``subordinate_config``. """ class SubordinateConfigChain(proto.Message): @@ -1395,6 +1433,7 @@ class CertificateIdentityConstraints(proto.Message): certificate. Otherwise, the requested [Subject][google.cloud.security.privateca.v1.Subject] will be discarded. + This field is a member of `oneof`_ ``_allow_subject_passthrough``. allow_subject_alt_names_passthrough (bool): Required. If this is true, the [SubjectAltNames][google.cloud.security.privateca.v1.SubjectAltNames] @@ -1402,6 +1441,7 @@ class CertificateIdentityConstraints(proto.Message): signed certificate. Otherwise, the requested [SubjectAltNames][google.cloud.security.privateca.v1.SubjectAltNames] will be discarded. + This field is a member of `oneof`_ ``_allow_subject_alt_names_passthrough``. """ cel_expression = proto.Field(proto.MESSAGE, number=1, message=expr_pb2.Expr,) diff --git a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py index 388d9bb..5e05939 100644 --- a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py +++ b/google/cloud/security/privateca_v1beta1/services/certificate_authority_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.security.privateca_v1beta1.services.certificate_authority_service import ( @@ -201,12 +203,12 @@ def __init__( async def create_certificate( self, - request: service.CreateCertificateRequest = None, + request: Union[service.CreateCertificateRequest, dict] = None, *, parent: str = None, certificate: resources.Certificate = None, certificate_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -216,7 +218,7 @@ async def create_certificate( [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.CreateCertificateRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.CreateCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.CreateCertificate][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.CreateCertificate]. parent (:class:`str`): @@ -305,10 +307,10 @@ async def create_certificate( async def get_certificate( self, - request: service.GetCertificateRequest = None, + request: Union[service.GetCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -316,7 +318,7 @@ async def get_certificate( [Certificate][google.cloud.security.privateca.v1beta1.Certificate]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.GetCertificateRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.GetCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificate][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.GetCertificate]. name (:class:`str`): @@ -380,10 +382,10 @@ async def get_certificate( async def list_certificates( self, - request: service.ListCertificatesRequest = None, + request: Union[service.ListCertificatesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificatesAsyncPager: @@ -391,7 +393,7 @@ async def list_certificates( [Certificates][google.cloud.security.privateca.v1beta1.Certificate]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.ListCertificatesRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.ListCertificatesRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificates][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ListCertificates]. parent (:class:`str`): @@ -464,10 +466,10 @@ async def list_certificates( async def revoke_certificate( self, - request: service.RevokeCertificateRequest = None, + request: Union[service.RevokeCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -475,7 +477,7 @@ async def revoke_certificate( [Certificate][google.cloud.security.privateca.v1beta1.Certificate]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.RevokeCertificateRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.RevokeCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.RevokeCertificate][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.RevokeCertificate]. name (:class:`str`): @@ -538,11 +540,11 @@ async def revoke_certificate( async def update_certificate( self, - request: service.UpdateCertificateRequest = None, + request: Union[service.UpdateCertificateRequest, dict] = None, *, certificate: resources.Certificate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -553,7 +555,7 @@ async def update_certificate( field. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.UpdateCertificateRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.UpdateCertificateRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificate][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.UpdateCertificate]. certificate (:class:`google.cloud.security.privateca_v1beta1.types.Certificate`): @@ -626,10 +628,10 @@ async def update_certificate( async def activate_certificate_authority( self, - request: service.ActivateCertificateAuthorityRequest = None, + request: Union[service.ActivateCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -645,7 +647,7 @@ async def activate_certificate_authority( this method can complete the activation process. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.ActivateCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.ActivateCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.ActivateCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ActivateCertificateAuthority]. name (:class:`str`): @@ -721,12 +723,12 @@ async def activate_certificate_authority( async def create_certificate_authority( self, - request: service.CreateCertificateAuthorityRequest = None, + request: Union[service.CreateCertificateAuthorityRequest, dict] = None, *, parent: str = None, certificate_authority: resources.CertificateAuthority = None, certificate_authority_id: str = 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: @@ -735,7 +737,7 @@ async def create_certificate_authority( in a given Project and Location. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.CreateCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.CreateCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.CreateCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.CreateCertificateAuthority]. parent (:class:`str`): @@ -832,10 +834,10 @@ async def create_certificate_authority( async def disable_certificate_authority( self, - request: service.DisableCertificateAuthorityRequest = None, + request: Union[service.DisableCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -843,7 +845,7 @@ async def disable_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.DisableCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.DisableCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.DisableCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.DisableCertificateAuthority]. name (:class:`str`): @@ -919,10 +921,10 @@ async def disable_certificate_authority( async def enable_certificate_authority( self, - request: service.EnableCertificateAuthorityRequest = None, + request: Union[service.EnableCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -930,7 +932,7 @@ async def enable_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.EnableCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.EnableCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.EnableCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.EnableCertificateAuthority]. name (:class:`str`): @@ -1006,10 +1008,10 @@ async def enable_certificate_authority( async def fetch_certificate_authority_csr( self, - request: service.FetchCertificateAuthorityCsrRequest = None, + request: Union[service.FetchCertificateAuthorityCsrRequest, 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]] = (), ) -> service.FetchCertificateAuthorityCsrResponse: @@ -1026,7 +1028,7 @@ async def fetch_certificate_authority_csr( [ActivateCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ActivateCertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.FetchCertificateAuthorityCsrRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.FetchCertificateAuthorityCsrRequest, dict]): The request object. Request message for [CertificateAuthorityService.FetchCertificateAuthorityCsr][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.FetchCertificateAuthorityCsr]. name (:class:`str`): @@ -1089,10 +1091,10 @@ async def fetch_certificate_authority_csr( async def get_certificate_authority( self, - request: service.GetCertificateAuthorityRequest = None, + request: Union[service.GetCertificateAuthorityRequest, 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]] = (), ) -> resources.CertificateAuthority: @@ -1100,7 +1102,7 @@ async def get_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.GetCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.GetCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.GetCertificateAuthority]. name (:class:`str`): @@ -1167,10 +1169,10 @@ async def get_certificate_authority( async def list_certificate_authorities( self, - request: service.ListCertificateAuthoritiesRequest = None, + request: Union[service.ListCertificateAuthoritiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateAuthoritiesAsyncPager: @@ -1178,7 +1180,7 @@ async def list_certificate_authorities( [CertificateAuthorities][google.cloud.security.privateca.v1beta1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.ListCertificateAuthoritiesRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.ListCertificateAuthoritiesRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificateAuthorities][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ListCertificateAuthorities]. parent (:class:`str`): @@ -1250,10 +1252,10 @@ async def list_certificate_authorities( async def restore_certificate_authority( self, - request: service.RestoreCertificateAuthorityRequest = None, + request: Union[service.RestoreCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -1262,7 +1264,7 @@ async def restore_certificate_authority( that is scheduled for deletion. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.RestoreCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.RestoreCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.RestoreCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.RestoreCertificateAuthority]. name (:class:`str`): @@ -1338,10 +1340,10 @@ async def restore_certificate_authority( async def schedule_delete_certificate_authority( self, - request: service.ScheduleDeleteCertificateAuthorityRequest = None, + request: Union[service.ScheduleDeleteCertificateAuthorityRequest, 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]] = (), ) -> operation_async.AsyncOperation: @@ -1350,7 +1352,7 @@ async def schedule_delete_certificate_authority( for deletion. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.ScheduleDeleteCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.ScheduleDeleteCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.ScheduleDeleteCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ScheduleDeleteCertificateAuthority]. name (:class:`str`): @@ -1426,11 +1428,11 @@ async def schedule_delete_certificate_authority( async def update_certificate_authority( self, - request: service.UpdateCertificateAuthorityRequest = None, + request: Union[service.UpdateCertificateAuthorityRequest, dict] = None, *, certificate_authority: resources.CertificateAuthority = None, update_mask: field_mask_pb2.FieldMask = 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: @@ -1438,7 +1440,7 @@ async def update_certificate_authority( [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.UpdateCertificateAuthorityRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.UpdateCertificateAuthorityRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.UpdateCertificateAuthority]. certificate_authority (:class:`google.cloud.security.privateca_v1beta1.types.CertificateAuthority`): @@ -1524,10 +1526,10 @@ async def update_certificate_authority( async def get_certificate_revocation_list( self, - request: service.GetCertificateRevocationListRequest = None, + request: Union[service.GetCertificateRevocationListRequest, 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]] = (), ) -> resources.CertificateRevocationList: @@ -1535,7 +1537,7 @@ async def get_certificate_revocation_list( [CertificateRevocationList][google.cloud.security.privateca.v1beta1.CertificateRevocationList]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.GetCertificateRevocationListRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.GetCertificateRevocationListRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetCertificateRevocationList][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.GetCertificateRevocationList]. name (:class:`str`): @@ -1601,10 +1603,10 @@ async def get_certificate_revocation_list( async def list_certificate_revocation_lists( self, - request: service.ListCertificateRevocationListsRequest = None, + request: Union[service.ListCertificateRevocationListsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateRevocationListsAsyncPager: @@ -1612,7 +1614,7 @@ async def list_certificate_revocation_lists( [CertificateRevocationLists][google.cloud.security.privateca.v1beta1.CertificateRevocationList]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.ListCertificateRevocationListsRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.ListCertificateRevocationListsRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListCertificateRevocationLists][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ListCertificateRevocationLists]. parent (:class:`str`): @@ -1685,11 +1687,11 @@ async def list_certificate_revocation_lists( async def update_certificate_revocation_list( self, - request: service.UpdateCertificateRevocationListRequest = None, + request: Union[service.UpdateCertificateRevocationListRequest, dict] = None, *, certificate_revocation_list: resources.CertificateRevocationList = None, update_mask: field_mask_pb2.FieldMask = 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: @@ -1697,7 +1699,7 @@ async def update_certificate_revocation_list( [CertificateRevocationList][google.cloud.security.privateca.v1beta1.CertificateRevocationList]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.UpdateCertificateRevocationListRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.UpdateCertificateRevocationListRequest, dict]): The request object. Request message for [CertificateAuthorityService.UpdateCertificateRevocationList][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.UpdateCertificateRevocationList]. certificate_revocation_list (:class:`google.cloud.security.privateca_v1beta1.types.CertificateRevocationList`): @@ -1787,10 +1789,10 @@ async def update_certificate_revocation_list( async def get_reusable_config( self, - request: service.GetReusableConfigRequest = None, + request: Union[service.GetReusableConfigRequest, 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]] = (), ) -> resources.ReusableConfig: @@ -1798,7 +1800,7 @@ async def get_reusable_config( [ReusableConfig][google.cloud.security.privateca.v1beta1.ReusableConfig]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.GetReusableConfigRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.GetReusableConfigRequest, dict]): The request object. Request message for [CertificateAuthorityService.GetReusableConfig][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.GetReusableConfig]. name (:class:`str`): @@ -1862,10 +1864,10 @@ async def get_reusable_config( async def list_reusable_configs( self, - request: service.ListReusableConfigsRequest = None, + request: Union[service.ListReusableConfigsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListReusableConfigsAsyncPager: @@ -1873,7 +1875,7 @@ async def list_reusable_configs( [ReusableConfigs][google.cloud.security.privateca.v1beta1.ReusableConfig]. Args: - request (:class:`google.cloud.security.privateca_v1beta1.types.ListReusableConfigsRequest`): + request (Union[google.cloud.security.privateca_v1beta1.types.ListReusableConfigsRequest, dict]): The request object. Request message for [CertificateAuthorityService.ListReusableConfigs][google.cloud.security.privateca.v1beta1.CertificateAuthorityService.ListReusableConfigs]. parent (:class:`str`): diff --git a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py index 14c6b1b..e03b4d9 100644 --- a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py +++ b/google/cloud/security/privateca_v1beta1/services/certificate_authority_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.security.privateca_v1beta1.services.certificate_authority_service import ( @@ -436,7 +438,7 @@ def create_certificate( parent: str = None, certificate: resources.Certificate = None, certificate_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -538,7 +540,7 @@ def get_certificate( request: Union[service.GetCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -613,7 +615,7 @@ def list_certificates( request: Union[service.ListCertificatesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificatesPager: @@ -697,7 +699,7 @@ def revoke_certificate( request: Union[service.RevokeCertificateRequest, 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]] = (), ) -> resources.Certificate: @@ -772,7 +774,7 @@ def update_certificate( *, certificate: resources.Certificate = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.Certificate: @@ -859,7 +861,7 @@ def activate_certificate_authority( request: Union[service.ActivateCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -958,7 +960,7 @@ def create_certificate_authority( parent: str = None, certificate_authority: resources.CertificateAuthority = None, certificate_authority_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1069,7 +1071,7 @@ def disable_certificate_authority( request: Union[service.DisableCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1158,7 +1160,7 @@ def enable_certificate_authority( request: Union[service.EnableCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1247,7 +1249,7 @@ def fetch_certificate_authority_csr( request: Union[service.FetchCertificateAuthorityCsrRequest, 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]] = (), ) -> service.FetchCertificateAuthorityCsrResponse: @@ -1332,7 +1334,7 @@ def get_certificate_authority( request: Union[service.GetCertificateAuthorityRequest, 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]] = (), ) -> resources.CertificateAuthority: @@ -1412,7 +1414,7 @@ def list_certificate_authorities( request: Union[service.ListCertificateAuthoritiesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateAuthoritiesPager: @@ -1497,7 +1499,7 @@ def restore_certificate_authority( request: Union[service.RestoreCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1587,7 +1589,7 @@ def schedule_delete_certificate_authority( request: Union[service.ScheduleDeleteCertificateAuthorityRequest, 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]] = (), ) -> operation.Operation: @@ -1678,7 +1680,7 @@ def update_certificate_authority( *, certificate_authority: resources.CertificateAuthority = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1777,7 +1779,7 @@ def get_certificate_revocation_list( request: Union[service.GetCertificateRevocationListRequest, 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]] = (), ) -> resources.CertificateRevocationList: @@ -1856,7 +1858,7 @@ def list_certificate_revocation_lists( request: Union[service.ListCertificateRevocationListsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCertificateRevocationListsPager: @@ -1943,7 +1945,7 @@ def update_certificate_revocation_list( *, certificate_revocation_list: resources.CertificateRevocationList = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -2046,7 +2048,7 @@ def get_reusable_config( request: Union[service.GetReusableConfigRequest, 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]] = (), ) -> resources.ReusableConfig: @@ -2121,7 +2123,7 @@ def list_reusable_configs( request: Union[service.ListReusableConfigsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListReusableConfigsPager: diff --git a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py index c694729..c0b332d 100644 --- a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py +++ b/google/cloud/security/privateca_v1beta1/services/certificate_authority_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 @@ -40,15 +39,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 CertificateAuthorityServiceTransport(abc.ABC): """Abstract transport class for CertificateAuthorityService.""" @@ -98,7 +88,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 @@ -131,29 +121,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 = { @@ -257,7 +224,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/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py index c4f1722..c9a473a 100644 --- a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py +++ b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py @@ -115,7 +115,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/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py b/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py index 85cb07b..4275b44 100644 --- a/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py +++ b/google/cloud/security/privateca_v1beta1/services/certificate_authority_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 @@ -164,7 +163,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/security/privateca_v1beta1/types/resources.py b/google/cloud/security/privateca_v1beta1/types/resources.py index bc858ee..b267878 100644 --- a/google/cloud/security/privateca_v1beta1/types/resources.py +++ b/google/cloud/security/privateca_v1beta1/types/resources.py @@ -252,6 +252,13 @@ class CertificateAuthorityPolicy(proto.Message): [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority] if they violate the policy. + 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: allowed_config_list (google.cloud.security.privateca_v1beta1.types.CertificateAuthority.CertificateAuthorityPolicy.AllowedConfigList): Optional. All @@ -261,6 +268,7 @@ class CertificateAuthorityPolicy(proto.Message): must match at least one listed [ReusableConfigWrapper][google.cloud.security.privateca.v1beta1.ReusableConfigWrapper] in the list. + This field is a member of `oneof`_ ``config_policy``. overwrite_config_values (google.cloud.security.privateca_v1beta1.types.ReusableConfigWrapper): Optional. All [Certificates][google.cloud.security.privateca.v1beta1.Certificate] @@ -268,6 +276,7 @@ class CertificateAuthorityPolicy(proto.Message): [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority] will use the provided configuration values, overwriting any requested configuration values. + This field is a member of `oneof`_ ``config_policy``. allowed_locations_and_organizations (Sequence[google.cloud.security.privateca_v1beta1.types.Subject]): Optional. If any [Subject][google.cloud.security.privateca.v1beta1.Subject] @@ -466,6 +475,13 @@ class KeyVersionSpec(proto.Message): [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority] will use. + 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_kms_key_version (str): Required. The resource name for an existing Cloud KMS @@ -473,12 +489,14 @@ class KeyVersionSpec(proto.Message): ``projects/*/locations/*/keyRings/*/cryptoKeys/*/cryptoKeyVersions/*``. This option enables full flexibility in the key's capabilities and properties. + This field is a member of `oneof`_ ``KeyVersion``. algorithm (google.cloud.security.privateca_v1beta1.types.CertificateAuthority.SignHashAlgorithm): Required. The algorithm to use for creating a managed Cloud KMS key for a for a simplified experience. All managed keys will be have their [ProtectionLevel][google.cloud.kms.v1.ProtectionLevel] as ``HSM``. + This field is a member of `oneof`_ ``KeyVersion``. """ cloud_kms_key_version = proto.Field(proto.STRING, number=1, oneof="KeyVersion",) @@ -611,6 +629,13 @@ class Certificate(proto.Message): corresponds to a signed X.509 certificate issued by a [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority]. + 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: name (str): Output only. The resource path for this @@ -620,9 +645,11 @@ class Certificate(proto.Message): pem_csr (str): Immutable. A pem-encoded X.509 certificate signing request (CSR). + This field is a member of `oneof`_ ``certificate_config``. config (google.cloud.security.privateca_v1beta1.types.CertificateConfig): Immutable. A description of the certificate and key that does not require X.509 or ASN.1. + This field is a member of `oneof`_ ``certificate_config``. lifetime (google.protobuf.duration_pb2.Duration): Required. Immutable. The desired lifetime of a certificate. Used to create the "not_before_time" and "not_after_time" @@ -808,14 +835,23 @@ class ReusableConfigWrapper(proto.Message): describes values that may assist in creating an X.509 certificate, or a reference to a pre-defined set of values. + 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: reusable_config (str): Required. A resource path to a [ReusableConfig][google.cloud.security.privateca.v1beta1.ReusableConfig] in the format ``projects/*/locations/*/reusableConfigs/*``. + This field is a member of `oneof`_ ``config_values``. reusable_config_values (google.cloud.security.privateca_v1beta1.types.ReusableConfigValues): Required. A user-specified inline [ReusableConfigValues][google.cloud.security.privateca.v1beta1.ReusableConfigValues]. + This field is a member of `oneof`_ ``config_values``. """ reusable_config = proto.Field(proto.STRING, number=1, oneof="config_values",) @@ -830,6 +866,13 @@ class SubordinateConfig(proto.Message): [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority], or a PEM issuer certificate chain. + 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: certificate_authority (str): Required. This can refer to a @@ -839,11 +882,13 @@ class SubordinateConfig(proto.Message): This field is used for information and usability purposes only. The resource name is in the format ``projects/*/locations/*/certificateAuthorities/*``. + This field is a member of `oneof`_ ``subordinate_config``. pem_issuer_chain (google.cloud.security.privateca_v1beta1.types.SubordinateConfig.SubordinateConfigChain): Required. Contains the PEM certificate chain for the issuers of this [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority], but not pem certificate for this CA itself. + This field is a member of `oneof`_ ``subordinate_config``. """ class SubordinateConfigChain(proto.Message): diff --git a/setup.py b/setup.py index ce508a8..9f127f0 100644 --- a/setup.py +++ b/setup.py @@ -44,9 +44,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", scripts=["scripts/fixup_privateca_v1beta1_keywords.py",], diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index cc4d1f9..6b451bc 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,9 +5,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/privateca_v1/test_certificate_authority_service.py b/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py index 5b5b0d6..5940248 100644 --- a/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py +++ b/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -47,9 +46,6 @@ from google.cloud.security.privateca_v1.services.certificate_authority_service import ( transports, ) -from google.cloud.security.privateca_v1.services.certificate_authority_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.security.privateca_v1.types import resources from google.cloud.security.privateca_v1.types import service from google.longrunning import operations_pb2 @@ -61,20 +57,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" @@ -244,7 +226,7 @@ def test_certificate_authority_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, @@ -261,7 +243,7 @@ def test_certificate_authority_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, @@ -278,7 +260,7 @@ def test_certificate_authority_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, @@ -307,7 +289,7 @@ def test_certificate_authority_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, @@ -376,7 +358,7 @@ def test_certificate_authority_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 @@ -418,7 +400,7 @@ def test_certificate_authority_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, @@ -440,7 +422,7 @@ def test_certificate_authority_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, @@ -475,7 +457,7 @@ def test_certificate_authority_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, @@ -510,7 +492,7 @@ def test_certificate_authority_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", @@ -8218,7 +8200,6 @@ def test_certificate_authority_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_certificate_authority_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -8239,26 +8220,6 @@ def test_certificate_authority_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_certificate_authority_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.security.privateca_v1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.CertificateAuthorityServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_certificate_authority_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( @@ -8270,7 +8231,6 @@ def test_certificate_authority_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_certificate_authority_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -8283,18 +8243,6 @@ def test_certificate_authority_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_certificate_authority_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) - CertificateAuthorityServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -8302,7 +8250,6 @@ def test_certificate_authority_service_auth_adc_old_google_auth(): transports.CertificateAuthorityServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_certificate_authority_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -8316,28 +8263,6 @@ def test_certificate_authority_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.CertificateAuthorityServiceGrpcTransport, - transports.CertificateAuthorityServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_certificate_authority_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/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py b/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py index ccb1738..49d9f63 100644 --- a/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py +++ b/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -47,9 +46,6 @@ from google.cloud.security.privateca_v1beta1.services.certificate_authority_service import ( transports, ) -from google.cloud.security.privateca_v1beta1.services.certificate_authority_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.security.privateca_v1beta1.types import resources from google.cloud.security.privateca_v1beta1.types import service from google.longrunning import operations_pb2 @@ -61,20 +57,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" @@ -244,7 +226,7 @@ def test_certificate_authority_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, @@ -261,7 +243,7 @@ def test_certificate_authority_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, @@ -278,7 +260,7 @@ def test_certificate_authority_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, @@ -307,7 +289,7 @@ def test_certificate_authority_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, @@ -376,7 +358,7 @@ def test_certificate_authority_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 @@ -418,7 +400,7 @@ def test_certificate_authority_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, @@ -440,7 +422,7 @@ def test_certificate_authority_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, @@ -475,7 +457,7 @@ def test_certificate_authority_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, @@ -510,7 +492,7 @@ def test_certificate_authority_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", @@ -6039,7 +6021,6 @@ def test_certificate_authority_service_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_certificate_authority_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -6060,26 +6041,6 @@ def test_certificate_authority_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_certificate_authority_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.security.privateca_v1beta1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.CertificateAuthorityServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_certificate_authority_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( @@ -6091,7 +6052,6 @@ def test_certificate_authority_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_certificate_authority_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -6104,18 +6064,6 @@ def test_certificate_authority_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_certificate_authority_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) - CertificateAuthorityServiceClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -6123,7 +6071,6 @@ def test_certificate_authority_service_auth_adc_old_google_auth(): transports.CertificateAuthorityServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_certificate_authority_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -6137,28 +6084,6 @@ def test_certificate_authority_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.CertificateAuthorityServiceGrpcTransport, - transports.CertificateAuthorityServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_certificate_authority_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/cloud-platform",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [