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

Commit

Permalink
Browse files Browse the repository at this point in the history
chore: use gapic-generator-python 0.53.4 (#200)
- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: googleapis/googleapis-gen@2ff001f
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
  • Loading branch information
gcf-owl-bot[bot] committed Nov 1, 2021
1 parent 8f3f7c7 commit 6d7b8c1
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 244 deletions.
166 changes: 84 additions & 82 deletions google/cloud/kms_v1/services/key_management_service/async_client.py

Large diffs are not rendered by default.

60 changes: 31 additions & 29 deletions google/cloud/kms_v1/services/key_management_service/client.py
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Expand Up @@ -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
Expand All @@ -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."""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 = {
Expand Down
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/kms_v1/types/resources.py
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 6d7b8c1

Please sign in to comment.