Skip to content

Commit 2ec8438

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
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
1 parent 8af4fc5 commit 2ec8438

9 files changed

Lines changed: 145 additions & 244 deletions

File tree

‎packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py‎

Lines changed: 84 additions & 82 deletions
Large diffs are not rendered by default.

‎packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.cloud.kms_v1.services.key_management_service import pagers
3436
from google.cloud.kms_v1.types import resources
3537
from google.cloud.kms_v1.types import service
@@ -472,7 +474,7 @@ def list_key_rings(
472474
request: Union[service.ListKeyRingsRequest, dict] = None,
473475
*,
474476
parent: str = None,
475-
retry: retries.Retry = gapic_v1.method.DEFAULT,
477+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
476478
timeout: float = None,
477479
metadata: Sequence[Tuple[str, str]] = (),
478480
) -> pagers.ListKeyRingsPager:
@@ -554,7 +556,7 @@ def list_crypto_keys(
554556
request: Union[service.ListCryptoKeysRequest, dict] = None,
555557
*,
556558
parent: str = None,
557-
retry: retries.Retry = gapic_v1.method.DEFAULT,
559+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
558560
timeout: float = None,
559561
metadata: Sequence[Tuple[str, str]] = (),
560562
) -> pagers.ListCryptoKeysPager:
@@ -636,7 +638,7 @@ def list_crypto_key_versions(
636638
request: Union[service.ListCryptoKeyVersionsRequest, dict] = None,
637639
*,
638640
parent: str = None,
639-
retry: retries.Retry = gapic_v1.method.DEFAULT,
641+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
640642
timeout: float = None,
641643
metadata: Sequence[Tuple[str, str]] = (),
642644
) -> pagers.ListCryptoKeyVersionsPager:
@@ -719,7 +721,7 @@ def list_import_jobs(
719721
request: Union[service.ListImportJobsRequest, dict] = None,
720722
*,
721723
parent: str = None,
722-
retry: retries.Retry = gapic_v1.method.DEFAULT,
724+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
723725
timeout: float = None,
724726
metadata: Sequence[Tuple[str, str]] = (),
725727
) -> pagers.ListImportJobsPager:
@@ -801,7 +803,7 @@ def get_key_ring(
801803
request: Union[service.GetKeyRingRequest, dict] = None,
802804
*,
803805
name: str = None,
804-
retry: retries.Retry = gapic_v1.method.DEFAULT,
806+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
805807
timeout: float = None,
806808
metadata: Sequence[Tuple[str, str]] = (),
807809
) -> resources.KeyRing:
@@ -875,7 +877,7 @@ def get_crypto_key(
875877
request: Union[service.GetCryptoKeyRequest, dict] = None,
876878
*,
877879
name: str = None,
878-
retry: retries.Retry = gapic_v1.method.DEFAULT,
880+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
879881
timeout: float = None,
880882
metadata: Sequence[Tuple[str, str]] = (),
881883
) -> resources.CryptoKey:
@@ -957,7 +959,7 @@ def get_crypto_key_version(
957959
request: Union[service.GetCryptoKeyVersionRequest, dict] = None,
958960
*,
959961
name: str = None,
960-
retry: retries.Retry = gapic_v1.method.DEFAULT,
962+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
961963
timeout: float = None,
962964
metadata: Sequence[Tuple[str, str]] = (),
963965
) -> resources.CryptoKeyVersion:
@@ -1043,7 +1045,7 @@ def get_public_key(
10431045
request: Union[service.GetPublicKeyRequest, dict] = None,
10441046
*,
10451047
name: str = None,
1046-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1048+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10471049
timeout: float = None,
10481050
metadata: Sequence[Tuple[str, str]] = (),
10491051
) -> resources.PublicKey:
@@ -1123,7 +1125,7 @@ def get_import_job(
11231125
request: Union[service.GetImportJobRequest, dict] = None,
11241126
*,
11251127
name: str = None,
1126-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1128+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11271129
timeout: float = None,
11281130
metadata: Sequence[Tuple[str, str]] = (),
11291131
) -> resources.ImportJob:
@@ -1242,7 +1244,7 @@ def create_key_ring(
12421244
parent: str = None,
12431245
key_ring_id: str = None,
12441246
key_ring: resources.KeyRing = None,
1245-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1247+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12461248
timeout: float = None,
12471249
metadata: Sequence[Tuple[str, str]] = (),
12481250
) -> resources.KeyRing:
@@ -1337,7 +1339,7 @@ def create_crypto_key(
13371339
parent: str = None,
13381340
crypto_key_id: str = None,
13391341
crypto_key: resources.CryptoKey = None,
1340-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1342+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13411343
timeout: float = None,
13421344
metadata: Sequence[Tuple[str, str]] = (),
13431345
) -> resources.CryptoKey:
@@ -1440,7 +1442,7 @@ def create_crypto_key_version(
14401442
*,
14411443
parent: str = None,
14421444
crypto_key_version: resources.CryptoKeyVersion = None,
1443-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1445+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14441446
timeout: float = None,
14451447
metadata: Sequence[Tuple[str, str]] = (),
14461448
) -> resources.CryptoKeyVersion:
@@ -1543,7 +1545,7 @@ def import_crypto_key_version(
15431545
self,
15441546
request: Union[service.ImportCryptoKeyVersionRequest, dict] = None,
15451547
*,
1546-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1548+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15471549
timeout: float = None,
15481550
metadata: Sequence[Tuple[str, str]] = (),
15491551
) -> resources.CryptoKeyVersion:
@@ -1619,7 +1621,7 @@ def create_import_job(
16191621
parent: str = None,
16201622
import_job_id: str = None,
16211623
import_job: resources.ImportJob = None,
1622-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1624+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16231625
timeout: float = None,
16241626
metadata: Sequence[Tuple[str, str]] = (),
16251627
) -> resources.ImportJob:
@@ -1758,7 +1760,7 @@ def update_crypto_key(
17581760
*,
17591761
crypto_key: resources.CryptoKey = None,
17601762
update_mask: field_mask_pb2.FieldMask = None,
1761-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1763+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17621764
timeout: float = None,
17631765
metadata: Sequence[Tuple[str, str]] = (),
17641766
) -> resources.CryptoKey:
@@ -1848,7 +1850,7 @@ def update_crypto_key_version(
18481850
*,
18491851
crypto_key_version: resources.CryptoKeyVersion = None,
18501852
update_mask: field_mask_pb2.FieldMask = None,
1851-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1853+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18521854
timeout: float = None,
18531855
metadata: Sequence[Tuple[str, str]] = (),
18541856
) -> resources.CryptoKeyVersion:
@@ -1959,7 +1961,7 @@ def update_crypto_key_primary_version(
19591961
*,
19601962
name: str = None,
19611963
crypto_key_version_id: str = None,
1962-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1964+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19631965
timeout: float = None,
19641966
metadata: Sequence[Tuple[str, str]] = (),
19651967
) -> resources.CryptoKey:
@@ -2054,7 +2056,7 @@ def destroy_crypto_key_version(
20542056
request: Union[service.DestroyCryptoKeyVersionRequest, dict] = None,
20552057
*,
20562058
name: str = None,
2057-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2059+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20582060
timeout: float = None,
20592061
metadata: Sequence[Tuple[str, str]] = (),
20602062
) -> resources.CryptoKeyVersion:
@@ -2162,7 +2164,7 @@ def restore_crypto_key_version(
21622164
request: Union[service.RestoreCryptoKeyVersionRequest, dict] = None,
21632165
*,
21642166
name: str = None,
2165-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2167+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21662168
timeout: float = None,
21672169
metadata: Sequence[Tuple[str, str]] = (),
21682170
) -> resources.CryptoKeyVersion:
@@ -2260,7 +2262,7 @@ def encrypt(
22602262
*,
22612263
name: str = None,
22622264
plaintext: bytes = None,
2263-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2265+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22642266
timeout: float = None,
22652267
metadata: Sequence[Tuple[str, str]] = (),
22662268
) -> service.EncryptResponse:
@@ -2362,7 +2364,7 @@ def decrypt(
23622364
*,
23632365
name: str = None,
23642366
ciphertext: bytes = None,
2365-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2367+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23662368
timeout: float = None,
23672369
metadata: Sequence[Tuple[str, str]] = (),
23682370
) -> service.DecryptResponse:
@@ -2450,7 +2452,7 @@ def asymmetric_sign(
24502452
*,
24512453
name: str = None,
24522454
digest: service.Digest = None,
2453-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2455+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24542456
timeout: float = None,
24552457
metadata: Sequence[Tuple[str, str]] = (),
24562458
) -> service.AsymmetricSignResponse:
@@ -2540,7 +2542,7 @@ def asymmetric_decrypt(
25402542
*,
25412543
name: str = None,
25422544
ciphertext: bytes = None,
2543-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2545+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25442546
timeout: float = None,
25452547
metadata: Sequence[Tuple[str, str]] = (),
25462548
) -> service.AsymmetricDecryptResponse:
@@ -2630,7 +2632,7 @@ def mac_sign(
26302632
*,
26312633
name: str = None,
26322634
data: bytes = None,
2633-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2635+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
26342636
timeout: float = None,
26352637
metadata: Sequence[Tuple[str, str]] = (),
26362638
) -> service.MacSignResponse:
@@ -2719,7 +2721,7 @@ def mac_verify(
27192721
name: str = None,
27202722
data: bytes = None,
27212723
mac: bytes = None,
2722-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2724+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27232725
timeout: float = None,
27242726
metadata: Sequence[Tuple[str, str]] = (),
27252727
) -> service.MacVerifyResponse:
@@ -2815,7 +2817,7 @@ def generate_random_bytes(
28152817
location: str = None,
28162818
length_bytes: int = None,
28172819
protection_level: resources.ProtectionLevel = None,
2818-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2820+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28192821
timeout: float = None,
28202822
metadata: Sequence[Tuple[str, str]] = (),
28212823
) -> service.GenerateRandomBytesResponse:
@@ -2923,7 +2925,7 @@ def set_iam_policy(
29232925
self,
29242926
request: iam_policy_pb2.SetIamPolicyRequest = None,
29252927
*,
2926-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2928+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29272929
timeout: float = None,
29282930
metadata: Sequence[Tuple[str, str]] = (),
29292931
) -> policy_pb2.Policy:
@@ -3035,7 +3037,7 @@ def get_iam_policy(
30353037
self,
30363038
request: iam_policy_pb2.GetIamPolicyRequest = None,
30373039
*,
3038-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3040+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30393041
timeout: float = None,
30403042
metadata: Sequence[Tuple[str, str]] = (),
30413043
) -> policy_pb2.Policy:
@@ -3148,7 +3150,7 @@ def test_iam_permissions(
31483150
self,
31493151
request: iam_policy_pb2.TestIamPermissionsRequest = None,
31503152
*,
3151-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3153+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
31523154
timeout: float = None,
31533155
metadata: Sequence[Tuple[str, str]] = (),
31543156
) -> iam_policy_pb2.TestIamPermissionsResponse:

