diff --git a/google/cloud/kms_v1/services/key_management_service/async_client.py b/google/cloud/kms_v1/services/key_management_service/async_client.py index ce3c6908..ab33fbb7 100644 --- a/google/cloud/kms_v1/services/key_management_service/async_client.py +++ b/google/cloud/kms_v1/services/key_management_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.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.types import resources from google.cloud.kms_v1.types import service @@ -204,10 +206,10 @@ def __init__( async def list_key_rings( self, - request: service.ListKeyRingsRequest = None, + request: Union[service.ListKeyRingsRequest, 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.ListKeyRingsAsyncPager: @@ -215,7 +217,7 @@ async def list_key_rings( Args: - request (:class:`google.cloud.kms_v1.types.ListKeyRingsRequest`): + request (Union[google.cloud.kms_v1.types.ListKeyRingsRequest, dict]): The request object. Request message for [KeyManagementService.ListKeyRings][google.cloud.kms.v1.KeyManagementService.ListKeyRings]. parent (:class:`str`): @@ -296,10 +298,10 @@ async def list_key_rings( async def list_crypto_keys( self, - request: service.ListCryptoKeysRequest = None, + request: Union[service.ListCryptoKeysRequest, 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.ListCryptoKeysAsyncPager: @@ -307,7 +309,7 @@ async def list_crypto_keys( Args: - request (:class:`google.cloud.kms_v1.types.ListCryptoKeysRequest`): + request (Union[google.cloud.kms_v1.types.ListCryptoKeysRequest, dict]): The request object. Request message for [KeyManagementService.ListCryptoKeys][google.cloud.kms.v1.KeyManagementService.ListCryptoKeys]. parent (:class:`str`): @@ -388,10 +390,10 @@ async def list_crypto_keys( async def list_crypto_key_versions( self, - request: service.ListCryptoKeyVersionsRequest = None, + request: Union[service.ListCryptoKeyVersionsRequest, 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.ListCryptoKeyVersionsAsyncPager: @@ -399,7 +401,7 @@ async def list_crypto_key_versions( Args: - request (:class:`google.cloud.kms_v1.types.ListCryptoKeyVersionsRequest`): + request (Union[google.cloud.kms_v1.types.ListCryptoKeyVersionsRequest, dict]): The request object. Request message for [KeyManagementService.ListCryptoKeyVersions][google.cloud.kms.v1.KeyManagementService.ListCryptoKeyVersions]. parent (:class:`str`): @@ -481,10 +483,10 @@ async def list_crypto_key_versions( async def list_import_jobs( self, - request: service.ListImportJobsRequest = None, + request: Union[service.ListImportJobsRequest, 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.ListImportJobsAsyncPager: @@ -492,7 +494,7 @@ async def list_import_jobs( Args: - request (:class:`google.cloud.kms_v1.types.ListImportJobsRequest`): + request (Union[google.cloud.kms_v1.types.ListImportJobsRequest, dict]): The request object. Request message for [KeyManagementService.ListImportJobs][google.cloud.kms.v1.KeyManagementService.ListImportJobs]. parent (:class:`str`): @@ -573,10 +575,10 @@ async def list_import_jobs( async def get_key_ring( self, - request: service.GetKeyRingRequest = None, + request: Union[service.GetKeyRingRequest, 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.KeyRing: @@ -585,7 +587,7 @@ async def get_key_ring( Args: - request (:class:`google.cloud.kms_v1.types.GetKeyRingRequest`): + request (Union[google.cloud.kms_v1.types.GetKeyRingRequest, dict]): The request object. Request message for [KeyManagementService.GetKeyRing][google.cloud.kms.v1.KeyManagementService.GetKeyRing]. name (:class:`str`): @@ -657,10 +659,10 @@ async def get_key_ring( async def get_crypto_key( self, - request: service.GetCryptoKeyRequest = None, + request: Union[service.GetCryptoKeyRequest, 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.CryptoKey: @@ -671,7 +673,7 @@ async def get_crypto_key( Args: - request (:class:`google.cloud.kms_v1.types.GetCryptoKeyRequest`): + request (Union[google.cloud.kms_v1.types.GetCryptoKeyRequest, dict]): The request object. Request message for [KeyManagementService.GetCryptoKey][google.cloud.kms.v1.KeyManagementService.GetCryptoKey]. name (:class:`str`): @@ -749,10 +751,10 @@ async def get_crypto_key( async def get_crypto_key_version( self, - request: service.GetCryptoKeyVersionRequest = None, + request: Union[service.GetCryptoKeyVersionRequest, 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.CryptoKeyVersion: @@ -761,7 +763,7 @@ async def get_crypto_key_version( Args: - request (:class:`google.cloud.kms_v1.types.GetCryptoKeyVersionRequest`): + request (Union[google.cloud.kms_v1.types.GetCryptoKeyVersionRequest, dict]): The request object. Request message for [KeyManagementService.GetCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.GetCryptoKeyVersion]. name (:class:`str`): @@ -845,10 +847,10 @@ async def get_crypto_key_version( async def get_public_key( self, - request: service.GetPublicKeyRequest = None, + request: Union[service.GetPublicKeyRequest, 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.PublicKey: @@ -862,7 +864,7 @@ async def get_public_key( Args: - request (:class:`google.cloud.kms_v1.types.GetPublicKeyRequest`): + request (Union[google.cloud.kms_v1.types.GetPublicKeyRequest, dict]): The request object. Request message for [KeyManagementService.GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey]. name (:class:`str`): @@ -935,10 +937,10 @@ async def get_public_key( async def get_import_job( self, - request: service.GetImportJobRequest = None, + request: Union[service.GetImportJobRequest, 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.ImportJob: @@ -947,7 +949,7 @@ async def get_import_job( Args: - request (:class:`google.cloud.kms_v1.types.GetImportJobRequest`): + request (Union[google.cloud.kms_v1.types.GetImportJobRequest, dict]): The request object. Request message for [KeyManagementService.GetImportJob][google.cloud.kms.v1.KeyManagementService.GetImportJob]. name (:class:`str`): @@ -1062,12 +1064,12 @@ async def get_import_job( async def create_key_ring( self, - request: service.CreateKeyRingRequest = None, + request: Union[service.CreateKeyRingRequest, dict] = None, *, parent: str = None, key_ring_id: str = None, key_ring: resources.KeyRing = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.KeyRing: @@ -1076,7 +1078,7 @@ async def create_key_ring( Args: - request (:class:`google.cloud.kms_v1.types.CreateKeyRingRequest`): + request (Union[google.cloud.kms_v1.types.CreateKeyRingRequest, dict]): The request object. Request message for [KeyManagementService.CreateKeyRing][google.cloud.kms.v1.KeyManagementService.CreateKeyRing]. parent (:class:`str`): @@ -1167,12 +1169,12 @@ async def create_key_ring( async def create_crypto_key( self, - request: service.CreateCryptoKeyRequest = None, + request: Union[service.CreateCryptoKeyRequest, dict] = None, *, parent: str = None, crypto_key_id: str = None, crypto_key: resources.CryptoKey = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.CryptoKey: @@ -1185,7 +1187,7 @@ async def create_crypto_key( Args: - request (:class:`google.cloud.kms_v1.types.CreateCryptoKeyRequest`): + request (Union[google.cloud.kms_v1.types.CreateCryptoKeyRequest, dict]): The request object. Request message for [KeyManagementService.CreateCryptoKey][google.cloud.kms.v1.KeyManagementService.CreateCryptoKey]. parent (:class:`str`): @@ -1281,11 +1283,11 @@ async def create_crypto_key( async def create_crypto_key_version( self, - request: service.CreateCryptoKeyVersionRequest = None, + request: Union[service.CreateCryptoKeyVersionRequest, dict] = None, *, parent: str = None, crypto_key_version: resources.CryptoKeyVersion = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.CryptoKeyVersion: @@ -1300,7 +1302,7 @@ async def create_crypto_key_version( Args: - request (:class:`google.cloud.kms_v1.types.CreateCryptoKeyVersionRequest`): + request (Union[google.cloud.kms_v1.types.CreateCryptoKeyVersionRequest, dict]): The request object. Request message for [KeyManagementService.CreateCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.CreateCryptoKeyVersion]. parent (:class:`str`): @@ -1384,9 +1386,9 @@ async def create_crypto_key_version( async def import_crypto_key_version( self, - request: service.ImportCryptoKeyVersionRequest = None, + request: Union[service.ImportCryptoKeyVersionRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.CryptoKeyVersion: @@ -1403,7 +1405,7 @@ async def import_crypto_key_version( Args: - request (:class:`google.cloud.kms_v1.types.ImportCryptoKeyVersionRequest`): + request (Union[google.cloud.kms_v1.types.ImportCryptoKeyVersionRequest, dict]): The request object. Request message for [KeyManagementService.ImportCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.ImportCryptoKeyVersion]. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1454,12 +1456,12 @@ async def import_crypto_key_version( async def create_import_job( self, - request: service.CreateImportJobRequest = None, + request: Union[service.CreateImportJobRequest, dict] = None, *, parent: str = None, import_job_id: str = None, import_job: resources.ImportJob = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.ImportJob: @@ -1471,7 +1473,7 @@ async def create_import_job( Args: - request (:class:`google.cloud.kms_v1.types.CreateImportJobRequest`): + request (Union[google.cloud.kms_v1.types.CreateImportJobRequest, dict]): The request object. Request message for [KeyManagementService.CreateImportJob][google.cloud.kms.v1.KeyManagementService.CreateImportJob]. parent (:class:`str`): @@ -1604,11 +1606,11 @@ async def create_import_job( async def update_crypto_key( self, - request: service.UpdateCryptoKeyRequest = None, + request: Union[service.UpdateCryptoKeyRequest, dict] = None, *, crypto_key: resources.CryptoKey = 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.CryptoKey: @@ -1616,7 +1618,7 @@ async def update_crypto_key( Args: - request (:class:`google.cloud.kms_v1.types.UpdateCryptoKeyRequest`): + request (Union[google.cloud.kms_v1.types.UpdateCryptoKeyRequest, dict]): The request object. Request message for [KeyManagementService.UpdateCryptoKey][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKey]. crypto_key (:class:`google.cloud.kms_v1.types.CryptoKey`): @@ -1704,11 +1706,11 @@ async def update_crypto_key( async def update_crypto_key_version( self, - request: service.UpdateCryptoKeyVersionRequest = None, + request: Union[service.UpdateCryptoKeyVersionRequest, dict] = None, *, crypto_key_version: resources.CryptoKeyVersion = 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.CryptoKeyVersion: @@ -1729,7 +1731,7 @@ async def update_crypto_key_version( Args: - request (:class:`google.cloud.kms_v1.types.UpdateCryptoKeyVersionRequest`): + request (Union[google.cloud.kms_v1.types.UpdateCryptoKeyVersionRequest, dict]): The request object. Request message for [KeyManagementService.UpdateCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKeyVersion]. crypto_key_version (:class:`google.cloud.kms_v1.types.CryptoKeyVersion`): @@ -1823,11 +1825,11 @@ async def update_crypto_key_version( async def update_crypto_key_primary_version( self, - request: service.UpdateCryptoKeyPrimaryVersionRequest = None, + request: Union[service.UpdateCryptoKeyPrimaryVersionRequest, dict] = None, *, name: str = None, crypto_key_version_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.CryptoKey: @@ -1840,7 +1842,7 @@ async def update_crypto_key_primary_version( Args: - request (:class:`google.cloud.kms_v1.types.UpdateCryptoKeyPrimaryVersionRequest`): + request (Union[google.cloud.kms_v1.types.UpdateCryptoKeyPrimaryVersionRequest, dict]): The request object. Request message for [KeyManagementService.UpdateCryptoKeyPrimaryVersion][google.cloud.kms.v1.KeyManagementService.UpdateCryptoKeyPrimaryVersion]. name (:class:`str`): @@ -1927,10 +1929,10 @@ async def update_crypto_key_primary_version( async def destroy_crypto_key_version( self, - request: service.DestroyCryptoKeyVersionRequest = None, + request: Union[service.DestroyCryptoKeyVersionRequest, 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.CryptoKeyVersion: @@ -1960,7 +1962,7 @@ async def destroy_crypto_key_version( Args: - request (:class:`google.cloud.kms_v1.types.DestroyCryptoKeyVersionRequest`): + request (Union[google.cloud.kms_v1.types.DestroyCryptoKeyVersionRequest, dict]): The request object. Request message for [KeyManagementService.DestroyCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.DestroyCryptoKeyVersion]. name (:class:`str`): @@ -2043,10 +2045,10 @@ async def destroy_crypto_key_version( async def restore_crypto_key_version( self, - request: service.RestoreCryptoKeyVersionRequest = None, + request: Union[service.RestoreCryptoKeyVersionRequest, 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.CryptoKeyVersion: @@ -2065,7 +2067,7 @@ async def restore_crypto_key_version( Args: - request (:class:`google.cloud.kms_v1.types.RestoreCryptoKeyVersionRequest`): + request (Union[google.cloud.kms_v1.types.RestoreCryptoKeyVersionRequest, dict]): The request object. Request message for [KeyManagementService.RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion]. name (:class:`str`): @@ -2148,11 +2150,11 @@ async def restore_crypto_key_version( async def encrypt( self, - request: service.EncryptRequest = None, + request: Union[service.EncryptRequest, dict] = None, *, name: str = None, plaintext: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.EncryptResponse: @@ -2164,7 +2166,7 @@ async def encrypt( Args: - request (:class:`google.cloud.kms_v1.types.EncryptRequest`): + request (Union[google.cloud.kms_v1.types.EncryptRequest, dict]): The request object. Request message for [KeyManagementService.Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt]. name (:class:`str`): @@ -2260,11 +2262,11 @@ async def encrypt( async def decrypt( self, - request: service.DecryptRequest = None, + request: Union[service.DecryptRequest, dict] = None, *, name: str = None, ciphertext: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.DecryptResponse: @@ -2276,7 +2278,7 @@ async def decrypt( Args: - request (:class:`google.cloud.kms_v1.types.DecryptRequest`): + request (Union[google.cloud.kms_v1.types.DecryptRequest, dict]): The request object. Request message for [KeyManagementService.Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt]. name (:class:`str`): @@ -2358,11 +2360,11 @@ async def decrypt( async def asymmetric_sign( self, - request: service.AsymmetricSignRequest = None, + request: Union[service.AsymmetricSignRequest, dict] = None, *, name: str = None, digest: service.Digest = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.AsymmetricSignResponse: @@ -2375,7 +2377,7 @@ async def asymmetric_sign( Args: - request (:class:`google.cloud.kms_v1.types.AsymmetricSignRequest`): + request (Union[google.cloud.kms_v1.types.AsymmetricSignRequest, dict]): The request object. Request message for [KeyManagementService.AsymmetricSign][google.cloud.kms.v1.KeyManagementService.AsymmetricSign]. name (:class:`str`): @@ -2458,11 +2460,11 @@ async def asymmetric_sign( async def asymmetric_decrypt( self, - request: service.AsymmetricDecryptRequest = None, + request: Union[service.AsymmetricDecryptRequest, dict] = None, *, name: str = None, ciphertext: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.AsymmetricDecryptResponse: @@ -2476,7 +2478,7 @@ async def asymmetric_decrypt( Args: - request (:class:`google.cloud.kms_v1.types.AsymmetricDecryptRequest`): + request (Union[google.cloud.kms_v1.types.AsymmetricDecryptRequest, dict]): The request object. Request message for [KeyManagementService.AsymmetricDecrypt][google.cloud.kms.v1.KeyManagementService.AsymmetricDecrypt]. name (:class:`str`): @@ -2558,11 +2560,11 @@ async def asymmetric_decrypt( async def mac_sign( self, - request: service.MacSignRequest = None, + request: Union[service.MacSignRequest, dict] = None, *, name: str = None, data: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.MacSignResponse: @@ -2574,7 +2576,7 @@ async def mac_sign( Args: - request (:class:`google.cloud.kms_v1.types.MacSignRequest`): + request (Union[google.cloud.kms_v1.types.MacSignRequest, dict]): The request object. Request message for [KeyManagementService.MacSign][google.cloud.kms.v1.KeyManagementService.MacSign]. name (:class:`str`): @@ -2656,12 +2658,12 @@ async def mac_sign( async def mac_verify( self, - request: service.MacVerifyRequest = None, + request: Union[service.MacVerifyRequest, dict] = None, *, name: str = None, data: bytes = None, mac: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.MacVerifyResponse: @@ -2673,7 +2675,7 @@ async def mac_verify( Args: - request (:class:`google.cloud.kms_v1.types.MacVerifyRequest`): + request (Union[google.cloud.kms_v1.types.MacVerifyRequest, dict]): The request object. Request message for [KeyManagementService.MacVerify][google.cloud.kms.v1.KeyManagementService.MacVerify]. name (:class:`str`): @@ -2762,12 +2764,12 @@ async def mac_verify( async def generate_random_bytes( self, - request: service.GenerateRandomBytesRequest = None, + request: Union[service.GenerateRandomBytesRequest, dict] = None, *, location: str = None, length_bytes: int = None, protection_level: resources.ProtectionLevel = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.GenerateRandomBytesResponse: @@ -2776,7 +2778,7 @@ async def generate_random_bytes( Args: - request (:class:`google.cloud.kms_v1.types.GenerateRandomBytesRequest`): + request (Union[google.cloud.kms_v1.types.GenerateRandomBytesRequest, dict]): The request object. Request message for [KeyManagementService.GenerateRandomBytes][google.cloud.kms.v1.KeyManagementService.GenerateRandomBytes]. location (:class:`str`): @@ -2872,7 +2874,7 @@ async def set_iam_policy( self, request: iam_policy_pb2.SetIamPolicyRequest = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2984,7 +2986,7 @@ async def get_iam_policy( self, request: iam_policy_pb2.GetIamPolicyRequest = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -3097,7 +3099,7 @@ async def test_iam_permissions( self, request: iam_policy_pb2.TestIamPermissionsRequest = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/kms_v1/services/key_management_service/client.py b/google/cloud/kms_v1/services/key_management_service/client.py index 639c5801..f693f31d 100644 --- a/google/cloud/kms_v1/services/key_management_service/client.py +++ b/google/cloud/kms_v1/services/key_management_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.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.types import resources from google.cloud.kms_v1.types import service @@ -472,7 +474,7 @@ def list_key_rings( request: Union[service.ListKeyRingsRequest, 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.ListKeyRingsPager: @@ -554,7 +556,7 @@ def list_crypto_keys( request: Union[service.ListCryptoKeysRequest, 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.ListCryptoKeysPager: @@ -636,7 +638,7 @@ def list_crypto_key_versions( request: Union[service.ListCryptoKeyVersionsRequest, 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.ListCryptoKeyVersionsPager: @@ -719,7 +721,7 @@ def list_import_jobs( request: Union[service.ListImportJobsRequest, 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.ListImportJobsPager: @@ -801,7 +803,7 @@ def get_key_ring( request: Union[service.GetKeyRingRequest, 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.KeyRing: @@ -875,7 +877,7 @@ def get_crypto_key( request: Union[service.GetCryptoKeyRequest, 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.CryptoKey: @@ -957,7 +959,7 @@ def get_crypto_key_version( request: Union[service.GetCryptoKeyVersionRequest, 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.CryptoKeyVersion: @@ -1043,7 +1045,7 @@ def get_public_key( request: Union[service.GetPublicKeyRequest, 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.PublicKey: @@ -1123,7 +1125,7 @@ def get_import_job( request: Union[service.GetImportJobRequest, 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.ImportJob: @@ -1242,7 +1244,7 @@ def create_key_ring( parent: str = None, key_ring_id: str = None, key_ring: resources.KeyRing = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.KeyRing: @@ -1337,7 +1339,7 @@ def create_crypto_key( parent: str = None, crypto_key_id: str = None, crypto_key: resources.CryptoKey = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.CryptoKey: @@ -1440,7 +1442,7 @@ def create_crypto_key_version( *, parent: str = None, crypto_key_version: resources.CryptoKeyVersion = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.CryptoKeyVersion: @@ -1543,7 +1545,7 @@ def import_crypto_key_version( self, request: Union[service.ImportCryptoKeyVersionRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.CryptoKeyVersion: @@ -1619,7 +1621,7 @@ def create_import_job( parent: str = None, import_job_id: str = None, import_job: resources.ImportJob = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> resources.ImportJob: @@ -1758,7 +1760,7 @@ def update_crypto_key( *, crypto_key: resources.CryptoKey = 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.CryptoKey: @@ -1848,7 +1850,7 @@ def update_crypto_key_version( *, crypto_key_version: resources.CryptoKeyVersion = 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.CryptoKeyVersion: @@ -1959,7 +1961,7 @@ def update_crypto_key_primary_version( *, name: str = None, crypto_key_version_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.CryptoKey: @@ -2054,7 +2056,7 @@ def destroy_crypto_key_version( request: Union[service.DestroyCryptoKeyVersionRequest, 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.CryptoKeyVersion: @@ -2162,7 +2164,7 @@ def restore_crypto_key_version( request: Union[service.RestoreCryptoKeyVersionRequest, 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.CryptoKeyVersion: @@ -2260,7 +2262,7 @@ def encrypt( *, name: str = None, plaintext: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.EncryptResponse: @@ -2362,7 +2364,7 @@ def decrypt( *, name: str = None, ciphertext: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.DecryptResponse: @@ -2450,7 +2452,7 @@ def asymmetric_sign( *, name: str = None, digest: service.Digest = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.AsymmetricSignResponse: @@ -2540,7 +2542,7 @@ def asymmetric_decrypt( *, name: str = None, ciphertext: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.AsymmetricDecryptResponse: @@ -2630,7 +2632,7 @@ def mac_sign( *, name: str = None, data: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.MacSignResponse: @@ -2719,7 +2721,7 @@ def mac_verify( name: str = None, data: bytes = None, mac: bytes = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.MacVerifyResponse: @@ -2815,7 +2817,7 @@ def generate_random_bytes( location: str = None, length_bytes: int = None, protection_level: resources.ProtectionLevel = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> service.GenerateRandomBytesResponse: @@ -2923,7 +2925,7 @@ def set_iam_policy( self, request: iam_policy_pb2.SetIamPolicyRequest = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -3035,7 +3037,7 @@ def get_iam_policy( self, request: iam_policy_pb2.GetIamPolicyRequest = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -3148,7 +3150,7 @@ def test_iam_permissions( self, request: iam_policy_pb2.TestIamPermissionsRequest = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/kms_v1/services/key_management_service/transports/base.py b/google/cloud/kms_v1/services/key_management_service/transports/base.py index 64dfd11a..aa996a8d 100644 --- a/google/cloud/kms_v1/services/key_management_service/transports/base.py +++ b/google/cloud/kms_v1/services/key_management_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 @@ -38,15 +37,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 KeyManagementServiceTransport(abc.ABC): """Abstract transport class for KeyManagementService.""" @@ -99,7 +89,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 @@ -132,29 +122,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 = { diff --git a/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py b/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py index 6049cfb4..6cefe660 100644 --- a/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py +++ b/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # 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 diff --git a/google/cloud/kms_v1/types/resources.py b/google/cloud/kms_v1/types/resources.py index 91c0ecdd..813a87d1 100644 --- a/google/cloud/kms_v1/types/resources.py +++ b/google/cloud/kms_v1/types/resources.py @@ -74,6 +74,9 @@ class CryptoKey(proto.Message): more [versions][google.cloud.kms.v1.CryptoKeyVersion], which represent the actual key material used in cryptographic operations. + + .. _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 @@ -138,6 +141,7 @@ class CryptoKey(proto.Message): [ENCRYPT_DECRYPT][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT] support automatic rotation. For other keys, this field must be omitted. + This field is a member of `oneof`_ ``rotation_schedule``. version_template (google.cloud.kms_v1.types.CryptoKeyVersionTemplate): A template describing settings for new [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] diff --git a/google/cloud/kms_v1/types/service.py b/google/cloud/kms_v1/types/service.py index c3d32be9..4374489e 100644 --- a/google/cloud/kms_v1/types/service.py +++ b/google/cloud/kms_v1/types/service.py @@ -496,6 +496,9 @@ class ImportCryptoKeyVersionRequest(proto.Message): r"""Request message for [KeyManagementService.ImportCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.ImportCryptoKeyVersion]. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: parent (str): Required. The [name][google.cloud.kms.v1.CryptoKey.name] of @@ -573,6 +576,7 @@ class ImportCryptoKeyVersionRequest(proto.Message): This format is the same as the format produced by PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP. + This field is a member of `oneof`_ ``wrapped_key_material``. """ parent = proto.Field(proto.STRING, number=1,) @@ -1533,16 +1537,26 @@ class Digest(proto.Message): r"""A [Digest][google.cloud.kms.v1.Digest] holds a cryptographic message digest. + 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: sha256 (bytes): A message digest produced with the SHA-256 algorithm. + This field is a member of `oneof`_ ``digest``. sha384 (bytes): A message digest produced with the SHA-384 algorithm. + This field is a member of `oneof`_ ``digest``. sha512 (bytes): A message digest produced with the SHA-512 algorithm. + This field is a member of `oneof`_ ``digest``. """ sha256 = proto.Field(proto.BYTES, number=1, oneof="digest",) diff --git a/setup.py b/setup.py index 7d89517a..4cfecc87 100644 --- a/setup.py +++ b/setup.py @@ -27,10 +27,9 @@ # 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", "grpc-google-iam-v1 >= 0.12.3, < 0.13dev", "proto-plus >= 1.4.0", - "packaging >= 14.3", ] extras = {"libcst": "libcst >= 0.2.5"} diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 6748db84..0b8d52d6 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,11 +5,7 @@ # # 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 grpc-google-iam-v1==0.12.3 proto-plus==1.4.0 libcst==0.2.5 -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/kms_v1/test_key_management_service.py b/tests/unit/gapic/kms_v1/test_key_management_service.py index ee18395b..d3739179 100644 --- a/tests/unit/gapic/kms_v1/test_key_management_service.py +++ b/tests/unit/gapic/kms_v1/test_key_management_service.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -40,9 +39,6 @@ ) from google.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.services.key_management_service import transports -from google.cloud.kms_v1.services.key_management_service.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.kms_v1.types import resources from google.cloud.kms_v1.types import service from google.iam.v1 import iam_policy_pb2 # type: ignore @@ -56,20 +52,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" @@ -231,7 +213,7 @@ def test_key_management_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, @@ -248,7 +230,7 @@ def test_key_management_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, @@ -265,7 +247,7 @@ def test_key_management_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, @@ -294,7 +276,7 @@ def test_key_management_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, @@ -363,7 +345,7 @@ def test_key_management_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 @@ -405,7 +387,7 @@ def test_key_management_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, @@ -427,7 +409,7 @@ def test_key_management_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, @@ -462,7 +444,7 @@ def test_key_management_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, @@ -497,7 +479,7 @@ def test_key_management_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", @@ -7422,7 +7404,6 @@ def test_key_management_service_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_key_management_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -7446,29 +7427,6 @@ def test_key_management_service_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_key_management_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.kms_v1.services.key_management_service.transports.KeyManagementServiceTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.KeyManagementServiceTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloudkms", - ), - quota_project_id="octopus", - ) - - def test_key_management_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( @@ -7480,7 +7438,6 @@ def test_key_management_service_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_key_management_service_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -7496,21 +7453,6 @@ def test_key_management_service_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_key_management_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) - KeyManagementServiceClient() - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloudkms", - ), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -7518,7 +7460,6 @@ def test_key_management_service_auth_adc_old_google_auth(): transports.KeyManagementServiceGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_key_management_service_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -7535,29 +7476,6 @@ def test_key_management_service_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.KeyManagementServiceGrpcTransport, - transports.KeyManagementServiceGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_key_management_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", - "https://www.googleapis.com/auth/cloudkms", - ), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [