diff --git a/CHANGELOG.md b/CHANGELOG.md index b06f82e5..4192a805 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://pypi.org/project/google-cloud-kms/#history +## [2.7.0](https://www.github.com/googleapis/python-kms/compare/v2.6.1...v2.7.0) (2021-09-30) + + +### Features + +* add OAEP+SHA1 to the list of supported algorithms ([#181](https://www.github.com/googleapis/python-kms/issues/181)) ([65b2c97](https://www.github.com/googleapis/python-kms/commit/65b2c975d2635cd562a0e4b7ff8f1989643929ee)) + + +### Bug Fixes + +* improper types in pagers generation ([8ff7501](https://www.github.com/googleapis/python-kms/commit/8ff75018aeacd87bd00abb4a12a130f3e28604f5)) + ### [2.6.1](https://www.github.com/googleapis/python-kms/compare/v2.6.0...v2.6.1) (2021-09-24) diff --git a/google/cloud/kms_v1/services/key_management_service/pagers.py b/google/cloud/kms_v1/services/key_management_service/pagers.py index 4ffc83d0..db911cba 100644 --- a/google/cloud/kms_v1/services/key_management_service/pagers.py +++ b/google/cloud/kms_v1/services/key_management_service/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.kms_v1.types import resources @@ -75,14 +75,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[service.ListKeyRingsResponse]: + def pages(self) -> Iterator[service.ListKeyRingsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[resources.KeyRing]: + def __iter__(self) -> Iterator[resources.KeyRing]: for page in self.pages: yield from page.key_rings @@ -137,14 +137,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[service.ListKeyRingsResponse]: + async def pages(self) -> AsyncIterator[service.ListKeyRingsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[resources.KeyRing]: + def __aiter__(self) -> AsyncIterator[resources.KeyRing]: async def async_generator(): async for page in self.pages: for response in page.key_rings: @@ -203,14 +203,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[service.ListCryptoKeysResponse]: + def pages(self) -> Iterator[service.ListCryptoKeysResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[resources.CryptoKey]: + def __iter__(self) -> Iterator[resources.CryptoKey]: for page in self.pages: yield from page.crypto_keys @@ -265,14 +265,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[service.ListCryptoKeysResponse]: + async def pages(self) -> AsyncIterator[service.ListCryptoKeysResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[resources.CryptoKey]: + def __aiter__(self) -> AsyncIterator[resources.CryptoKey]: async def async_generator(): async for page in self.pages: for response in page.crypto_keys: @@ -331,14 +331,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[service.ListCryptoKeyVersionsResponse]: + def pages(self) -> Iterator[service.ListCryptoKeyVersionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[resources.CryptoKeyVersion]: + def __iter__(self) -> Iterator[resources.CryptoKeyVersion]: for page in self.pages: yield from page.crypto_key_versions @@ -393,14 +393,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[service.ListCryptoKeyVersionsResponse]: + async def pages(self) -> AsyncIterator[service.ListCryptoKeyVersionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[resources.CryptoKeyVersion]: + def __aiter__(self) -> AsyncIterator[resources.CryptoKeyVersion]: async def async_generator(): async for page in self.pages: for response in page.crypto_key_versions: @@ -459,14 +459,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[service.ListImportJobsResponse]: + def pages(self) -> Iterator[service.ListImportJobsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[resources.ImportJob]: + def __iter__(self) -> Iterator[resources.ImportJob]: for page in self.pages: yield from page.import_jobs @@ -521,14 +521,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[service.ListImportJobsResponse]: + async def pages(self) -> AsyncIterator[service.ListImportJobsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[resources.ImportJob]: + def __aiter__(self) -> AsyncIterator[resources.ImportJob]: async def async_generator(): async for page in self.pages: for response in page.import_jobs: diff --git a/google/cloud/kms_v1/types/resources.py b/google/cloud/kms_v1/types/resources.py index 6686a3ca..8f2da1b3 100644 --- a/google/cloud/kms_v1/types/resources.py +++ b/google/cloud/kms_v1/types/resources.py @@ -412,6 +412,9 @@ class CryptoKeyVersionAlgorithm(proto.Enum): RSA_DECRYPT_OAEP_3072_SHA256 = 9 RSA_DECRYPT_OAEP_4096_SHA256 = 10 RSA_DECRYPT_OAEP_4096_SHA512 = 17 + RSA_DECRYPT_OAEP_2048_SHA1 = 37 + RSA_DECRYPT_OAEP_3072_SHA1 = 38 + RSA_DECRYPT_OAEP_4096_SHA1 = 39 EC_SIGN_P256_SHA256 = 12 EC_SIGN_P384_SHA384 = 13 EC_SIGN_SECP256K1_SHA256 = 31 diff --git a/samples/attestations/requirements.txt b/samples/attestations/requirements.txt index c4de97d0..5b16bed4 100644 --- a/samples/attestations/requirements.txt +++ b/samples/attestations/requirements.txt @@ -1,2 +1,2 @@ -cryptography==3.4.8 +cryptography==35.0.0 pem==21.2.0 diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index 25f8cee0..4c762c59 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,3 +1,3 @@ -google-cloud-kms==2.6.0 -cryptography==3.4.8 +google-cloud-kms==2.6.1 +cryptography==35.0.0 crcmod==1.7 diff --git a/setup.py b/setup.py index 89938251..5fe481a4 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ name = "google-cloud-kms" description = "Cloud Key Management Service (KMS) API client library" -version = "2.6.1" +version = "2.7.0" release_status = "Development Status :: 5 - Production/Stable" dependencies = [ # NOTE: Maintainers, please do not require google-api-core>=2.x.x