‎packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -38,15 +37,6 @@
3837
except pkg_resources.DistributionNotFound:
3938
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4039

41-
try:
42-
# google.auth.__version__ was added in 1.26.0
43-
_GOOGLE_AUTH_VERSION = google.auth.__version__
44-
except AttributeError:
45-
try: # try pkg_resources if it is available
46-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
47-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
48-
_GOOGLE_AUTH_VERSION = None
49-
5040

5141
class KeyManagementServiceTransport(abc.ABC):
5242
"""Abstract transport class for KeyManagementService."""
@@ -99,7 +89,7 @@ def __init__(
9989
host += ":443"
10090
self._host = host
10191

102-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
92+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10393

10494
# Save the scopes.
10595
self._scopes = scopes
@@ -132,29 +122,6 @@ def __init__(
132122
# Save the credentials.
133123
self._credentials = credentials
134124

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

‎packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

‎packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ class CryptoKey(proto.Message):
7474
more [versions][google.cloud.kms.v1.CryptoKeyVersion], which
7575
represent the actual key material used in cryptographic operations.
7676
77+
78+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
79+
7780
Attributes:
7881
name (str):
7982
Output only. The resource name for this
@@ -138,6 +141,7 @@ class CryptoKey(proto.Message):
138141
[ENCRYPT_DECRYPT][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT]
139142
support automatic rotation. For other keys, this field must
140143
be omitted.
144+
This field is a member of `oneof`_ ``rotation_schedule``.
141145
version_template (google.cloud.kms_v1.types.CryptoKeyVersionTemplate):
142146
A template describing settings for new
143147
[CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]

0 commit comments

Comments
 (0)