diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 0a459e81e48c..8002a431d349 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -963,9 +963,7 @@ "filename": "sdk/keyvault/**", "words": [ "eddsa", - "Thawte", - "myalias", - "mydomain" + "Thawte" ] }, { diff --git a/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md b/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md index cc1929a10aa2..f300f65eb97a 100644 --- a/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md +++ b/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md @@ -1,20 +1,16 @@ # Release History -## 4.5.0b1 (Unreleased) +## 4.5.0 (2024-10-17) ### Features Added -- Added support for service API version `7.6-preview.1` - Added support for Continuous Access Evaluation (CAE). `enable_cae=True` is passed to all `get_token` requests. -### Breaking Changes - ### Bugs Fixed - Typing errors from using Key Vault clients as context managers have been fixed ([#34744](https://github.com/Azure/azure-sdk-for-python/issues/34744)) ### Other Changes - Updated minimum `azure-core` version to 1.31.0 -- Key Vault API version `7.6-preview.1` is now the default ## 4.4.0 (2024-02-22) diff --git a/sdk/keyvault/azure-keyvault-administration/assets.json b/sdk/keyvault/azure-keyvault-administration/assets.json index 0f6fcb5d7d63..7bd570abc0cb 100644 --- a/sdk/keyvault/azure-keyvault-administration/assets.json +++ b/sdk/keyvault/azure-keyvault-administration/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "python", "TagPrefix": "python/keyvault/azure-keyvault-administration", - "Tag": "python/keyvault/azure-keyvault-administration_df93633a52" + "Tag": "python/keyvault/azure-keyvault-administration_b16e831fc9" } diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_client.py index e23c17cb76ea..967c30cd54ae 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_client.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_client.py @@ -24,11 +24,11 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a Vault service. :ivar role_definitions: RoleDefinitionsOperations operations - :vartype role_definitions: azure.keyvault.v7_6_preview_1.operations.RoleDefinitionsOperations + :vartype role_definitions: azure.keyvault.v7_5.operations.RoleDefinitionsOperations :ivar role_assignments: RoleAssignmentsOperations operations - :vartype role_assignments: azure.keyvault.v7_6_preview_1.operations.RoleAssignmentsOperations - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :vartype role_assignments: azure.keyvault.v7_5.operations.RoleAssignmentsOperations + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_configuration.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_configuration.py index 57ca854de83c..c7b4428506e3 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_configuration.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_serialization.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_serialization.py index 2f781d740827..baa661cb82d2 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_serialization.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/_serialization.py @@ -170,6 +170,13 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], return None +try: + basestring # type: ignore + unicode_str = unicode # type: ignore +except NameError: + basestring = str + unicode_str = str + _LOGGER = logging.getLogger(__name__) try: @@ -538,7 +545,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -554,7 +561,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -642,7 +649,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): else: # That's a basic type # Integrate namespace if necessary local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) + local_node.text = unicode_str(new_attr) serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore @@ -987,7 +994,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) if obj_type is _long_type: return self.serialize_long(attr) - if obj_type is str: + if obj_type is unicode_str: return self.serialize_unicode(attr) if obj_type is datetime.datetime: return self.serialize_iso(attr) @@ -1363,7 +1370,7 @@ class Deserializer(object): valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1383,7 +1390,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1436,7 +1443,7 @@ def _deserialize(self, target_obj, data): response, class_name = self._classify_target(target_obj, data) - if isinstance(response, str): + if isinstance(response, basestring): return self.deserialize_data(data, response) elif isinstance(response, type) and issubclass(response, Enum): return self.deserialize_enum(data, response) @@ -1507,14 +1514,14 @@ def _classify_target(self, target, data): if target is None: return None, None - if isinstance(target, str): + if isinstance(target, basestring): try: target = self.dependencies[target] except KeyError: return target, target try: - target = target._classify(data, self.dependencies) # type: ignore + target = target._classify(data, self.dependencies) except AttributeError: pass # Target is not a Model, no classify return target, target.__class__.__name__ # type: ignore @@ -1570,7 +1577,7 @@ def _unpack_content(raw_data, content_type=None): if hasattr(raw_data, "_content_consumed"): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data @@ -1692,7 +1699,7 @@ def deserialize_object(self, attr, **kwargs): if isinstance(attr, ET.Element): # Do no recurse on XML, just return the tree as-is return attr - if isinstance(attr, str): + if isinstance(attr, basestring): return self.deserialize_basic(attr, "str") obj_type = type(attr) if obj_type in self.basic_types: @@ -1749,7 +1756,7 @@ def deserialize_basic(self, attr, data_type): if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, str): + elif isinstance(attr, basestring): if attr.lower() in ["true", "1"]: return True elif attr.lower() in ["false", "0"]: diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_client.py index 5bea77bd47c7..f57b604341ab 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_client.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_client.py @@ -24,13 +24,11 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a Vault service. :ivar role_definitions: RoleDefinitionsOperations operations - :vartype role_definitions: - azure.keyvault.v7_6_preview_1.aio.operations.RoleDefinitionsOperations + :vartype role_definitions: azure.keyvault.v7_5.aio.operations.RoleDefinitionsOperations :ivar role_assignments: RoleAssignmentsOperations operations - :vartype role_assignments: - azure.keyvault.v7_6_preview_1.aio.operations.RoleAssignmentsOperations - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :vartype role_assignments: azure.keyvault.v7_5.aio.operations.RoleAssignmentsOperations + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_configuration.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_configuration.py index 6f792e0f6a30..8dd6125e8e1d 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_configuration.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/operations/_operations.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/operations/_operations.py index e2810c793495..9d24fbf316e1 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/aio/operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -35,8 +34,6 @@ build_key_vault_full_restore_operation_request, build_key_vault_get_setting_request, build_key_vault_get_settings_request, - build_key_vault_pre_full_backup_request, - build_key_vault_pre_full_restore_operation_request, build_key_vault_restore_status_request, build_key_vault_selective_key_restore_operation_request, build_key_vault_update_setting_request, @@ -51,23 +48,18 @@ ) from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): - async def _full_backup_initial( self, vault_base_url: str, azure_storage_blob_container_uri: Optional[Union[_models.SASTokenParameter, IO[bytes]]] = None, **kwargs: Any ) -> _models.FullBackupOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -148,13 +140,12 @@ async def begin_full_backup( :param azure_storage_blob_container_uri: Azure blob shared access signature token pointing to a valid Azure blob container where full backup needs to be stored. This token needs to be valid for at least next 24 hours from the time of making this call. Default value is None. - :type azure_storage_blob_container_uri: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter + :type azure_storage_blob_container_uri: ~azure.keyvault.v7_5.models.SASTokenParameter :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.FullBackupOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -179,8 +170,7 @@ async def begin_full_backup( Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.FullBackupOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -199,11 +189,13 @@ async def begin_full_backup( valid Azure blob container where full backup needs to be stored. This token needs to be valid for at least next 24 hours from the time of making this call. Is either a SASTokenParameter type or a IO[bytes] type. Default value is None. - :type azure_storage_blob_container_uri: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter - or IO[bytes] + :type azure_storage_blob_container_uri: ~azure.keyvault.v7_5.models.SASTokenParameter or + IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: An instance of AsyncLROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.FullBackupOperation] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -268,211 +260,6 @@ def get_long_running_output(pipeline_response): self._client, raw_result, get_long_running_output, polling_method # type: ignore ) - async def _pre_full_backup_initial( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[Union[_models.PreBackupOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> _models.FullBackupOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.FullBackupOperation] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _json = None - _content = None - if isinstance(pre_backup_operation_parameters, (IOBase, bytes)): - _content = pre_backup_operation_parameters - else: - if pre_backup_operation_parameters is not None: - _json = self._serialize.body(pre_backup_operation_parameters, "PreBackupOperationParameters") - else: - _json = None - - _request = build_key_vault_pre_full_backup_request( - content_type=content_type, - api_version=self._config.api_version, - json=_json, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [202]: - if _stream: - await response.read() # Load the body in memory and close the socket - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.KeyVaultError, pipeline_response) - raise HttpResponseError(response=response, model=error) - - response_headers = {} - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("FullBackupOperation", pipeline_response) - - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - - return deserialized # type: ignore - - @overload - async def begin_pre_full_backup( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[_models.PreBackupOperationParameters] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> AsyncLROPoller[_models.FullBackupOperation]: - """Pre-backup operation for checking whether the customer can perform a full backup operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_backup_operation_parameters: Optional parameters to validate prior to performing a - full backup operation. Default value is None. - :type pre_backup_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreBackupOperationParameters - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def begin_pre_full_backup( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[IO[bytes]] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> AsyncLROPoller[_models.FullBackupOperation]: - """Pre-backup operation for checking whether the customer can perform a full backup operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_backup_operation_parameters: Optional parameters to validate prior to performing a - full backup operation. Default value is None. - :type pre_backup_operation_parameters: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def begin_pre_full_backup( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[Union[_models.PreBackupOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> AsyncLROPoller[_models.FullBackupOperation]: - """Pre-backup operation for checking whether the customer can perform a full backup operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_backup_operation_parameters: Optional parameters to validate prior to performing a - full backup operation. Is either a PreBackupOperationParameters type or a IO[bytes] type. - Default value is None. - :type pre_backup_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreBackupOperationParameters or IO[bytes] - :return: An instance of AsyncLROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.FullBackupOperation] = kwargs.pop("cls", None) - polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) - lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token: Optional[str] = kwargs.pop("continuation_token", None) - if cont_token is None: - raw_result = await self._pre_full_backup_initial( - vault_base_url=vault_base_url, - pre_backup_operation_parameters=pre_backup_operation_parameters, - content_type=content_type, - cls=lambda x, y, z: x, - headers=_headers, - params=_params, - **kwargs - ) - kwargs.pop("error_map", None) - - def get_long_running_output(pipeline_response): - response_headers = {} - response = pipeline_response.http_response - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("FullBackupOperation", pipeline_response) - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized - - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - - if polling is True: - polling_method: AsyncPollingMethod = cast( - AsyncPollingMethod, - AsyncLROBasePolling( - lro_delay, - lro_options={"final-state-via": "azure-async-operation"}, - path_format_arguments=path_format_arguments, - **kwargs - ), - ) - elif polling is False: - polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) - else: - polling_method = polling - if cont_token: - return AsyncLROPoller[_models.FullBackupOperation].from_continuation_token( - polling_method=polling_method, - continuation_token=cont_token, - client=self._client, - deserialization_callback=get_long_running_output, - ) - return AsyncLROPoller[_models.FullBackupOperation]( - self._client, raw_result, get_long_running_output, polling_method # type: ignore - ) - @distributed_trace_async async def full_backup_status(self, vault_base_url: str, job_id: str, **kwargs: Any) -> _models.FullBackupOperation: """Returns the status of full backup operation. @@ -482,10 +269,10 @@ async def full_backup_status(self, vault_base_url: str, job_id: str, **kwargs: A :param job_id: The id returned as part of the backup request. Required. :type job_id: str :return: FullBackupOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.FullBackupOperation + :rtype: ~azure.keyvault.v7_5.models.FullBackupOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -530,218 +317,13 @@ async def full_backup_status(self, vault_base_url: str, job_id: str, **kwargs: A return deserialized # type: ignore - async def _pre_full_restore_operation_initial( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[Union[_models.PreRestoreOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> _models.RestoreOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.RestoreOperation] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _json = None - _content = None - if isinstance(pre_restore_operation_parameters, (IOBase, bytes)): - _content = pre_restore_operation_parameters - else: - if pre_restore_operation_parameters is not None: - _json = self._serialize.body(pre_restore_operation_parameters, "PreRestoreOperationParameters") - else: - _json = None - - _request = build_key_vault_pre_full_restore_operation_request( - content_type=content_type, - api_version=self._config.api_version, - json=_json, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [202]: - if _stream: - await response.read() # Load the body in memory and close the socket - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.KeyVaultError, pipeline_response) - raise HttpResponseError(response=response, model=error) - - response_headers = {} - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("RestoreOperation", pipeline_response) - - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - - return deserialized # type: ignore - - @overload - async def begin_pre_full_restore_operation( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[_models.PreRestoreOperationParameters] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> AsyncLROPoller[_models.RestoreOperation]: - """Pre-restore operation for checking whether the customer can perform a full restore operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_restore_operation_parameters: Optional pre restore parameters to validate prior to - performing a full restore operation. Default value is None. - :type pre_restore_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreRestoreOperationParameters - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns RestoreOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def begin_pre_full_restore_operation( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[IO[bytes]] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> AsyncLROPoller[_models.RestoreOperation]: - """Pre-restore operation for checking whether the customer can perform a full restore operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_restore_operation_parameters: Optional pre restore parameters to validate prior to - performing a full restore operation. Default value is None. - :type pre_restore_operation_parameters: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of AsyncLROPoller that returns RestoreOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def begin_pre_full_restore_operation( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[Union[_models.PreRestoreOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> AsyncLROPoller[_models.RestoreOperation]: - """Pre-restore operation for checking whether the customer can perform a full restore operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_restore_operation_parameters: Optional pre restore parameters to validate prior to - performing a full restore operation. Is either a PreRestoreOperationParameters type or a - IO[bytes] type. Default value is None. - :type pre_restore_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreRestoreOperationParameters or IO[bytes] - :return: An instance of AsyncLROPoller that returns RestoreOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.RestoreOperation] = kwargs.pop("cls", None) - polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) - lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token: Optional[str] = kwargs.pop("continuation_token", None) - if cont_token is None: - raw_result = await self._pre_full_restore_operation_initial( - vault_base_url=vault_base_url, - pre_restore_operation_parameters=pre_restore_operation_parameters, - content_type=content_type, - cls=lambda x, y, z: x, - headers=_headers, - params=_params, - **kwargs - ) - kwargs.pop("error_map", None) - - def get_long_running_output(pipeline_response): - response_headers = {} - response = pipeline_response.http_response - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("RestoreOperation", pipeline_response) - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized - - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - - if polling is True: - polling_method: AsyncPollingMethod = cast( - AsyncPollingMethod, - AsyncLROBasePolling( - lro_delay, - lro_options={"final-state-via": "azure-async-operation"}, - path_format_arguments=path_format_arguments, - **kwargs - ), - ) - elif polling is False: - polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) - else: - polling_method = polling - if cont_token: - return AsyncLROPoller[_models.RestoreOperation].from_continuation_token( - polling_method=polling_method, - continuation_token=cont_token, - client=self._client, - deserialization_callback=get_long_running_output, - ) - return AsyncLROPoller[_models.RestoreOperation]( - self._client, raw_result, get_long_running_output, polling_method # type: ignore - ) - async def _full_restore_operation_initial( self, vault_base_url: str, restore_blob_details: Optional[Union[_models.RestoreOperationParameters, IO[bytes]]] = None, **kwargs: Any ) -> _models.RestoreOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -822,13 +404,12 @@ async def begin_full_restore_operation( :type vault_base_url: str :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Default value is None. - :type restore_blob_details: ~azure.keyvault.v7_6_preview_1.models.RestoreOperationParameters + :type restore_blob_details: ~azure.keyvault.v7_5.models.RestoreOperationParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns RestoreOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.RestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -853,8 +434,7 @@ async def begin_full_restore_operation( Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns RestoreOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.RestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -873,11 +453,12 @@ async def begin_full_restore_operation( :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Is either a RestoreOperationParameters type or a IO[bytes] type. Default value is None. - :type restore_blob_details: ~azure.keyvault.v7_6_preview_1.models.RestoreOperationParameters or - IO[bytes] + :type restore_blob_details: ~azure.keyvault.v7_5.models.RestoreOperationParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: An instance of AsyncLROPoller that returns RestoreOperation - :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.RestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -951,10 +532,10 @@ async def restore_status(self, vault_base_url: str, job_id: str, **kwargs: Any) :param job_id: The Job Id returned part of the restore operation. Required. :type job_id: str :return: RestoreOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.RestoreOperation + :rtype: ~azure.keyvault.v7_5.models.RestoreOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1006,7 +587,7 @@ async def _selective_key_restore_operation_initial( restore_blob_details: Optional[Union[_models.SelectiveKeyRestoreOperationParameters, IO[bytes]]] = None, **kwargs: Any ) -> _models.SelectiveKeyRestoreOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1091,14 +672,13 @@ async def begin_selective_key_restore_operation( :type key_name: str :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Default value is None. - :type restore_blob_details: - ~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperationParameters + :type restore_blob_details: ~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperationParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of AsyncLROPoller that returns SelectiveKeyRestoreOperation :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperation] + ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1127,7 +707,7 @@ async def begin_selective_key_restore_operation( :paramtype content_type: str :return: An instance of AsyncLROPoller that returns SelectiveKeyRestoreOperation :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperation] + ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1149,11 +729,14 @@ async def begin_selective_key_restore_operation( :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Is either a SelectiveKeyRestoreOperationParameters type or a IO[bytes] type. Default value is None. - :type restore_blob_details: - ~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperationParameters or IO[bytes] + :type restore_blob_details: ~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperationParameters + or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: An instance of AsyncLROPoller that returns SelectiveKeyRestoreOperation :rtype: - ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperation] + ~azure.core.polling.AsyncLROPoller[~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -1240,12 +823,12 @@ async def update_setting( Required. :type setting_name: str :param parameters: The parameters to update an account setting. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.UpdateSettingRequest + :type parameters: ~azure.keyvault.v7_5.models.UpdateSettingRequest :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1275,7 +858,7 @@ async def update_setting( Default value is "application/json". :paramtype content_type: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1299,12 +882,15 @@ async def update_setting( :type setting_name: str :param parameters: The parameters to update an account setting. Is either a UpdateSettingRequest type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.UpdateSettingRequest or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.UpdateSettingRequest or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1373,10 +959,10 @@ async def get_setting(self, vault_base_url: str, setting_name: str, **kwargs: An Required. :type setting_name: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1430,10 +1016,10 @@ async def get_settings(self, vault_base_url: str, **kwargs: Any) -> _models.Sett :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :return: SettingsListResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.SettingsListResult + :rtype: ~azure.keyvault.v7_5.models.SettingsListResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1484,7 +1070,7 @@ class RoleDefinitionsOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~azure.keyvault.v7_6_preview_1.aio.KeyVaultClient`'s + :class:`~azure.keyvault.v7_5.aio.KeyVaultClient`'s :attr:`role_definitions` attribute. """ @@ -1511,10 +1097,10 @@ async def delete( :param role_definition_name: The name (GUID) of the role definition to delete. Required. :type role_definition_name: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1582,12 +1168,12 @@ async def create_or_update( valid GUID. Required. :type role_definition_name: str :param parameters: Parameters for the role definition. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.RoleDefinitionCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1618,7 +1204,7 @@ async def create_or_update( Default value is "application/json". :paramtype content_type: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1643,13 +1229,15 @@ async def create_or_update( :type role_definition_name: str :param parameters: Parameters for the role definition. Is either a RoleDefinitionCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionCreateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.RoleDefinitionCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1720,10 +1308,10 @@ async def get( :param role_definition_name: The name of the role definition to get. Required. :type role_definition_name: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1783,8 +1371,7 @@ def list( below the given scope as well. Default value is None. :paramtype filter: str :return: An iterator like instance of RoleDefinition - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.RoleDefinition] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.RoleDefinition] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -1794,7 +1381,7 @@ def list( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1873,7 +1460,7 @@ class RoleAssignmentsOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~azure.keyvault.v7_6_preview_1.aio.KeyVaultClient`'s + :class:`~azure.keyvault.v7_5.aio.KeyVaultClient`'s :attr:`role_assignments` attribute. """ @@ -1899,10 +1486,10 @@ async def delete( :param role_assignment_name: The name of the role assignment to delete. Required. :type role_assignment_name: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1969,12 +1556,12 @@ async def create( GUID. Required. :type role_assignment_name: str :param parameters: Parameters for the role assignment. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.RoleAssignmentCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2004,7 +1591,7 @@ async def create( Default value is "application/json". :paramtype content_type: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2028,13 +1615,15 @@ async def create( :type role_assignment_name: str :param parameters: Parameters for the role assignment. Is either a RoleAssignmentCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentCreateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.RoleAssignmentCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2105,10 +1694,10 @@ async def get( :param role_assignment_name: The name of the role assignment to get. Required. :type role_assignment_name: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2169,8 +1758,7 @@ def list_for_scope( assignments at, above or below the scope for the specified principal. Default value is None. :paramtype filter: str :return: An iterator like instance of RoleAssignment - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.RoleAssignment] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.RoleAssignment] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -2180,7 +1768,7 @@ def list_for_scope( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/__init__.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/__init__.py index 01fb1e2325eb..de229e347c31 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/__init__.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/__init__.py @@ -11,8 +11,6 @@ from ._models import FullBackupOperation from ._models import KeyVaultError from ._models import Permission -from ._models import PreBackupOperationParameters -from ._models import PreRestoreOperationParameters from ._models import RestoreOperation from ._models import RestoreOperationParameters from ._models import RoleAssignment @@ -46,8 +44,6 @@ "FullBackupOperation", "KeyVaultError", "Permission", - "PreBackupOperationParameters", - "PreRestoreOperationParameters", "RestoreOperation", "RestoreOperationParameters", "RoleAssignment", diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_enums.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_enums.py index 31de400d0b72..5c976b985919 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_enums.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_enums.py @@ -92,7 +92,7 @@ class RoleDefinitionType(str, Enum, metaclass=CaseInsensitiveEnumMeta): class RoleScope(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The role scope.""" - GLOBAL_ENUM = "/" + GLOBAL = "/" """Global scope""" KEYS = "/keys" """Keys scope""" diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_models.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_models.py index 914998edb01f..1945baf797ad 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_models.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/models/_models.py @@ -81,7 +81,7 @@ class Error(_serialization.Model): :ivar message: The error message. :vartype message: str :ivar inner_error: The key vault server error. - :vartype inner_error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype inner_error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -112,7 +112,7 @@ class FullBackupOperation(_serialization.Model): :ivar status_details: The status details of backup operation. :vartype status_details: str :ivar error: Error encountered, if any, during the full backup operation. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error :ivar start_time: The start time of the backup operation in UTC. :vartype start_time: ~datetime.datetime :ivar end_time: The end time of the backup operation in UTC. @@ -152,7 +152,7 @@ def __init__( :keyword status_details: The status details of backup operation. :paramtype status_details: str :keyword error: Error encountered, if any, during the full backup operation. - :paramtype error: ~azure.keyvault.v7_6_preview_1.models.Error + :paramtype error: ~azure.keyvault.v7_5.models.Error :keyword start_time: The start time of the backup operation in UTC. :paramtype start_time: ~datetime.datetime :keyword end_time: The end time of the backup operation in UTC. @@ -179,7 +179,7 @@ class KeyVaultError(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar error: The key vault server error. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -205,10 +205,10 @@ class Permission(_serialization.Model): other role definitions assigned to a principal. :vartype not_actions: list[str] :ivar data_actions: Data action permissions that are granted. - :vartype data_actions: list[str or ~azure.keyvault.v7_6_preview_1.models.DataAction] + :vartype data_actions: list[str or ~azure.keyvault.v7_5.models.DataAction] :ivar not_data_actions: Data action permissions that are excluded but not denied. They may be granted by other role definitions assigned to a principal. - :vartype not_data_actions: list[str or ~azure.keyvault.v7_6_preview_1.models.DataAction] + :vartype not_data_actions: list[str or ~azure.keyvault.v7_5.models.DataAction] """ _attribute_map = { @@ -234,10 +234,10 @@ def __init__( by other role definitions assigned to a principal. :paramtype not_actions: list[str] :keyword data_actions: Data action permissions that are granted. - :paramtype data_actions: list[str or ~azure.keyvault.v7_6_preview_1.models.DataAction] + :paramtype data_actions: list[str or ~azure.keyvault.v7_5.models.DataAction] :keyword not_data_actions: Data action permissions that are excluded but not denied. They may be granted by other role definitions assigned to a principal. - :paramtype not_data_actions: list[str or ~azure.keyvault.v7_6_preview_1.models.DataAction] + :paramtype not_data_actions: list[str or ~azure.keyvault.v7_5.models.DataAction] """ super().__init__(**kwargs) self.actions = actions @@ -246,83 +246,6 @@ def __init__( self.not_data_actions = not_data_actions -class PreBackupOperationParameters(_serialization.Model): - """PreBackupOperationParameters. - - :ivar storage_resource_uri: Azure Blob storage container Uri. - :vartype storage_resource_uri: str - :ivar token: The SAS token pointing to an Azure Blob storage container. - :vartype token: str - :ivar use_managed_identity: Indicates which authentication method should be used. If set to - true, Managed HSM will use the configured user-assigned managed identity to authenticate with - Azure Storage. Otherwise, a SAS token has to be specified. - :vartype use_managed_identity: bool - """ - - _attribute_map = { - "storage_resource_uri": {"key": "storageResourceUri", "type": "str"}, - "token": {"key": "token", "type": "str"}, - "use_managed_identity": {"key": "useManagedIdentity", "type": "bool"}, - } - - def __init__( - self, - *, - storage_resource_uri: Optional[str] = None, - token: Optional[str] = None, - use_managed_identity: bool = False, - **kwargs: Any - ) -> None: - """ - :keyword storage_resource_uri: Azure Blob storage container Uri. - :paramtype storage_resource_uri: str - :keyword token: The SAS token pointing to an Azure Blob storage container. - :paramtype token: str - :keyword use_managed_identity: Indicates which authentication method should be used. If set to - true, Managed HSM will use the configured user-assigned managed identity to authenticate with - Azure Storage. Otherwise, a SAS token has to be specified. - :paramtype use_managed_identity: bool - """ - super().__init__(**kwargs) - self.storage_resource_uri = storage_resource_uri - self.token = token - self.use_managed_identity = use_managed_identity - - -class PreRestoreOperationParameters(_serialization.Model): - """PreRestoreOperationParameters. - - :ivar sas_token_parameters: - :vartype sas_token_parameters: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter - :ivar folder_to_restore: The Folder name of the blob where the previous successful full backup - was stored. - :vartype folder_to_restore: str - """ - - _attribute_map = { - "sas_token_parameters": {"key": "sasTokenParameters", "type": "SASTokenParameter"}, - "folder_to_restore": {"key": "folderToRestore", "type": "str"}, - } - - def __init__( - self, - *, - sas_token_parameters: Optional["_models.SASTokenParameter"] = None, - folder_to_restore: Optional[str] = None, - **kwargs: Any - ) -> None: - """ - :keyword sas_token_parameters: - :paramtype sas_token_parameters: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter - :keyword folder_to_restore: The Folder name of the blob where the previous successful full - backup was stored. - :paramtype folder_to_restore: str - """ - super().__init__(**kwargs) - self.sas_token_parameters = sas_token_parameters - self.folder_to_restore = folder_to_restore - - class RestoreOperation(_serialization.Model): """Restore operation. @@ -331,7 +254,7 @@ class RestoreOperation(_serialization.Model): :ivar status_details: The status details of restore operation. :vartype status_details: str :ivar error: Error encountered, if any, during the restore operation. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error :ivar job_id: Identifier for the restore operation. :vartype job_id: str :ivar start_time: The start time of the restore operation. @@ -366,7 +289,7 @@ def __init__( :keyword status_details: The status details of restore operation. :paramtype status_details: str :keyword error: Error encountered, if any, during the restore operation. - :paramtype error: ~azure.keyvault.v7_6_preview_1.models.Error + :paramtype error: ~azure.keyvault.v7_5.models.Error :keyword job_id: Identifier for the restore operation. :paramtype job_id: str :keyword start_time: The start time of the restore operation. @@ -389,7 +312,7 @@ class RestoreOperationParameters(_serialization.Model): All required parameters must be populated in order to send to server. :ivar sas_token_parameters: Required. - :vartype sas_token_parameters: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter + :vartype sas_token_parameters: ~azure.keyvault.v7_5.models.SASTokenParameter :ivar folder_to_restore: The Folder name of the blob where the previous successful full backup was stored. Required. :vartype folder_to_restore: str @@ -410,7 +333,7 @@ def __init__( ) -> None: """ :keyword sas_token_parameters: Required. - :paramtype sas_token_parameters: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter + :paramtype sas_token_parameters: ~azure.keyvault.v7_5.models.SASTokenParameter :keyword folder_to_restore: The Folder name of the blob where the previous successful full backup was stored. Required. :paramtype folder_to_restore: str @@ -432,7 +355,7 @@ class RoleAssignment(_serialization.Model): :ivar type: The role assignment type. :vartype type: str :ivar properties: Role assignment properties. - :vartype properties: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentPropertiesWithScope + :vartype properties: ~azure.keyvault.v7_5.models.RoleAssignmentPropertiesWithScope """ _validation = { @@ -453,7 +376,7 @@ def __init__( ) -> None: """ :keyword properties: Role assignment properties. - :paramtype properties: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentPropertiesWithScope + :paramtype properties: ~azure.keyvault.v7_5.models.RoleAssignmentPropertiesWithScope """ super().__init__(**kwargs) self.id = None @@ -468,7 +391,7 @@ class RoleAssignmentCreateParameters(_serialization.Model): All required parameters must be populated in order to send to server. :ivar properties: Role assignment properties. Required. - :vartype properties: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentProperties + :vartype properties: ~azure.keyvault.v7_5.models.RoleAssignmentProperties """ _validation = { @@ -482,7 +405,7 @@ class RoleAssignmentCreateParameters(_serialization.Model): def __init__(self, *, properties: "_models.RoleAssignmentProperties", **kwargs: Any) -> None: """ :keyword properties: Role assignment properties. Required. - :paramtype properties: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentProperties + :paramtype properties: ~azure.keyvault.v7_5.models.RoleAssignmentProperties """ super().__init__(**kwargs) self.properties = properties @@ -512,7 +435,7 @@ class RoleAssignmentListResult(_serialization.Model): """Role assignment list operation result. :ivar value: Role assignment list. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.RoleAssignment] + :vartype value: list[~azure.keyvault.v7_5.models.RoleAssignment] :ivar next_link: The URL to use for getting the next set of results. :vartype next_link: str """ @@ -527,7 +450,7 @@ def __init__( ) -> None: """ :keyword value: Role assignment list. - :paramtype value: list[~azure.keyvault.v7_6_preview_1.models.RoleAssignment] + :paramtype value: list[~azure.keyvault.v7_5.models.RoleAssignment] :keyword next_link: The URL to use for getting the next set of results. :paramtype next_link: str """ @@ -575,7 +498,7 @@ class RoleAssignmentPropertiesWithScope(_serialization.Model): """Role assignment properties with scope. :ivar scope: The role scope. Known values are: "/" and "/keys". - :vartype scope: str or ~azure.keyvault.v7_6_preview_1.models.RoleScope + :vartype scope: str or ~azure.keyvault.v7_5.models.RoleScope :ivar role_definition_id: The role definition ID. :vartype role_definition_id: str :ivar principal_id: The principal ID. @@ -598,7 +521,7 @@ def __init__( ) -> None: """ :keyword scope: The role scope. Known values are: "/" and "/keys". - :paramtype scope: str or ~azure.keyvault.v7_6_preview_1.models.RoleScope + :paramtype scope: str or ~azure.keyvault.v7_5.models.RoleScope :keyword role_definition_id: The role definition ID. :paramtype role_definition_id: str :keyword principal_id: The principal ID. @@ -620,9 +543,9 @@ class RoleDefinition(_serialization.Model): :ivar name: The role definition name. :vartype name: str :ivar type: The role definition type. "Microsoft.Authorization/roleDefinitions" - :vartype type: str or ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionType + :vartype type: str or ~azure.keyvault.v7_5.models.RoleDefinitionType :ivar properties: Role definition properties. - :vartype properties: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionProperties + :vartype properties: ~azure.keyvault.v7_5.models.RoleDefinitionProperties """ _validation = { @@ -641,7 +564,7 @@ class RoleDefinition(_serialization.Model): def __init__(self, *, properties: Optional["_models.RoleDefinitionProperties"] = None, **kwargs: Any) -> None: """ :keyword properties: Role definition properties. - :paramtype properties: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionProperties + :paramtype properties: ~azure.keyvault.v7_5.models.RoleDefinitionProperties """ super().__init__(**kwargs) self.id = None @@ -656,7 +579,7 @@ class RoleDefinitionCreateParameters(_serialization.Model): All required parameters must be populated in order to send to server. :ivar properties: Role definition properties. Required. - :vartype properties: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionProperties + :vartype properties: ~azure.keyvault.v7_5.models.RoleDefinitionProperties """ _validation = { @@ -670,7 +593,7 @@ class RoleDefinitionCreateParameters(_serialization.Model): def __init__(self, *, properties: "_models.RoleDefinitionProperties", **kwargs: Any) -> None: """ :keyword properties: Role definition properties. Required. - :paramtype properties: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionProperties + :paramtype properties: ~azure.keyvault.v7_5.models.RoleDefinitionProperties """ super().__init__(**kwargs) self.properties = properties @@ -700,7 +623,7 @@ class RoleDefinitionListResult(_serialization.Model): """Role definition list operation result. :ivar value: Role definition list. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.RoleDefinition] + :vartype value: list[~azure.keyvault.v7_5.models.RoleDefinition] :ivar next_link: The URL to use for getting the next set of results. :vartype next_link: str """ @@ -715,7 +638,7 @@ def __init__( ) -> None: """ :keyword value: Role definition list. - :paramtype value: list[~azure.keyvault.v7_6_preview_1.models.RoleDefinition] + :paramtype value: list[~azure.keyvault.v7_5.models.RoleDefinition] :keyword next_link: The URL to use for getting the next set of results. :paramtype next_link: str """ @@ -732,11 +655,11 @@ class RoleDefinitionProperties(_serialization.Model): :ivar description: The role definition description. :vartype description: str :ivar role_type: The role type. Known values are: "AKVBuiltInRole" and "CustomRole". - :vartype role_type: str or ~azure.keyvault.v7_6_preview_1.models.RoleType + :vartype role_type: str or ~azure.keyvault.v7_5.models.RoleType :ivar permissions: Role definition permissions. - :vartype permissions: list[~azure.keyvault.v7_6_preview_1.models.Permission] + :vartype permissions: list[~azure.keyvault.v7_5.models.Permission] :ivar assignable_scopes: Role definition assignable scopes. - :vartype assignable_scopes: list[str or ~azure.keyvault.v7_6_preview_1.models.RoleScope] + :vartype assignable_scopes: list[str or ~azure.keyvault.v7_5.models.RoleScope] """ _attribute_map = { @@ -763,11 +686,11 @@ def __init__( :keyword description: The role definition description. :paramtype description: str :keyword role_type: The role type. Known values are: "AKVBuiltInRole" and "CustomRole". - :paramtype role_type: str or ~azure.keyvault.v7_6_preview_1.models.RoleType + :paramtype role_type: str or ~azure.keyvault.v7_5.models.RoleType :keyword permissions: Role definition permissions. - :paramtype permissions: list[~azure.keyvault.v7_6_preview_1.models.Permission] + :paramtype permissions: list[~azure.keyvault.v7_5.models.Permission] :keyword assignable_scopes: Role definition assignable scopes. - :paramtype assignable_scopes: list[str or ~azure.keyvault.v7_6_preview_1.models.RoleScope] + :paramtype assignable_scopes: list[str or ~azure.keyvault.v7_5.models.RoleScope] """ super().__init__(**kwargs) self.role_name = role_name @@ -834,7 +757,7 @@ class SelectiveKeyRestoreOperation(_serialization.Model): :ivar status_details: The status details of restore operation. :vartype status_details: str :ivar error: Error encountered, if any, during the selective key restore operation. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error :ivar job_id: Identifier for the selective key restore operation. :vartype job_id: str :ivar start_time: The start time of the restore operation. @@ -869,7 +792,7 @@ def __init__( :keyword status_details: The status details of restore operation. :paramtype status_details: str :keyword error: Error encountered, if any, during the selective key restore operation. - :paramtype error: ~azure.keyvault.v7_6_preview_1.models.Error + :paramtype error: ~azure.keyvault.v7_5.models.Error :keyword job_id: Identifier for the selective key restore operation. :paramtype job_id: str :keyword start_time: The start time of the restore operation. @@ -892,7 +815,7 @@ class SelectiveKeyRestoreOperationParameters(_serialization.Model): All required parameters must be populated in order to send to server. :ivar sas_token_parameters: Required. - :vartype sas_token_parameters: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter + :vartype sas_token_parameters: ~azure.keyvault.v7_5.models.SASTokenParameter :ivar folder: The Folder name of the blob where the previous successful full backup was stored. Required. :vartype folder: str @@ -911,7 +834,7 @@ class SelectiveKeyRestoreOperationParameters(_serialization.Model): def __init__(self, *, sas_token_parameters: "_models.SASTokenParameter", folder: str, **kwargs: Any) -> None: """ :keyword sas_token_parameters: Required. - :paramtype sas_token_parameters: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter + :paramtype sas_token_parameters: ~azure.keyvault.v7_5.models.SASTokenParameter :keyword folder: The Folder name of the blob where the previous successful full backup was stored. Required. :paramtype folder: str @@ -931,7 +854,7 @@ class Setting(_serialization.Model): :ivar value: The value of the pool setting. Required. :vartype value: str :ivar type: The type specifier of the value. "boolean" - :vartype type: str or ~azure.keyvault.v7_6_preview_1.models.SettingTypeEnum + :vartype type: str or ~azure.keyvault.v7_5.models.SettingTypeEnum """ _validation = { @@ -954,7 +877,7 @@ def __init__( :keyword value: The value of the pool setting. Required. :paramtype value: str :keyword type: The type specifier of the value. "boolean" - :paramtype type: str or ~azure.keyvault.v7_6_preview_1.models.SettingTypeEnum + :paramtype type: str or ~azure.keyvault.v7_5.models.SettingTypeEnum """ super().__init__(**kwargs) self.name = name @@ -969,7 +892,7 @@ class SettingsListResult(_serialization.Model): :ivar settings: A response message containing a list of account settings with their associated value. - :vartype settings: list[~azure.keyvault.v7_6_preview_1.models.Setting] + :vartype settings: list[~azure.keyvault.v7_5.models.Setting] """ _validation = { diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/operations/_operations.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/operations/_operations.py index be7516c9cf6b..5c4f796a6015 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_generated/operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, cast, overload +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -31,10 +30,6 @@ from .._serialization import Serializer from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -47,7 +42,7 @@ def build_key_vault_full_backup_request(**kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -64,35 +59,13 @@ def build_key_vault_full_backup_request(**kwargs: Any) -> HttpRequest: return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) -def build_key_vault_pre_full_backup_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/prebackup" - - # Construct parameters - _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) - - def build_key_vault_full_backup_status_request( # pylint: disable=name-too-long job_id: str, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -112,34 +85,12 @@ def build_key_vault_full_backup_status_request( # pylint: disable=name-too-long return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_key_vault_pre_full_restore_operation_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/prerestore" - - # Construct parameters - _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) - - def build_key_vault_full_restore_operation_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -160,7 +111,7 @@ def build_key_vault_restore_status_request(job_id: str, **kwargs: Any) -> HttpRe _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -187,7 +138,7 @@ def build_key_vault_selective_key_restore_operation_request( # pylint: disable= _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +165,7 @@ def build_key_vault_update_setting_request(setting_name: str, **kwargs: Any) -> _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -240,7 +191,7 @@ def build_key_vault_get_setting_request(setting_name: str, **kwargs: Any) -> Htt _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -264,7 +215,7 @@ def build_key_vault_get_settings_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -283,7 +234,7 @@ def build_role_definitions_delete_request(scope: str, role_definition_name: str, _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -311,7 +262,7 @@ def build_role_definitions_create_or_update_request( # pylint: disable=name-too _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -338,7 +289,7 @@ def build_role_definitions_get_request(scope: str, role_definition_name: str, ** _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -363,7 +314,7 @@ def build_role_definitions_list_request(scope: str, *, filter: Optional[str] = N _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -389,7 +340,7 @@ def build_role_assignments_delete_request(scope: str, role_assignment_name: str, _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -415,7 +366,7 @@ def build_role_assignments_create_request(scope: str, role_assignment_name: str, _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -442,7 +393,7 @@ def build_role_assignments_get_request(scope: str, role_assignment_name: str, ** _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -469,7 +420,7 @@ def build_role_assignments_list_for_scope_request( # pylint: disable=name-too-l _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -492,14 +443,13 @@ def build_role_assignments_list_for_scope_request( # pylint: disable=name-too-l class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): - def _full_backup_initial( self, vault_base_url: str, azure_storage_blob_container_uri: Optional[Union[_models.SASTokenParameter, IO[bytes]]] = None, **kwargs: Any ) -> _models.FullBackupOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -580,13 +530,12 @@ def begin_full_backup( :param azure_storage_blob_container_uri: Azure blob shared access signature token pointing to a valid Azure blob container where full backup needs to be stored. This token needs to be valid for at least next 24 hours from the time of making this call. Default value is None. - :type azure_storage_blob_container_uri: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter + :type azure_storage_blob_container_uri: ~azure.keyvault.v7_5.models.SASTokenParameter :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.FullBackupOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -611,8 +560,7 @@ def begin_full_backup( Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.FullBackupOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -631,11 +579,13 @@ def begin_full_backup( valid Azure blob container where full backup needs to be stored. This token needs to be valid for at least next 24 hours from the time of making this call. Is either a SASTokenParameter type or a IO[bytes] type. Default value is None. - :type azure_storage_blob_container_uri: ~azure.keyvault.v7_6_preview_1.models.SASTokenParameter - or IO[bytes] + :type azure_storage_blob_container_uri: ~azure.keyvault.v7_5.models.SASTokenParameter or + IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: An instance of LROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.FullBackupOperation] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -700,211 +650,6 @@ def get_long_running_output(pipeline_response): self._client, raw_result, get_long_running_output, polling_method # type: ignore ) - def _pre_full_backup_initial( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[Union[_models.PreBackupOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> _models.FullBackupOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.FullBackupOperation] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _json = None - _content = None - if isinstance(pre_backup_operation_parameters, (IOBase, bytes)): - _content = pre_backup_operation_parameters - else: - if pre_backup_operation_parameters is not None: - _json = self._serialize.body(pre_backup_operation_parameters, "PreBackupOperationParameters") - else: - _json = None - - _request = build_key_vault_pre_full_backup_request( - content_type=content_type, - api_version=self._config.api_version, - json=_json, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [202]: - if _stream: - response.read() # Load the body in memory and close the socket - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.KeyVaultError, pipeline_response) - raise HttpResponseError(response=response, model=error) - - response_headers = {} - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("FullBackupOperation", pipeline_response) - - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - - return deserialized # type: ignore - - @overload - def begin_pre_full_backup( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[_models.PreBackupOperationParameters] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> LROPoller[_models.FullBackupOperation]: - """Pre-backup operation for checking whether the customer can perform a full backup operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_backup_operation_parameters: Optional parameters to validate prior to performing a - full backup operation. Default value is None. - :type pre_backup_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreBackupOperationParameters - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of LROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def begin_pre_full_backup( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[IO[bytes]] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> LROPoller[_models.FullBackupOperation]: - """Pre-backup operation for checking whether the customer can perform a full backup operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_backup_operation_parameters: Optional parameters to validate prior to performing a - full backup operation. Default value is None. - :type pre_backup_operation_parameters: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of LROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def begin_pre_full_backup( - self, - vault_base_url: str, - pre_backup_operation_parameters: Optional[Union[_models.PreBackupOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> LROPoller[_models.FullBackupOperation]: - """Pre-backup operation for checking whether the customer can perform a full backup operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_backup_operation_parameters: Optional parameters to validate prior to performing a - full backup operation. Is either a PreBackupOperationParameters type or a IO[bytes] type. - Default value is None. - :type pre_backup_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreBackupOperationParameters or IO[bytes] - :return: An instance of LROPoller that returns FullBackupOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.FullBackupOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.FullBackupOperation] = kwargs.pop("cls", None) - polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) - lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token: Optional[str] = kwargs.pop("continuation_token", None) - if cont_token is None: - raw_result = self._pre_full_backup_initial( - vault_base_url=vault_base_url, - pre_backup_operation_parameters=pre_backup_operation_parameters, - content_type=content_type, - cls=lambda x, y, z: x, - headers=_headers, - params=_params, - **kwargs - ) - kwargs.pop("error_map", None) - - def get_long_running_output(pipeline_response): - response_headers = {} - response = pipeline_response.http_response - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("FullBackupOperation", pipeline_response) - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized - - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - - if polling is True: - polling_method: PollingMethod = cast( - PollingMethod, - LROBasePolling( - lro_delay, - lro_options={"final-state-via": "azure-async-operation"}, - path_format_arguments=path_format_arguments, - **kwargs - ), - ) - elif polling is False: - polling_method = cast(PollingMethod, NoPolling()) - else: - polling_method = polling - if cont_token: - return LROPoller[_models.FullBackupOperation].from_continuation_token( - polling_method=polling_method, - continuation_token=cont_token, - client=self._client, - deserialization_callback=get_long_running_output, - ) - return LROPoller[_models.FullBackupOperation]( - self._client, raw_result, get_long_running_output, polling_method # type: ignore - ) - @distributed_trace def full_backup_status(self, vault_base_url: str, job_id: str, **kwargs: Any) -> _models.FullBackupOperation: """Returns the status of full backup operation. @@ -914,10 +659,10 @@ def full_backup_status(self, vault_base_url: str, job_id: str, **kwargs: Any) -> :param job_id: The id returned as part of the backup request. Required. :type job_id: str :return: FullBackupOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.FullBackupOperation + :rtype: ~azure.keyvault.v7_5.models.FullBackupOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -962,215 +707,13 @@ def full_backup_status(self, vault_base_url: str, job_id: str, **kwargs: Any) -> return deserialized # type: ignore - def _pre_full_restore_operation_initial( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[Union[_models.PreRestoreOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> _models.RestoreOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.RestoreOperation] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _json = None - _content = None - if isinstance(pre_restore_operation_parameters, (IOBase, bytes)): - _content = pre_restore_operation_parameters - else: - if pre_restore_operation_parameters is not None: - _json = self._serialize.body(pre_restore_operation_parameters, "PreRestoreOperationParameters") - else: - _json = None - - _request = build_key_vault_pre_full_restore_operation_request( - content_type=content_type, - api_version=self._config.api_version, - json=_json, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [202]: - if _stream: - response.read() # Load the body in memory and close the socket - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.KeyVaultError, pipeline_response) - raise HttpResponseError(response=response, model=error) - - response_headers = {} - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("RestoreOperation", pipeline_response) - - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - - return deserialized # type: ignore - - @overload - def begin_pre_full_restore_operation( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[_models.PreRestoreOperationParameters] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> LROPoller[_models.RestoreOperation]: - """Pre-restore operation for checking whether the customer can perform a full restore operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_restore_operation_parameters: Optional pre restore parameters to validate prior to - performing a full restore operation. Default value is None. - :type pre_restore_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreRestoreOperationParameters - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of LROPoller that returns RestoreOperation - :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def begin_pre_full_restore_operation( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[IO[bytes]] = None, - *, - content_type: str = "application/json", - **kwargs: Any - ) -> LROPoller[_models.RestoreOperation]: - """Pre-restore operation for checking whether the customer can perform a full restore operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_restore_operation_parameters: Optional pre restore parameters to validate prior to - performing a full restore operation. Default value is None. - :type pre_restore_operation_parameters: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: An instance of LROPoller that returns RestoreOperation - :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def begin_pre_full_restore_operation( - self, - vault_base_url: str, - pre_restore_operation_parameters: Optional[Union[_models.PreRestoreOperationParameters, IO[bytes]]] = None, - **kwargs: Any - ) -> LROPoller[_models.RestoreOperation]: - """Pre-restore operation for checking whether the customer can perform a full restore operation. - - :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. - :type vault_base_url: str - :param pre_restore_operation_parameters: Optional pre restore parameters to validate prior to - performing a full restore operation. Is either a PreRestoreOperationParameters type or a - IO[bytes] type. Default value is None. - :type pre_restore_operation_parameters: - ~azure.keyvault.v7_6_preview_1.models.PreRestoreOperationParameters or IO[bytes] - :return: An instance of LROPoller that returns RestoreOperation - :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] - :raises ~azure.core.exceptions.HttpResponseError: - """ - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.RestoreOperation] = kwargs.pop("cls", None) - polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) - lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token: Optional[str] = kwargs.pop("continuation_token", None) - if cont_token is None: - raw_result = self._pre_full_restore_operation_initial( - vault_base_url=vault_base_url, - pre_restore_operation_parameters=pre_restore_operation_parameters, - content_type=content_type, - cls=lambda x, y, z: x, - headers=_headers, - params=_params, - **kwargs - ) - kwargs.pop("error_map", None) - - def get_long_running_output(pipeline_response): - response_headers = {} - response = pipeline_response.http_response - response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - response_headers["Azure-AsyncOperation"] = self._deserialize( - "str", response.headers.get("Azure-AsyncOperation") - ) - - deserialized = self._deserialize("RestoreOperation", pipeline_response) - if cls: - return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized - - path_format_arguments = { - "vaultBaseUrl": self._serialize.url("vault_base_url", vault_base_url, "str", skip_quote=True), - } - - if polling is True: - polling_method: PollingMethod = cast( - PollingMethod, - LROBasePolling( - lro_delay, - lro_options={"final-state-via": "azure-async-operation"}, - path_format_arguments=path_format_arguments, - **kwargs - ), - ) - elif polling is False: - polling_method = cast(PollingMethod, NoPolling()) - else: - polling_method = polling - if cont_token: - return LROPoller[_models.RestoreOperation].from_continuation_token( - polling_method=polling_method, - continuation_token=cont_token, - client=self._client, - deserialization_callback=get_long_running_output, - ) - return LROPoller[_models.RestoreOperation]( - self._client, raw_result, get_long_running_output, polling_method # type: ignore - ) - def _full_restore_operation_initial( self, vault_base_url: str, restore_blob_details: Optional[Union[_models.RestoreOperationParameters, IO[bytes]]] = None, **kwargs: Any ) -> _models.RestoreOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1251,12 +794,12 @@ def begin_full_restore_operation( :type vault_base_url: str :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Default value is None. - :type restore_blob_details: ~azure.keyvault.v7_6_preview_1.models.RestoreOperationParameters + :type restore_blob_details: ~azure.keyvault.v7_5.models.RestoreOperationParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns RestoreOperation - :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.RestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1281,7 +824,7 @@ def begin_full_restore_operation( Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns RestoreOperation - :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.RestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1300,10 +843,12 @@ def begin_full_restore_operation( :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Is either a RestoreOperationParameters type or a IO[bytes] type. Default value is None. - :type restore_blob_details: ~azure.keyvault.v7_6_preview_1.models.RestoreOperationParameters or - IO[bytes] + :type restore_blob_details: ~azure.keyvault.v7_5.models.RestoreOperationParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: An instance of LROPoller that returns RestoreOperation - :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.RestoreOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.RestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -1377,10 +922,10 @@ def restore_status(self, vault_base_url: str, job_id: str, **kwargs: Any) -> _mo :param job_id: The Job Id returned part of the restore operation. Required. :type job_id: str :return: RestoreOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.RestoreOperation + :rtype: ~azure.keyvault.v7_5.models.RestoreOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1432,7 +977,7 @@ def _selective_key_restore_operation_initial( restore_blob_details: Optional[Union[_models.SelectiveKeyRestoreOperationParameters, IO[bytes]]] = None, **kwargs: Any ) -> _models.SelectiveKeyRestoreOperation: - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1517,14 +1062,12 @@ def begin_selective_key_restore_operation( :type key_name: str :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Default value is None. - :type restore_blob_details: - ~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperationParameters + :type restore_blob_details: ~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperationParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns SelectiveKeyRestoreOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1552,8 +1095,7 @@ def begin_selective_key_restore_operation( Default value is "application/json". :paramtype content_type: str :return: An instance of LROPoller that returns SelectiveKeyRestoreOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1575,11 +1117,13 @@ def begin_selective_key_restore_operation( :param restore_blob_details: The Azure blob SAS token pointing to a folder where the previous successful full backup was stored. Is either a SelectiveKeyRestoreOperationParameters type or a IO[bytes] type. Default value is None. - :type restore_blob_details: - ~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperationParameters or IO[bytes] + :type restore_blob_details: ~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperationParameters + or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: An instance of LROPoller that returns SelectiveKeyRestoreOperation - :rtype: - ~azure.core.polling.LROPoller[~azure.keyvault.v7_6_preview_1.models.SelectiveKeyRestoreOperation] + :rtype: ~azure.core.polling.LROPoller[~azure.keyvault.v7_5.models.SelectiveKeyRestoreOperation] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -1666,12 +1210,12 @@ def update_setting( Required. :type setting_name: str :param parameters: The parameters to update an account setting. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.UpdateSettingRequest + :type parameters: ~azure.keyvault.v7_5.models.UpdateSettingRequest :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1701,7 +1245,7 @@ def update_setting( Default value is "application/json". :paramtype content_type: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1725,12 +1269,15 @@ def update_setting( :type setting_name: str :param parameters: The parameters to update an account setting. Is either a UpdateSettingRequest type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.UpdateSettingRequest or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.UpdateSettingRequest or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1799,10 +1346,10 @@ def get_setting(self, vault_base_url: str, setting_name: str, **kwargs: Any) -> Required. :type setting_name: str :return: Setting - :rtype: ~azure.keyvault.v7_6_preview_1.models.Setting + :rtype: ~azure.keyvault.v7_5.models.Setting :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1856,10 +1403,10 @@ def get_settings(self, vault_base_url: str, **kwargs: Any) -> _models.SettingsLi :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :return: SettingsListResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.SettingsListResult + :rtype: ~azure.keyvault.v7_5.models.SettingsListResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1910,7 +1457,7 @@ class RoleDefinitionsOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~azure.keyvault.v7_6_preview_1.KeyVaultClient`'s + :class:`~azure.keyvault.v7_5.KeyVaultClient`'s :attr:`role_definitions` attribute. """ @@ -1937,10 +1484,10 @@ def delete( :param role_definition_name: The name (GUID) of the role definition to delete. Required. :type role_definition_name: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2008,12 +1555,12 @@ def create_or_update( valid GUID. Required. :type role_definition_name: str :param parameters: Parameters for the role definition. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.RoleDefinitionCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2044,7 +1591,7 @@ def create_or_update( Default value is "application/json". :paramtype content_type: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2069,13 +1616,15 @@ def create_or_update( :type role_definition_name: str :param parameters: Parameters for the role definition. Is either a RoleDefinitionCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleDefinitionCreateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.RoleDefinitionCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2144,10 +1693,10 @@ def get(self, vault_base_url: str, scope: str, role_definition_name: str, **kwar :param role_definition_name: The name of the role definition to get. Required. :type role_definition_name: str :return: RoleDefinition - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleDefinition + :rtype: ~azure.keyvault.v7_5.models.RoleDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2207,7 +1756,7 @@ def list( below the given scope as well. Default value is None. :paramtype filter: str :return: An iterator like instance of RoleDefinition - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.RoleDefinition] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.RoleDefinition] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -2217,7 +1766,7 @@ def list( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2296,7 +1845,7 @@ class RoleAssignmentsOperations: **DO NOT** instantiate this class directly. Instead, you should access the following operations through - :class:`~azure.keyvault.v7_6_preview_1.KeyVaultClient`'s + :class:`~azure.keyvault.v7_5.KeyVaultClient`'s :attr:`role_assignments` attribute. """ @@ -2322,10 +1871,10 @@ def delete( :param role_assignment_name: The name of the role assignment to delete. Required. :type role_assignment_name: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2392,12 +1941,12 @@ def create( GUID. Required. :type role_assignment_name: str :param parameters: Parameters for the role assignment. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.RoleAssignmentCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2427,7 +1976,7 @@ def create( Default value is "application/json". :paramtype content_type: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2451,13 +2000,15 @@ def create( :type role_assignment_name: str :param parameters: Parameters for the role assignment. Is either a RoleAssignmentCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.RoleAssignmentCreateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.RoleAssignmentCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2526,10 +2077,10 @@ def get(self, vault_base_url: str, scope: str, role_assignment_name: str, **kwar :param role_assignment_name: The name of the role assignment to get. Required. :type role_assignment_name: str :return: RoleAssignment - :rtype: ~azure.keyvault.v7_6_preview_1.models.RoleAssignment + :rtype: ~azure.keyvault.v7_5.models.RoleAssignment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2590,7 +2141,7 @@ def list_for_scope( assignments at, above or below the scope for the specified principal. Default value is None. :paramtype filter: str :return: An iterator like instance of RoleAssignment - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.RoleAssignment] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.RoleAssignment] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -2600,7 +2151,7 @@ def list_for_scope( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_challenge_auth_policy.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_challenge_auth_policy.py index e9b44fc68e55..dad851f8f58c 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_challenge_auth_policy.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_challenge_auth_policy.py @@ -15,8 +15,9 @@ """ from copy import deepcopy +import sys import time -from typing import Any, Awaitable, Callable, cast, Optional, overload, TypeVar, Union +from typing import Any, Callable, cast, Optional, overload, TypeVar, Union from urllib.parse import urlparse from typing_extensions import ParamSpec @@ -31,6 +32,11 @@ from . import http_challenge_cache as ChallengeCache from .challenge_auth_policy import _enforce_tls, _has_claims, _update_challenge +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + P = ParamSpec("P") T = TypeVar("T") diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_client_base.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_client_base.py index 37124dbd7a15..3ca4483ea763 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/async_client_base.py @@ -2,7 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from typing import Any, Awaitable +import sys +from typing import Any from azure.core.credentials_async import AsyncTokenCredential from azure.core.pipeline.policies import HttpLoggingPolicy @@ -15,6 +16,11 @@ from .._generated.aio import KeyVaultClient as _KeyVaultClient from .._generated import models as _models +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + class AsyncKeyVaultClientBase(object): # pylint:disable=protected-access diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py index 8b80c1dadd1b..600d1be20446 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py @@ -24,14 +24,13 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version - V7_6_PREVIEW_1 = "7.6-preview.1" V7_5 = "7.5" V7_4 = "7.4" V7_3 = "7.3" V7_2 = "7.2" -DEFAULT_VERSION = ApiVersion.V7_6_PREVIEW_1 +DEFAULT_VERSION = ApiVersion.V7_5 _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_version.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_version.py index db03ba750e5a..1263927d4c3d 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_version.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "4.5.0b1" +VERSION = "4.5.0" diff --git a/sdk/keyvault/azure-keyvault-administration/setup.py b/sdk/keyvault/azure-keyvault-administration/setup.py index 30c88eb275bd..5c624c27e20b 100644 --- a/sdk/keyvault/azure-keyvault-administration/setup.py +++ b/sdk/keyvault/azure-keyvault-administration/setup.py @@ -45,7 +45,7 @@ url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-administration", keywords="azure, azure sdk", classifiers=[ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", diff --git a/sdk/keyvault/azure-keyvault-administration/tests/test_access_control.py b/sdk/keyvault/azure-keyvault-administration/tests/test_access_control.py index 1614564bf94c..c14251a13080 100644 --- a/sdk/keyvault/azure-keyvault-administration/tests/test_access_control.py +++ b/sdk/keyvault/azure-keyvault-administration/tests/test_access_control.py @@ -26,11 +26,10 @@ def get_replayable_uuid(self, replay_value): def get_service_principal_id(self): replay_value = "service-principal-id" if self.is_live: - value = os.environ.get("AZURE_CLIENT_ID") or os.environ.get("KEYVAULT_CLIENT_ID") + value = os.environ["AZURE_CLIENT_ID"] return value return replay_value - @pytest.mark.live_test_only("Having playback issues after sanitizing update; need to investigate") @pytest.mark.parametrize("api_version", all_api_versions) @KeyVaultAccessControlClientPreparer() @recorded_by_proxy @@ -90,7 +89,6 @@ def test_role_definitions(self, client, **kwargs): if self.is_live: time.sleep(60) # additional waiting to avoid conflicts with resources in other tests - @pytest.mark.live_test_only("Having playback issues after sanitizing update; need to investigate") @pytest.mark.parametrize("api_version", all_api_versions) @KeyVaultAccessControlClientPreparer() @recorded_by_proxy diff --git a/sdk/keyvault/azure-keyvault-administration/tests/test_access_control_async.py b/sdk/keyvault/azure-keyvault-administration/tests/test_access_control_async.py index 49505d388b0d..db16f213da21 100644 --- a/sdk/keyvault/azure-keyvault-administration/tests/test_access_control_async.py +++ b/sdk/keyvault/azure-keyvault-administration/tests/test_access_control_async.py @@ -28,11 +28,10 @@ def get_replayable_uuid(self, replay_value): def get_service_principal_id(self): replay_value = "service-principal-id" if self.is_live: - value = os.environ.get("AZURE_CLIENT_ID") or os.environ.get("KEYVAULT_CLIENT_ID") + value = os.environ["AZURE_CLIENT_ID"] return value return replay_value - - @pytest.mark.live_test_only("Having playback issues after sanitizing update; need to investigate") + @pytest.mark.asyncio @pytest.mark.parametrize("api_version", all_api_versions) @KeyVaultAccessControlClientPreparer() @@ -100,7 +99,6 @@ async def test_role_definitions(self, client, **kwargs): await asyncio.sleep(60) # additional waiting to avoid conflicts with resources in other tests - @pytest.mark.live_test_only("Having playback issues after sanitizing update; need to investigate") @pytest.mark.asyncio @pytest.mark.parametrize("api_version", all_api_versions) @KeyVaultAccessControlClientPreparer() @@ -117,6 +115,8 @@ async def test_role_assignment(self, client, **kwargs): principal_id = self.get_service_principal_id() name = self.get_replayable_uuid("some-uuid") add_general_regex_sanitizer(regex=name, value = "some-uuid") + + created = await client.create_role_assignment(scope, definition.id, principal_id, name=name) assert created.name == name diff --git a/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md b/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md index 40fbe4b1674a..def003296783 100644 --- a/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md +++ b/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md @@ -1,20 +1,16 @@ # Release History -## 4.9.0b1 (Unreleased) +## 4.9.0 (2024-10-17) ### Features Added -- Added support for service API version `7.6-preview.1` - Added support for Continuous Access Evaluation (CAE). `enable_cae=True` is passed to all `get_token` requests. -### Breaking Changes - ### Bugs Fixed - Typing errors from using Key Vault clients as context managers have been fixed ([#34744](https://github.com/Azure/azure-sdk-for-python/issues/34744)) ### Other Changes - Updated minimum `azure-core` version to 1.31.0 -- Key Vault API version `7.6-preview.1` is now the default ## 4.8.0 (2024-02-22) diff --git a/sdk/keyvault/azure-keyvault-certificates/assets.json b/sdk/keyvault/azure-keyvault-certificates/assets.json index 908f7352c083..016347d1e38a 100644 --- a/sdk/keyvault/azure-keyvault-certificates/assets.json +++ b/sdk/keyvault/azure-keyvault-certificates/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "python", "TagPrefix": "python/keyvault/azure-keyvault-certificates", - "Tag": "python/keyvault/azure-keyvault-certificates_e5eb154430" + "Tag": "python/keyvault/azure-keyvault-certificates_1cf731dd01" } diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_client.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_client.py index f405b504f90c..28ee625036e6 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_client.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_client.py @@ -23,8 +23,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a """The key vault client performs cryptographic key operations and vault operations against the Key Vault service. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_configuration.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_configuration.py index 57ca854de83c..c7b4428506e3 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_configuration.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_operations/_operations.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_operations/_operations.py index 2f95c3c756d6..5954f8a304d9 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, overload +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse from azure.core.exceptions import ( @@ -29,10 +28,6 @@ from .._serialization import Serializer from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -46,7 +41,7 @@ def build_key_vault_get_certificates_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -71,7 +66,7 @@ def build_key_vault_delete_certificate_request( # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -96,7 +91,7 @@ def build_key_vault_set_certificate_contacts_request(**kwargs: Any) -> HttpReque _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -117,7 +112,7 @@ def build_key_vault_get_certificate_contacts_request(**kwargs: Any) -> HttpReque _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -136,7 +131,7 @@ def build_key_vault_delete_certificate_contacts_request(**kwargs: Any) -> HttpRe _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -157,7 +152,7 @@ def build_key_vault_get_certificate_issuers_request( # pylint: disable=name-too _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -181,7 +176,7 @@ def build_key_vault_set_certificate_issuer_request( # pylint: disable=name-too- _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -210,7 +205,7 @@ def build_key_vault_update_certificate_issuer_request( # pylint: disable=name-t _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -238,7 +233,7 @@ def build_key_vault_get_certificate_issuer_request( # pylint: disable=name-too- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -264,7 +259,7 @@ def build_key_vault_delete_certificate_issuer_request( # pylint: disable=name-t _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -291,7 +286,7 @@ def build_key_vault_create_certificate_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -320,7 +315,7 @@ def build_key_vault_import_certificate_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -348,7 +343,7 @@ def build_key_vault_get_certificate_versions_request( # pylint: disable=name-to _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -376,7 +371,7 @@ def build_key_vault_get_certificate_policy_request( # pylint: disable=name-too- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -403,7 +398,7 @@ def build_key_vault_update_certificate_policy_request( # pylint: disable=name-t _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -432,7 +427,7 @@ def build_key_vault_update_certificate_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -461,7 +456,7 @@ def build_key_vault_get_certificate_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -489,7 +484,7 @@ def build_key_vault_update_certificate_operation_request( # pylint: disable=nam _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -517,7 +512,7 @@ def build_key_vault_get_certificate_operation_request( # pylint: disable=name-t _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -543,7 +538,7 @@ def build_key_vault_delete_certificate_operation_request( # pylint: disable=nam _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -570,7 +565,7 @@ def build_key_vault_merge_certificate_request( # pylint: disable=name-too-long _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -598,7 +593,7 @@ def build_key_vault_backup_certificate_request( # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -623,7 +618,7 @@ def build_key_vault_restore_certificate_request(**kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -646,7 +641,7 @@ def build_key_vault_get_deleted_certificates_request( # pylint: disable=name-to _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -671,7 +666,7 @@ def build_key_vault_get_deleted_certificate_request( # pylint: disable=name-too _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -697,7 +692,7 @@ def build_key_vault_purge_deleted_certificate_request( # pylint: disable=name-t _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -723,7 +718,7 @@ def build_key_vault_recover_deleted_certificate_request( # pylint: disable=name _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -744,7 +739,6 @@ def build_key_vault_recover_deleted_certificate_request( # pylint: disable=name class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): # pylint: disable=too-many-public-methods - @distributed_trace def get_certificates( self, @@ -768,7 +762,7 @@ def get_certificates( provisioned. Default value is None. :paramtype include_pending: bool :return: An iterator like instance of CertificateItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.CertificateItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.CertificateItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -778,7 +772,7 @@ def get_certificates( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -865,10 +859,10 @@ def delete_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: DeletedCertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedCertificateBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedCertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -925,12 +919,12 @@ def set_certificate_contacts( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param contacts: The contacts for the key vault certificate. Required. - :type contacts: ~azure.keyvault.v7_6_preview_1.models.Contacts + :type contacts: ~azure.keyvault.v7_5.models.Contacts :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ @@ -951,7 +945,7 @@ def set_certificate_contacts( Default value is "application/json". :paramtype content_type: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ @@ -968,12 +962,15 @@ def set_certificate_contacts( :type vault_base_url: str :param contacts: The contacts for the key vault certificate. Is either a Contacts type or a IO[bytes] type. Required. - :type contacts: ~azure.keyvault.v7_6_preview_1.models.Contacts or IO[bytes] + :type contacts: ~azure.keyvault.v7_5.models.Contacts or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1039,10 +1036,10 @@ def get_certificate_contacts(self, vault_base_url: str, **kwargs: Any) -> _model :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1096,10 +1093,10 @@ def delete_certificate_contacts(self, vault_base_url: str, **kwargs: Any) -> _mo :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1159,8 +1156,7 @@ def get_certificate_issuers( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of CertificateIssuerItem - :rtype: - ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.CertificateIssuerItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.CertificateIssuerItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -1170,7 +1166,7 @@ def get_certificate_issuers( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1263,12 +1259,12 @@ def set_certificate_issuer( identifiable or sensitive information. Required. :type issuer_name: str :param parameter: Certificate issuer set parameter. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerSetParameters + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerSetParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1299,7 +1295,7 @@ def set_certificate_issuer( Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1324,13 +1320,15 @@ def set_certificate_issuer( :type issuer_name: str :param parameter: Certificate issuer set parameter. Is either a CertificateIssuerSetParameters type or a IO[bytes] type. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerSetParameters or - IO[bytes] + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerSetParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1407,12 +1405,12 @@ def update_certificate_issuer( :param issuer_name: The name of the issuer. Required. :type issuer_name: str :param parameter: Certificate issuer update parameter. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerUpdateParameters + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1441,7 +1439,7 @@ def update_certificate_issuer( Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1464,13 +1462,15 @@ def update_certificate_issuer( :type issuer_name: str :param parameter: Certificate issuer update parameter. Is either a CertificateIssuerUpdateParameters type or a IO[bytes] type. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerUpdateParameters or - IO[bytes] + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1540,10 +1540,10 @@ def get_certificate_issuer(self, vault_base_url: str, issuer_name: str, **kwargs :param issuer_name: The name of the issuer. Required. :type issuer_name: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1600,10 +1600,10 @@ def delete_certificate_issuer(self, vault_base_url: str, issuer_name: str, **kwa :param issuer_name: The name of the issuer. Required. :type issuer_name: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1670,12 +1670,12 @@ def create_certificate( personally identifiable or sensitive information. Required. :type certificate_name: str :param parameters: The parameters to create a certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1706,7 +1706,7 @@ def create_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1731,13 +1731,15 @@ def create_certificate( :type certificate_name: str :param parameters: The parameters to create a certificate. Is either a CertificateCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateCreateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1818,12 +1820,12 @@ def import_certificate( personally identifiable or sensitive information. Required. :type certificate_name: str :param parameters: The parameters to import the certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateImportParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateImportParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1856,7 +1858,7 @@ def import_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1883,13 +1885,15 @@ def import_certificate( :type certificate_name: str :param parameters: The parameters to import the certificate. Is either a CertificateImportParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateImportParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateImportParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1963,7 +1967,7 @@ def get_certificate_versions( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of CertificateItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.CertificateItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.CertificateItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -1973,7 +1977,7 @@ def get_certificate_versions( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2059,10 +2063,10 @@ def get_certificate_policy( :param certificate_name: The name of the certificate in a given key vault. Required. :type certificate_name: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2127,12 +2131,12 @@ def update_certificate_policy( :param certificate_name: The name of the certificate in the given vault. Required. :type certificate_name: str :param certificate_policy: The policy for the certificate. Required. - :type certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :type certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2161,7 +2165,7 @@ def update_certificate_policy( Default value is "application/json". :paramtype content_type: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2184,12 +2188,15 @@ def update_certificate_policy( :type certificate_name: str :param certificate_policy: The policy for the certificate. Is either a CertificatePolicy type or a IO[bytes] type. Required. - :type certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy or IO[bytes] + :type certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2270,12 +2277,12 @@ def update_certificate( :param certificate_version: The version of the certificate. Required. :type certificate_version: str :param parameters: The parameters for certificate update. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateUpdateParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2308,7 +2315,7 @@ def update_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2335,13 +2342,15 @@ def update_certificate( :type certificate_version: str :param parameters: The parameters for certificate update. Is either a CertificateUpdateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateUpdateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2416,10 +2425,10 @@ def get_certificate( not specified, the latest version of the certificate is returned. Required. :type certificate_version: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2485,13 +2494,12 @@ def update_certificate_operation( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :param certificate_operation: The certificate operation response. Required. - :type certificate_operation: - ~azure.keyvault.v7_6_preview_1.models.CertificateOperationUpdateParameter + :type certificate_operation: ~azure.keyvault.v7_5.models.CertificateOperationUpdateParameter :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2520,7 +2528,7 @@ def update_certificate_operation( Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2543,13 +2551,16 @@ def update_certificate_operation( :type certificate_name: str :param certificate_operation: The certificate operation response. Is either a CertificateOperationUpdateParameter type or a IO[bytes] type. Required. - :type certificate_operation: - ~azure.keyvault.v7_6_preview_1.models.CertificateOperationUpdateParameter or IO[bytes] + :type certificate_operation: ~azure.keyvault.v7_5.models.CertificateOperationUpdateParameter or + IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2620,10 +2631,10 @@ def get_certificate_operation( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2683,10 +2694,10 @@ def delete_certificate_operation( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2752,12 +2763,12 @@ def merge_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :param parameters: The parameters to merge certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateMergeParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateMergeParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2787,7 +2798,7 @@ def merge_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2811,12 +2822,15 @@ def merge_certificate( :type certificate_name: str :param parameters: The parameters to merge certificate. Is either a CertificateMergeParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateMergeParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateMergeParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2888,10 +2902,10 @@ def backup_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: BackupCertificateResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.BackupCertificateResult + :rtype: ~azure.keyvault.v7_5.models.BackupCertificateResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2953,12 +2967,12 @@ def restore_certificate( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The parameters to restore the certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateRestoreParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateRestoreParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2979,7 +2993,7 @@ def restore_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2996,13 +3010,15 @@ def restore_certificate( :type vault_base_url: str :param parameters: The parameters to restore the certificate. Is either a CertificateRestoreParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateRestoreParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateRestoreParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3083,8 +3099,7 @@ def get_deleted_certificates( provisioned. Default value is None. :paramtype include_pending: bool :return: An iterator like instance of DeletedCertificateItem - :rtype: - ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.DeletedCertificateItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.DeletedCertificateItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -3094,7 +3109,7 @@ def get_deleted_certificates( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3181,10 +3196,10 @@ def get_deleted_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: DeletedCertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedCertificateBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedCertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3247,7 +3262,7 @@ def purge_deleted_certificate( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3304,10 +3319,10 @@ def recover_deleted_certificate( :param certificate_name: The name of the deleted certificate. Required. :type certificate_name: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_serialization.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_serialization.py index 2f781d740827..baa661cb82d2 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_serialization.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_serialization.py @@ -170,6 +170,13 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], return None +try: + basestring # type: ignore + unicode_str = unicode # type: ignore +except NameError: + basestring = str + unicode_str = str + _LOGGER = logging.getLogger(__name__) try: @@ -538,7 +545,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -554,7 +561,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -642,7 +649,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): else: # That's a basic type # Integrate namespace if necessary local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) + local_node.text = unicode_str(new_attr) serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore @@ -987,7 +994,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) if obj_type is _long_type: return self.serialize_long(attr) - if obj_type is str: + if obj_type is unicode_str: return self.serialize_unicode(attr) if obj_type is datetime.datetime: return self.serialize_iso(attr) @@ -1363,7 +1370,7 @@ class Deserializer(object): valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1383,7 +1390,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1436,7 +1443,7 @@ def _deserialize(self, target_obj, data): response, class_name = self._classify_target(target_obj, data) - if isinstance(response, str): + if isinstance(response, basestring): return self.deserialize_data(data, response) elif isinstance(response, type) and issubclass(response, Enum): return self.deserialize_enum(data, response) @@ -1507,14 +1514,14 @@ def _classify_target(self, target, data): if target is None: return None, None - if isinstance(target, str): + if isinstance(target, basestring): try: target = self.dependencies[target] except KeyError: return target, target try: - target = target._classify(data, self.dependencies) # type: ignore + target = target._classify(data, self.dependencies) except AttributeError: pass # Target is not a Model, no classify return target, target.__class__.__name__ # type: ignore @@ -1570,7 +1577,7 @@ def _unpack_content(raw_data, content_type=None): if hasattr(raw_data, "_content_consumed"): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data @@ -1692,7 +1699,7 @@ def deserialize_object(self, attr, **kwargs): if isinstance(attr, ET.Element): # Do no recurse on XML, just return the tree as-is return attr - if isinstance(attr, str): + if isinstance(attr, basestring): return self.deserialize_basic(attr, "str") obj_type = type(attr) if obj_type in self.basic_types: @@ -1749,7 +1756,7 @@ def deserialize_basic(self, attr, data_type): if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, str): + elif isinstance(attr, basestring): if attr.lower() in ["true", "1"]: return True elif attr.lower() in ["false", "0"]: diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_client.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_client.py index d27c48421835..f017310ad823 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_client.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_client.py @@ -23,8 +23,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a """The key vault client performs cryptographic key operations and vault operations against the Key Vault service. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_configuration.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_configuration.py index 6f792e0f6a30..8dd6125e8e1d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_configuration.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_operations/_operations.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_operations/_operations.py index 6137b8996b17..729afcf8a10a 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -58,16 +57,11 @@ ) from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): # pylint: disable=too-many-public-methods - @distributed_trace def get_certificates( self, @@ -91,8 +85,7 @@ def get_certificates( provisioned. Default value is None. :paramtype include_pending: bool :return: An iterator like instance of CertificateItem - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.CertificateItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.CertificateItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -102,7 +95,7 @@ def get_certificates( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -189,10 +182,10 @@ async def delete_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: DeletedCertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedCertificateBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedCertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -249,12 +242,12 @@ async def set_certificate_contacts( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param contacts: The contacts for the key vault certificate. Required. - :type contacts: ~azure.keyvault.v7_6_preview_1.models.Contacts + :type contacts: ~azure.keyvault.v7_5.models.Contacts :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ @@ -275,7 +268,7 @@ async def set_certificate_contacts( Default value is "application/json". :paramtype content_type: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ @@ -292,12 +285,15 @@ async def set_certificate_contacts( :type vault_base_url: str :param contacts: The contacts for the key vault certificate. Is either a Contacts type or a IO[bytes] type. Required. - :type contacts: ~azure.keyvault.v7_6_preview_1.models.Contacts or IO[bytes] + :type contacts: ~azure.keyvault.v7_5.models.Contacts or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -363,10 +359,10 @@ async def get_certificate_contacts(self, vault_base_url: str, **kwargs: Any) -> :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -420,10 +416,10 @@ async def delete_certificate_contacts(self, vault_base_url: str, **kwargs: Any) :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :return: Contacts - :rtype: ~azure.keyvault.v7_6_preview_1.models.Contacts + :rtype: ~azure.keyvault.v7_5.models.Contacts :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -484,7 +480,7 @@ def get_certificate_issuers( :paramtype maxresults: int :return: An iterator like instance of CertificateIssuerItem :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.CertificateIssuerItem] + ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.CertificateIssuerItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -494,7 +490,7 @@ def get_certificate_issuers( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -587,12 +583,12 @@ async def set_certificate_issuer( identifiable or sensitive information. Required. :type issuer_name: str :param parameter: Certificate issuer set parameter. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerSetParameters + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerSetParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -623,7 +619,7 @@ async def set_certificate_issuer( Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -648,13 +644,15 @@ async def set_certificate_issuer( :type issuer_name: str :param parameter: Certificate issuer set parameter. Is either a CertificateIssuerSetParameters type or a IO[bytes] type. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerSetParameters or - IO[bytes] + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerSetParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -731,12 +729,12 @@ async def update_certificate_issuer( :param issuer_name: The name of the issuer. Required. :type issuer_name: str :param parameter: Certificate issuer update parameter. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerUpdateParameters + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -765,7 +763,7 @@ async def update_certificate_issuer( Default value is "application/json". :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -788,13 +786,15 @@ async def update_certificate_issuer( :type issuer_name: str :param parameter: Certificate issuer update parameter. Is either a CertificateIssuerUpdateParameters type or a IO[bytes] type. Required. - :type parameter: ~azure.keyvault.v7_6_preview_1.models.CertificateIssuerUpdateParameters or - IO[bytes] + :type parameter: ~azure.keyvault.v7_5.models.CertificateIssuerUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -866,10 +866,10 @@ async def get_certificate_issuer( :param issuer_name: The name of the issuer. Required. :type issuer_name: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -928,10 +928,10 @@ async def delete_certificate_issuer( :param issuer_name: The name of the issuer. Required. :type issuer_name: str :return: IssuerBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.IssuerBundle + :rtype: ~azure.keyvault.v7_5.models.IssuerBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -998,12 +998,12 @@ async def create_certificate( personally identifiable or sensitive information. Required. :type certificate_name: str :param parameters: The parameters to create a certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1034,7 +1034,7 @@ async def create_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1059,13 +1059,15 @@ async def create_certificate( :type certificate_name: str :param parameters: The parameters to create a certificate. Is either a CertificateCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateCreateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1146,12 +1148,12 @@ async def import_certificate( personally identifiable or sensitive information. Required. :type certificate_name: str :param parameters: The parameters to import the certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateImportParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateImportParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1184,7 +1186,7 @@ async def import_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1211,13 +1213,15 @@ async def import_certificate( :type certificate_name: str :param parameters: The parameters to import the certificate. Is either a CertificateImportParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateImportParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateImportParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1291,8 +1295,7 @@ def get_certificate_versions( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of CertificateItem - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.CertificateItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.CertificateItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -1302,7 +1305,7 @@ def get_certificate_versions( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1388,10 +1391,10 @@ async def get_certificate_policy( :param certificate_name: The name of the certificate in a given key vault. Required. :type certificate_name: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1456,12 +1459,12 @@ async def update_certificate_policy( :param certificate_name: The name of the certificate in the given vault. Required. :type certificate_name: str :param certificate_policy: The policy for the certificate. Required. - :type certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :type certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1490,7 +1493,7 @@ async def update_certificate_policy( Default value is "application/json". :paramtype content_type: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1513,12 +1516,15 @@ async def update_certificate_policy( :type certificate_name: str :param certificate_policy: The policy for the certificate. Is either a CertificatePolicy type or a IO[bytes] type. Required. - :type certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy or IO[bytes] + :type certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificatePolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :rtype: ~azure.keyvault.v7_5.models.CertificatePolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1599,12 +1605,12 @@ async def update_certificate( :param certificate_version: The version of the certificate. Required. :type certificate_version: str :param parameters: The parameters for certificate update. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateUpdateParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1637,7 +1643,7 @@ async def update_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1664,13 +1670,15 @@ async def update_certificate( :type certificate_version: str :param parameters: The parameters for certificate update. Is either a CertificateUpdateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateUpdateParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1745,10 +1753,10 @@ async def get_certificate( not specified, the latest version of the certificate is returned. Required. :type certificate_version: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1814,13 +1822,12 @@ async def update_certificate_operation( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :param certificate_operation: The certificate operation response. Required. - :type certificate_operation: - ~azure.keyvault.v7_6_preview_1.models.CertificateOperationUpdateParameter + :type certificate_operation: ~azure.keyvault.v7_5.models.CertificateOperationUpdateParameter :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1849,7 +1856,7 @@ async def update_certificate_operation( Default value is "application/json". :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1872,13 +1879,16 @@ async def update_certificate_operation( :type certificate_name: str :param certificate_operation: The certificate operation response. Is either a CertificateOperationUpdateParameter type or a IO[bytes] type. Required. - :type certificate_operation: - ~azure.keyvault.v7_6_preview_1.models.CertificateOperationUpdateParameter or IO[bytes] + :type certificate_operation: ~azure.keyvault.v7_5.models.CertificateOperationUpdateParameter or + IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1949,10 +1959,10 @@ async def get_certificate_operation( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2012,10 +2022,10 @@ async def delete_certificate_operation( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: CertificateOperation - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateOperation + :rtype: ~azure.keyvault.v7_5.models.CertificateOperation :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2081,12 +2091,12 @@ async def merge_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :param parameters: The parameters to merge certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateMergeParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateMergeParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2116,7 +2126,7 @@ async def merge_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2140,12 +2150,15 @@ async def merge_certificate( :type certificate_name: str :param parameters: The parameters to merge certificate. Is either a CertificateMergeParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateMergeParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateMergeParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2217,10 +2230,10 @@ async def backup_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: BackupCertificateResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.BackupCertificateResult + :rtype: ~azure.keyvault.v7_5.models.BackupCertificateResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2282,12 +2295,12 @@ async def restore_certificate( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The parameters to restore the certificate. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateRestoreParameters + :type parameters: ~azure.keyvault.v7_5.models.CertificateRestoreParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2308,7 +2321,7 @@ async def restore_certificate( Default value is "application/json". :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2325,13 +2338,15 @@ async def restore_certificate( :type vault_base_url: str :param parameters: The parameters to restore the certificate. Is either a CertificateRestoreParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.CertificateRestoreParameters or - IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.CertificateRestoreParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2413,7 +2428,7 @@ def get_deleted_certificates( :paramtype include_pending: bool :return: An iterator like instance of DeletedCertificateItem :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.DeletedCertificateItem] + ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.DeletedCertificateItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -2423,7 +2438,7 @@ def get_deleted_certificates( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2510,10 +2525,10 @@ async def get_deleted_certificate( :param certificate_name: The name of the certificate. Required. :type certificate_name: str :return: DeletedCertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedCertificateBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedCertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2576,7 +2591,7 @@ async def purge_deleted_certificate( # pylint: disable=inconsistent-return-stat :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2633,10 +2648,10 @@ async def recover_deleted_certificate( :param certificate_name: The name of the deleted certificate. Required. :type certificate_name: str :return: CertificateBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.CertificateBundle + :rtype: ~azure.keyvault.v7_5.models.CertificateBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/models/_models.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/models/_models.py index b9dc519da35c..52b773d33b03 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/models/_models.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/models/_models.py @@ -21,7 +21,7 @@ class Action(_serialization.Model): """The action that will be executed. :ivar action_type: The type of the action. Known values are: "EmailContacts" and "AutoRenew". - :vartype action_type: str or ~azure.keyvault.v7_6_preview_1.models.ActionType + :vartype action_type: str or ~azure.keyvault.v7_5.models.ActionType """ _attribute_map = { @@ -32,7 +32,7 @@ def __init__(self, *, action_type: Optional[Union[str, "_models.ActionType"]] = """ :keyword action_type: The type of the action. Known values are: "EmailContacts" and "AutoRenew". - :paramtype action_type: str or ~azure.keyvault.v7_6_preview_1.models.ActionType + :paramtype action_type: str or ~azure.keyvault.v7_5.models.ActionType """ super().__init__(**kwargs) self.action_type = action_type @@ -185,7 +185,7 @@ class CertificateAttributes(Attributes): retention interval. Known values are: "Purgeable", "Recoverable+Purgeable", "Recoverable", "Recoverable+ProtectedSubscription", "CustomizedRecoverable+Purgeable", "CustomizedRecoverable", and "CustomizedRecoverable+ProtectedSubscription". - :vartype recovery_level: str or ~azure.keyvault.v7_6_preview_1.models.DeletionRecoveryLevel + :vartype recovery_level: str or ~azure.keyvault.v7_5.models.DeletionRecoveryLevel """ _validation = { @@ -240,14 +240,14 @@ class CertificateBundle(_serialization.Model): :ivar x509_thumbprint: Thumbprint of the certificate. :vartype x509_thumbprint: bytes :ivar policy: The management policy. - :vartype policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :vartype policy: ~azure.keyvault.v7_5.models.CertificatePolicy :ivar cer: CER contents of x509 certificate. :vartype cer: bytes :ivar content_type: The content type of the secret. eg. 'application/x-pem-file' or 'application/x-pkcs12',. :vartype content_type: str :ivar attributes: The certificate attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ @@ -288,7 +288,7 @@ def __init__( 'application/x-pkcs12',. :paramtype content_type: str :keyword attributes: The certificate attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -308,9 +308,9 @@ class CertificateCreateParameters(_serialization.Model): """The certificate create parameters. :ivar certificate_policy: The management policy for the certificate. - :vartype certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :vartype certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :ivar certificate_attributes: The attributes of the certificate (optional). - :vartype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ @@ -331,9 +331,9 @@ def __init__( ) -> None: """ :keyword certificate_policy: The management policy for the certificate. - :paramtype certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :paramtype certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :keyword certificate_attributes: The attributes of the certificate (optional). - :paramtype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -355,9 +355,9 @@ class CertificateImportParameters(_serialization.Model): for encryption. :vartype password: str :ivar certificate_policy: The management policy for the certificate. - :vartype certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :vartype certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :ivar certificate_attributes: The attributes of the certificate (optional). - :vartype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ @@ -392,9 +392,9 @@ def __init__( used for encryption. :paramtype password: str :keyword certificate_policy: The management policy for the certificate. - :paramtype certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :paramtype certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :keyword certificate_attributes: The attributes of the certificate (optional). - :paramtype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -445,7 +445,7 @@ class CertificateIssuerListResult(_serialization.Model): :ivar value: A response message containing a list of certificate issuers in the key vault along with a link to the next page of certificate issuers. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.CertificateIssuerItem] + :vartype value: list[~azure.keyvault.v7_5.models.CertificateIssuerItem] :ivar next_link: The URL to get the next set of certificate issuers. :vartype next_link: str """ @@ -475,11 +475,11 @@ class CertificateIssuerSetParameters(_serialization.Model): :ivar provider: The issuer provider. Required. :vartype provider: str :ivar credentials: The credentials to be used for the issuer. - :vartype credentials: ~azure.keyvault.v7_6_preview_1.models.IssuerCredentials + :vartype credentials: ~azure.keyvault.v7_5.models.IssuerCredentials :ivar organization_details: Details of the organization as provided to the issuer. - :vartype organization_details: ~azure.keyvault.v7_6_preview_1.models.OrganizationDetails + :vartype organization_details: ~azure.keyvault.v7_5.models.OrganizationDetails :ivar attributes: Attributes of the issuer object. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.IssuerAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.IssuerAttributes """ _validation = { @@ -506,11 +506,11 @@ def __init__( :keyword provider: The issuer provider. Required. :paramtype provider: str :keyword credentials: The credentials to be used for the issuer. - :paramtype credentials: ~azure.keyvault.v7_6_preview_1.models.IssuerCredentials + :paramtype credentials: ~azure.keyvault.v7_5.models.IssuerCredentials :keyword organization_details: Details of the organization as provided to the issuer. - :paramtype organization_details: ~azure.keyvault.v7_6_preview_1.models.OrganizationDetails + :paramtype organization_details: ~azure.keyvault.v7_5.models.OrganizationDetails :keyword attributes: Attributes of the issuer object. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.IssuerAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.IssuerAttributes """ super().__init__(**kwargs) self.provider = provider @@ -525,11 +525,11 @@ class CertificateIssuerUpdateParameters(_serialization.Model): :ivar provider: The issuer provider. :vartype provider: str :ivar credentials: The credentials to be used for the issuer. - :vartype credentials: ~azure.keyvault.v7_6_preview_1.models.IssuerCredentials + :vartype credentials: ~azure.keyvault.v7_5.models.IssuerCredentials :ivar organization_details: Details of the organization as provided to the issuer. - :vartype organization_details: ~azure.keyvault.v7_6_preview_1.models.OrganizationDetails + :vartype organization_details: ~azure.keyvault.v7_5.models.OrganizationDetails :ivar attributes: Attributes of the issuer object. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.IssuerAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.IssuerAttributes """ _attribute_map = { @@ -552,11 +552,11 @@ def __init__( :keyword provider: The issuer provider. :paramtype provider: str :keyword credentials: The credentials to be used for the issuer. - :paramtype credentials: ~azure.keyvault.v7_6_preview_1.models.IssuerCredentials + :paramtype credentials: ~azure.keyvault.v7_5.models.IssuerCredentials :keyword organization_details: Details of the organization as provided to the issuer. - :paramtype organization_details: ~azure.keyvault.v7_6_preview_1.models.OrganizationDetails + :paramtype organization_details: ~azure.keyvault.v7_5.models.OrganizationDetails :keyword attributes: Attributes of the issuer object. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.IssuerAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.IssuerAttributes """ super().__init__(**kwargs) self.provider = provider @@ -571,7 +571,7 @@ class CertificateItem(_serialization.Model): :ivar id: Certificate identifier. :vartype id: str :ivar attributes: The certificate management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar x509_thumbprint: Thumbprint of the certificate. @@ -598,7 +598,7 @@ def __init__( :keyword id: Certificate identifier. :paramtype id: str :keyword attributes: The certificate management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword x509_thumbprint: Thumbprint of the certificate. @@ -618,7 +618,7 @@ class CertificateListResult(_serialization.Model): :ivar value: A response message containing a list of certificates in the key vault along with a link to the next page of certificates. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.CertificateItem] + :vartype value: list[~azure.keyvault.v7_5.models.CertificateItem] :ivar next_link: The URL to get the next set of certificates. :vartype next_link: str """ @@ -648,7 +648,7 @@ class CertificateMergeParameters(_serialization.Model): :ivar x509_certificates: The certificate or the certificate chain to merge. Required. :vartype x509_certificates: list[bytes] :ivar certificate_attributes: The attributes of the certificate (optional). - :vartype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ @@ -675,7 +675,7 @@ def __init__( :keyword x509_certificates: The certificate or the certificate chain to merge. Required. :paramtype x509_certificates: list[bytes] :keyword certificate_attributes: The attributes of the certificate (optional). - :paramtype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -693,7 +693,7 @@ class CertificateOperation(_serialization.Model): :ivar id: The certificate id. :vartype id: str :ivar issuer_parameters: Parameters for the issuer of the X509 component of a certificate. - :vartype issuer_parameters: ~azure.keyvault.v7_6_preview_1.models.IssuerParameters + :vartype issuer_parameters: ~azure.keyvault.v7_5.models.IssuerParameters :ivar csr: The certificate signing request (CSR) that is being used in the certificate operation. :vartype csr: bytes @@ -705,7 +705,7 @@ class CertificateOperation(_serialization.Model): :ivar status_details: The status details of the certificate operation. :vartype status_details: str :ivar error: Error encountered, if any, during the certificate operation. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error :ivar target: Location which contains the result of the certificate operation. :vartype target: str :ivar request_id: Identifier for the certificate operation. @@ -743,7 +743,7 @@ def __init__( ) -> None: """ :keyword issuer_parameters: Parameters for the issuer of the X509 component of a certificate. - :paramtype issuer_parameters: ~azure.keyvault.v7_6_preview_1.models.IssuerParameters + :paramtype issuer_parameters: ~azure.keyvault.v7_5.models.IssuerParameters :keyword csr: The certificate signing request (CSR) that is being used in the certificate operation. :paramtype csr: bytes @@ -755,7 +755,7 @@ def __init__( :keyword status_details: The status details of the certificate operation. :paramtype status_details: str :keyword error: Error encountered, if any, during the certificate operation. - :paramtype error: ~azure.keyvault.v7_6_preview_1.models.Error + :paramtype error: ~azure.keyvault.v7_5.models.Error :keyword target: Location which contains the result of the certificate operation. :paramtype target: str :keyword request_id: Identifier for the certificate operation. @@ -809,19 +809,18 @@ class CertificatePolicy(_serialization.Model): :ivar id: The certificate id. :vartype id: str :ivar key_properties: Properties of the key backing a certificate. - :vartype key_properties: ~azure.keyvault.v7_6_preview_1.models.KeyProperties + :vartype key_properties: ~azure.keyvault.v7_5.models.KeyProperties :ivar secret_properties: Properties of the secret backing a certificate. - :vartype secret_properties: ~azure.keyvault.v7_6_preview_1.models.SecretProperties + :vartype secret_properties: ~azure.keyvault.v7_5.models.SecretProperties :ivar x509_certificate_properties: Properties of the X509 component of a certificate. - :vartype x509_certificate_properties: - ~azure.keyvault.v7_6_preview_1.models.X509CertificateProperties + :vartype x509_certificate_properties: ~azure.keyvault.v7_5.models.X509CertificateProperties :ivar lifetime_actions: Actions that will be performed by Key Vault over the lifetime of a certificate. - :vartype lifetime_actions: list[~azure.keyvault.v7_6_preview_1.models.LifetimeAction] + :vartype lifetime_actions: list[~azure.keyvault.v7_5.models.LifetimeAction] :ivar issuer_parameters: Parameters for the issuer of the X509 component of a certificate. - :vartype issuer_parameters: ~azure.keyvault.v7_6_preview_1.models.IssuerParameters + :vartype issuer_parameters: ~azure.keyvault.v7_5.models.IssuerParameters :ivar attributes: The certificate attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes """ _validation = { @@ -851,19 +850,18 @@ def __init__( ) -> None: """ :keyword key_properties: Properties of the key backing a certificate. - :paramtype key_properties: ~azure.keyvault.v7_6_preview_1.models.KeyProperties + :paramtype key_properties: ~azure.keyvault.v7_5.models.KeyProperties :keyword secret_properties: Properties of the secret backing a certificate. - :paramtype secret_properties: ~azure.keyvault.v7_6_preview_1.models.SecretProperties + :paramtype secret_properties: ~azure.keyvault.v7_5.models.SecretProperties :keyword x509_certificate_properties: Properties of the X509 component of a certificate. - :paramtype x509_certificate_properties: - ~azure.keyvault.v7_6_preview_1.models.X509CertificateProperties + :paramtype x509_certificate_properties: ~azure.keyvault.v7_5.models.X509CertificateProperties :keyword lifetime_actions: Actions that will be performed by Key Vault over the lifetime of a certificate. - :paramtype lifetime_actions: list[~azure.keyvault.v7_6_preview_1.models.LifetimeAction] + :paramtype lifetime_actions: list[~azure.keyvault.v7_5.models.LifetimeAction] :keyword issuer_parameters: Parameters for the issuer of the X509 component of a certificate. - :paramtype issuer_parameters: ~azure.keyvault.v7_6_preview_1.models.IssuerParameters + :paramtype issuer_parameters: ~azure.keyvault.v7_5.models.IssuerParameters :keyword attributes: The certificate attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes """ super().__init__(**kwargs) self.id = None @@ -907,9 +905,9 @@ class CertificateUpdateParameters(_serialization.Model): """The certificate update parameters. :ivar certificate_policy: The management policy for the certificate. - :vartype certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :vartype certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :ivar certificate_attributes: The attributes of the certificate (optional). - :vartype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ @@ -930,9 +928,9 @@ def __init__( ) -> None: """ :keyword certificate_policy: The management policy for the certificate. - :paramtype certificate_policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :paramtype certificate_policy: ~azure.keyvault.v7_5.models.CertificatePolicy :keyword certificate_attributes: The attributes of the certificate (optional). - :paramtype certificate_attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype certificate_attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -989,7 +987,7 @@ class Contacts(_serialization.Model): :ivar id: Identifier for the contacts collection. :vartype id: str :ivar contact_list: The contact list for the vault certificates. - :vartype contact_list: list[~azure.keyvault.v7_6_preview_1.models.Contact] + :vartype contact_list: list[~azure.keyvault.v7_5.models.Contact] """ _validation = { @@ -1004,7 +1002,7 @@ class Contacts(_serialization.Model): def __init__(self, *, contact_list: Optional[List["_models.Contact"]] = None, **kwargs: Any) -> None: """ :keyword contact_list: The contact list for the vault certificates. - :paramtype contact_list: list[~azure.keyvault.v7_6_preview_1.models.Contact] + :paramtype contact_list: list[~azure.keyvault.v7_5.models.Contact] """ super().__init__(**kwargs) self.id = None @@ -1026,14 +1024,14 @@ class DeletedCertificateBundle(CertificateBundle): # pylint: disable=too-many-i :ivar x509_thumbprint: Thumbprint of the certificate. :vartype x509_thumbprint: bytes :ivar policy: The management policy. - :vartype policy: ~azure.keyvault.v7_6_preview_1.models.CertificatePolicy + :vartype policy: ~azure.keyvault.v7_5.models.CertificatePolicy :ivar cer: CER contents of x509 certificate. :vartype cer: bytes :ivar content_type: The content type of the secret. eg. 'application/x-pem-file' or 'application/x-pkcs12',. :vartype content_type: str :ivar attributes: The certificate attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar recovery_id: The url of the recovery object, used to identify and recover the deleted @@ -1087,7 +1085,7 @@ def __init__( 'application/x-pkcs12',. :paramtype content_type: str :keyword attributes: The certificate attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword recovery_id: The url of the recovery object, used to identify and recover the deleted @@ -1108,7 +1106,7 @@ class DeletedCertificateItem(CertificateItem): :ivar id: Certificate identifier. :vartype id: str :ivar attributes: The certificate management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar x509_thumbprint: Thumbprint of the certificate. @@ -1151,7 +1149,7 @@ def __init__( :keyword id: Certificate identifier. :paramtype id: str :keyword attributes: The certificate management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.CertificateAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.CertificateAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword x509_thumbprint: Thumbprint of the certificate. @@ -1173,7 +1171,7 @@ class DeletedCertificateListResult(_serialization.Model): :ivar value: A response message containing a list of deleted certificates in the vault along with a link to the next page of deleted certificates. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.DeletedCertificateItem] + :vartype value: list[~azure.keyvault.v7_5.models.DeletedCertificateItem] :ivar next_link: The URL to get the next set of deleted certificates. :vartype next_link: str """ @@ -1205,7 +1203,7 @@ class Error(_serialization.Model): :ivar message: The error message. :vartype message: str :ivar inner_error: The key vault server error. - :vartype inner_error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype inner_error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -1273,11 +1271,11 @@ class IssuerBundle(_serialization.Model): :ivar provider: The issuer provider. :vartype provider: str :ivar credentials: The credentials to be used for the issuer. - :vartype credentials: ~azure.keyvault.v7_6_preview_1.models.IssuerCredentials + :vartype credentials: ~azure.keyvault.v7_5.models.IssuerCredentials :ivar organization_details: Details of the organization as provided to the issuer. - :vartype organization_details: ~azure.keyvault.v7_6_preview_1.models.OrganizationDetails + :vartype organization_details: ~azure.keyvault.v7_5.models.OrganizationDetails :ivar attributes: Attributes of the issuer object. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.IssuerAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.IssuerAttributes """ _validation = { @@ -1305,11 +1303,11 @@ def __init__( :keyword provider: The issuer provider. :paramtype provider: str :keyword credentials: The credentials to be used for the issuer. - :paramtype credentials: ~azure.keyvault.v7_6_preview_1.models.IssuerCredentials + :paramtype credentials: ~azure.keyvault.v7_5.models.IssuerCredentials :keyword organization_details: Details of the organization as provided to the issuer. - :paramtype organization_details: ~azure.keyvault.v7_6_preview_1.models.OrganizationDetails + :paramtype organization_details: ~azure.keyvault.v7_5.models.OrganizationDetails :keyword attributes: Attributes of the issuer object. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.IssuerAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.IssuerAttributes """ super().__init__(**kwargs) self.id = None @@ -1398,14 +1396,14 @@ class KeyProperties(_serialization.Model): :vartype exportable: bool :ivar key_type: The type of key pair to be used for the certificate. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :vartype key_type: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :vartype key_type: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :ivar key_size: The key size in bits. For example: 2048, 3072, or 4096 for RSA. :vartype key_size: int :ivar reuse_key: Indicates if the same key pair will be used on certificate renewal. :vartype reuse_key: bool :ivar curve: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :vartype curve: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :vartype curve: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName """ _attribute_map = { @@ -1432,14 +1430,14 @@ def __init__( :paramtype exportable: bool :keyword key_type: The type of key pair to be used for the certificate. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :paramtype key_type: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :paramtype key_type: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :keyword key_size: The key size in bits. For example: 2048, 3072, or 4096 for RSA. :paramtype key_size: int :keyword reuse_key: Indicates if the same key pair will be used on certificate renewal. :paramtype reuse_key: bool :keyword curve: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :paramtype curve: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :paramtype curve: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName """ super().__init__(**kwargs) self.exportable = exportable @@ -1455,7 +1453,7 @@ class KeyVaultError(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar error: The key vault server error. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -1476,9 +1474,9 @@ class LifetimeAction(_serialization.Model): """Action and its trigger that will be performed by Key Vault over the lifetime of a certificate. :ivar trigger: The condition that will execute the action. - :vartype trigger: ~azure.keyvault.v7_6_preview_1.models.Trigger + :vartype trigger: ~azure.keyvault.v7_5.models.Trigger :ivar action: The action that will be executed. - :vartype action: ~azure.keyvault.v7_6_preview_1.models.Action + :vartype action: ~azure.keyvault.v7_5.models.Action """ _attribute_map = { @@ -1491,9 +1489,9 @@ def __init__( ) -> None: """ :keyword trigger: The condition that will execute the action. - :paramtype trigger: ~azure.keyvault.v7_6_preview_1.models.Trigger + :paramtype trigger: ~azure.keyvault.v7_5.models.Trigger :keyword action: The action that will be executed. - :paramtype action: ~azure.keyvault.v7_6_preview_1.models.Action + :paramtype action: ~azure.keyvault.v7_5.models.Action """ super().__init__(**kwargs) self.trigger = trigger @@ -1506,7 +1504,7 @@ class OrganizationDetails(_serialization.Model): :ivar id: Id of the organization. :vartype id: str :ivar admin_details: Details of the organization administrator. - :vartype admin_details: list[~azure.keyvault.v7_6_preview_1.models.AdministratorDetails] + :vartype admin_details: list[~azure.keyvault.v7_5.models.AdministratorDetails] """ _attribute_map = { @@ -1525,7 +1523,7 @@ def __init__( :keyword id: Id of the organization. :paramtype id: str :keyword admin_details: Details of the organization administrator. - :paramtype admin_details: list[~azure.keyvault.v7_6_preview_1.models.AdministratorDetails] + :paramtype admin_details: list[~azure.keyvault.v7_5.models.AdministratorDetails] """ super().__init__(**kwargs) self.id = id @@ -1660,10 +1658,9 @@ class X509CertificateProperties(_serialization.Model): :ivar ekus: The enhanced key usage. :vartype ekus: list[str] :ivar subject_alternative_names: The subject alternative names. - :vartype subject_alternative_names: - ~azure.keyvault.v7_6_preview_1.models.SubjectAlternativeNames + :vartype subject_alternative_names: ~azure.keyvault.v7_5.models.SubjectAlternativeNames :ivar key_usage: Defines how the certificate's key may be used. - :vartype key_usage: list[str or ~azure.keyvault.v7_6_preview_1.models.KeyUsageType] + :vartype key_usage: list[str or ~azure.keyvault.v7_5.models.KeyUsageType] :ivar validity_in_months: The duration that the certificate is valid in months. :vartype validity_in_months: int """ @@ -1696,10 +1693,9 @@ def __init__( :keyword ekus: The enhanced key usage. :paramtype ekus: list[str] :keyword subject_alternative_names: The subject alternative names. - :paramtype subject_alternative_names: - ~azure.keyvault.v7_6_preview_1.models.SubjectAlternativeNames + :paramtype subject_alternative_names: ~azure.keyvault.v7_5.models.SubjectAlternativeNames :keyword key_usage: Defines how the certificate's key may be used. - :paramtype key_usage: list[str or ~azure.keyvault.v7_6_preview_1.models.KeyUsageType] + :paramtype key_usage: list[str or ~azure.keyvault.v7_5.models.KeyUsageType] :keyword validity_in_months: The duration that the certificate is valid in months. :paramtype validity_in_months: int """ diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_challenge_auth_policy.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_challenge_auth_policy.py index e9b44fc68e55..dad851f8f58c 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_challenge_auth_policy.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_challenge_auth_policy.py @@ -15,8 +15,9 @@ """ from copy import deepcopy +import sys import time -from typing import Any, Awaitable, Callable, cast, Optional, overload, TypeVar, Union +from typing import Any, Callable, cast, Optional, overload, TypeVar, Union from urllib.parse import urlparse from typing_extensions import ParamSpec @@ -31,6 +32,11 @@ from . import http_challenge_cache as ChallengeCache from .challenge_auth_policy import _enforce_tls, _has_claims, _update_challenge +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + P = ParamSpec("P") T = TypeVar("T") diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py index 5a64cc3f529f..08fb1c9f668e 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py @@ -2,7 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from typing import Any, Awaitable +import sys +from typing import Any from azure.core.credentials_async import AsyncTokenCredential from azure.core.pipeline.policies import HttpLoggingPolicy @@ -15,6 +16,11 @@ from .._generated.aio import KeyVaultClient as _KeyVaultClient from .._generated import models as _models +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + class AsyncKeyVaultClientBase(object): # pylint:disable=protected-access diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index c976c0a2f430..704cea8a0753 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -24,7 +24,6 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version - V7_6_PREVIEW_1 = "7.6-preview.1" V7_5 = "7.5" V7_4 = "7.4" V7_3 = "7.3" @@ -34,7 +33,7 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): V2016_10_01 = "2016-10-01" -DEFAULT_VERSION = ApiVersion.V7_6_PREVIEW_1 +DEFAULT_VERSION = ApiVersion.V7_5 _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_version.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_version.py index a10b2ccd6d1f..553761583a46 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_version.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "4.9.0b1" +VERSION = "4.9.0" diff --git a/sdk/keyvault/azure-keyvault-certificates/setup.py b/sdk/keyvault/azure-keyvault-certificates/setup.py index 347d79fb93a0..c7bb89ff6117 100644 --- a/sdk/keyvault/azure-keyvault-certificates/setup.py +++ b/sdk/keyvault/azure-keyvault-certificates/setup.py @@ -45,7 +45,7 @@ url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates", keywords="azure, azure sdk", classifiers=[ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", diff --git a/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md index faf4085e14e1..59ef7b771df9 100644 --- a/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md @@ -1,24 +1,18 @@ # Release History -## 4.10.0b1 (Unreleased) +## 4.10.0 (2024-10-17) ### Features Added -- Added support for service API version `7.6-preview.1` - Added support for Continuous Access Evaluation (CAE). `enable_cae=True` is passed to all `get_token` requests. -### Breaking Changes - ### Bugs Fixed - Typing errors from using Key Vault clients as context managers have been fixed ([#34744](https://github.com/Azure/azure-sdk-for-python/issues/34744)) ### Other Changes - Updated minimum `azure-core` version to 1.31.0 -- Key Vault API version `7.6-preview.1` is now the default ## 4.9.0 (2024-02-22) - -### Features Added - Added support for service API version `7.5` - (From 4.9.0b2) The `cryptography` library's `RSAPrivateKey` and `RSAPublicKey` interfaces are now implemented by `KeyVaultRSAPrivateKey` and `KeyVaultRSAPublicKey` classes that can use keys managed by Key Vault diff --git a/sdk/keyvault/azure-keyvault-keys/assets.json b/sdk/keyvault/azure-keyvault-keys/assets.json index a2bc9f4eb2dc..4993cbaecca4 100644 --- a/sdk/keyvault/azure-keyvault-keys/assets.json +++ b/sdk/keyvault/azure-keyvault-keys/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "python", "TagPrefix": "python/keyvault/azure-keyvault-keys", - "Tag": "python/keyvault/azure-keyvault-keys_54b17f2ac7" + "Tag": "python/keyvault/azure-keyvault-keys_6a80b2f740" } diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_client.py index f405b504f90c..28ee625036e6 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_client.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_client.py @@ -23,8 +23,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a """The key vault client performs cryptographic key operations and vault operations against the Key Vault service. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_configuration.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_configuration.py index 57ca854de83c..c7b4428506e3 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_configuration.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_operations/_operations.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_operations/_operations.py index 436dc2844741..10fa45cfd798 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, overload +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse from azure.core.exceptions import ( @@ -29,10 +28,6 @@ from .._serialization import Serializer from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,7 +40,7 @@ def build_key_vault_create_key_request(key_name: str, **kwargs: Any) -> HttpRequ _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -71,7 +66,7 @@ def build_key_vault_rotate_key_request(key_name: str, **kwargs: Any) -> HttpRequ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -96,7 +91,7 @@ def build_key_vault_import_key_request(key_name: str, **kwargs: Any) -> HttpRequ _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -122,7 +117,7 @@ def build_key_vault_delete_key_request(key_name: str, **kwargs: Any) -> HttpRequ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -147,7 +142,7 @@ def build_key_vault_update_key_request(key_name: str, key_version: str, **kwargs _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -174,7 +169,7 @@ def build_key_vault_get_key_request(key_name: str, key_version: str, **kwargs: A _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -201,7 +196,7 @@ def build_key_vault_get_key_versions_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -227,7 +222,7 @@ def build_key_vault_get_keys_request(*, maxresults: Optional[int] = None, **kwar _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -248,7 +243,7 @@ def build_key_vault_backup_key_request(key_name: str, **kwargs: Any) -> HttpRequ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -273,7 +268,7 @@ def build_key_vault_restore_key_request(**kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -295,7 +290,7 @@ def build_key_vault_encrypt_request(key_name: str, key_version: str, **kwargs: A _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -323,7 +318,7 @@ def build_key_vault_decrypt_request(key_name: str, key_version: str, **kwargs: A _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -351,7 +346,7 @@ def build_key_vault_sign_request(key_name: str, key_version: str, **kwargs: Any) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -379,7 +374,7 @@ def build_key_vault_verify_request(key_name: str, key_version: str, **kwargs: An _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -407,7 +402,7 @@ def build_key_vault_wrap_key_request(key_name: str, key_version: str, **kwargs: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -435,7 +430,7 @@ def build_key_vault_unwrap_key_request(key_name: str, key_version: str, **kwargs _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -463,7 +458,7 @@ def build_key_vault_release_request(key_name: str, key_version: str, **kwargs: A _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -490,7 +485,7 @@ def build_key_vault_get_deleted_keys_request(*, maxresults: Optional[int] = None _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -511,7 +506,7 @@ def build_key_vault_get_deleted_key_request(key_name: str, **kwargs: Any) -> Htt _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -537,7 +532,7 @@ def build_key_vault_purge_deleted_key_request( # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -563,7 +558,7 @@ def build_key_vault_recover_deleted_key_request( # pylint: disable=name-too-lon _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -589,7 +584,7 @@ def build_key_vault_get_key_rotation_policy_request( # pylint: disable=name-too _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -616,7 +611,7 @@ def build_key_vault_update_key_rotation_policy_request( # pylint: disable=name- _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -643,7 +638,7 @@ def build_key_vault_get_random_bytes_request(**kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -661,7 +656,6 @@ def build_key_vault_get_random_bytes_request(**kwargs: Any) -> HttpRequest: class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): # pylint: disable=too-many-public-methods - @overload def create_key( self, @@ -686,12 +680,12 @@ def create_key( Required. :type key_name: str :param parameters: The parameters to create a key. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -724,7 +718,7 @@ def create_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -751,12 +745,15 @@ def create_key( :type key_name: str :param parameters: The parameters to create a key. Is either a KeyCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyCreateParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -827,10 +824,10 @@ def rotate_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> _mode specified key. Required. :type key_name: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -899,12 +896,12 @@ def import_key( identifiable or sensitive information. Required. :type key_name: str :param parameters: The parameters to import a key. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyImportParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyImportParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -937,7 +934,7 @@ def import_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -964,12 +961,15 @@ def import_key( :type key_name: str :param parameters: The parameters to import a key. Is either a KeyImportParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyImportParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyImportParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1040,10 +1040,10 @@ def delete_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> _mode :param key_name: The name of the key to delete. Required. :type key_name: str :return: DeletedKeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedKeyBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedKeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1113,12 +1113,12 @@ def update_key( :param key_version: The version of the key to update. Required. :type key_version: str :param parameters: The parameters of the key to update. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyUpdateParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1152,7 +1152,7 @@ def update_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1180,12 +1180,15 @@ def update_key( :type key_version: str :param parameters: The parameters of the key to update. Is either a KeyUpdateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyUpdateParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1259,10 +1262,10 @@ def get_key(self, vault_base_url: str, key_name: str, key_version: str, **kwargs Required. :type key_version: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1325,7 +1328,7 @@ def get_key_versions( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of KeyItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.KeyItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.KeyItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -1333,7 +1336,7 @@ def get_key_versions( cls: ClsType[_models._models.KeyListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1422,7 +1425,7 @@ def get_keys( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of KeyItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.KeyItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.KeyItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -1430,7 +1433,7 @@ def get_keys( cls: ClsType[_models._models.KeyListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1522,10 +1525,10 @@ def backup_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> _mode :param key_name: The name of the key. Required. :type key_name: str :return: BackupKeyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.BackupKeyResult + :rtype: ~azure.keyvault.v7_5.models.BackupKeyResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1595,12 +1598,12 @@ def restore_key( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The parameters to restore the key. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyRestoreParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyRestoreParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1629,7 +1632,7 @@ def restore_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1654,12 +1657,15 @@ def restore_key( :type vault_base_url: str :param parameters: The parameters to restore the key. Is either a KeyRestoreParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyRestoreParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyRestoreParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1744,12 +1750,12 @@ def encrypt( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the encryption operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1787,7 +1793,7 @@ def encrypt( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1819,12 +1825,15 @@ def encrypt( :type key_version: str :param parameters: The parameters for the encryption operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1912,12 +1921,12 @@ def decrypt( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the decryption operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1956,7 +1965,7 @@ def decrypt( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1989,12 +1998,15 @@ def decrypt( :type key_version: str :param parameters: The parameters for the decryption operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2076,12 +2088,12 @@ def sign( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the signing operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeySignParameters + :type parameters: ~azure.keyvault.v7_5.models.KeySignParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2114,7 +2126,7 @@ def sign( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2141,12 +2153,15 @@ def sign( :type key_version: str :param parameters: The parameters for the signing operation. Is either a KeySignParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeySignParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeySignParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2230,12 +2245,12 @@ def verify( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for verify operations. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyVerifyParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyVerifyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyResult + :rtype: ~azure.keyvault.v7_5.models.KeyVerifyResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2270,7 +2285,7 @@ def verify( Default value is "application/json". :paramtype content_type: str :return: KeyVerifyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyResult + :rtype: ~azure.keyvault.v7_5.models.KeyVerifyResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2299,12 +2314,15 @@ def verify( :type key_version: str :param parameters: The parameters for verify operations. Is either a KeyVerifyParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyVerifyParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyVerifyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyResult + :rtype: ~azure.keyvault.v7_5.models.KeyVerifyResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2389,12 +2407,12 @@ def wrap_key( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for wrap operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2430,7 +2448,7 @@ def wrap_key( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2460,12 +2478,15 @@ def wrap_key( :type key_version: str :param parameters: The parameters for wrap operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2548,12 +2569,12 @@ def unwrap_key( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the key operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2587,7 +2608,7 @@ def unwrap_key( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2615,12 +2636,15 @@ def unwrap_key( :type key_version: str :param parameters: The parameters for the key operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2702,12 +2726,12 @@ def release( Required. :type key_version: str :param parameters: The parameters for the key release operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyReleaseParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyReleaseResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseResult + :rtype: ~azure.keyvault.v7_5.models.KeyReleaseResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2740,7 +2764,7 @@ def release( Default value is "application/json". :paramtype content_type: str :return: KeyReleaseResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseResult + :rtype: ~azure.keyvault.v7_5.models.KeyReleaseResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2767,12 +2791,15 @@ def release( :type key_version: str :param parameters: The parameters for the key release operation. Is either a KeyReleaseParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyReleaseParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyReleaseResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseResult + :rtype: ~azure.keyvault.v7_5.models.KeyReleaseResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2848,7 +2875,7 @@ def get_deleted_keys( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of DeletedKeyItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.DeletedKeyItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.DeletedKeyItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -2856,7 +2883,7 @@ def get_deleted_keys( cls: ClsType[_models._models.DeletedKeyListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2940,10 +2967,10 @@ def get_deleted_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> :param key_name: The name of the key. Required. :type key_name: str :return: DeletedKeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedKeyBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedKeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3006,7 +3033,7 @@ def purge_deleted_key( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3061,10 +3088,10 @@ def recover_deleted_key(self, vault_base_url: str, key_name: str, **kwargs: Any) :param key_name: The name of the deleted key. Required. :type key_name: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3121,10 +3148,10 @@ def get_key_rotation_policy(self, vault_base_url: str, key_name: str, **kwargs: :param key_name: The name of the key in a given key vault. Required. :type key_name: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3189,12 +3216,12 @@ def update_key_rotation_policy( :param key_name: The name of the key in the given vault. Required. :type key_name: str :param key_rotation_policy: The policy for the key. Required. - :type key_rotation_policy: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :type key_rotation_policy: ~azure.keyvault.v7_5.models.KeyRotationPolicy :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -3223,7 +3250,7 @@ def update_key_rotation_policy( Default value is "application/json". :paramtype content_type: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -3246,12 +3273,15 @@ def update_key_rotation_policy( :type key_name: str :param key_rotation_policy: The policy for the key. Is either a KeyRotationPolicy type or a IO[bytes] type. Required. - :type key_rotation_policy: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy or IO[bytes] + :type key_rotation_policy: ~azure.keyvault.v7_5.models.KeyRotationPolicy or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -3324,12 +3354,12 @@ def get_random_bytes( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The request object to get random bytes. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.GetRandomBytesRequest + :type parameters: ~azure.keyvault.v7_5.models.GetRandomBytesRequest :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RandomBytes - :rtype: ~azure.keyvault.v7_6_preview_1.models.RandomBytes + :rtype: ~azure.keyvault.v7_5.models.RandomBytes :raises ~azure.core.exceptions.HttpResponseError: """ @@ -3349,7 +3379,7 @@ def get_random_bytes( Default value is "application/json". :paramtype content_type: str :return: RandomBytes - :rtype: ~azure.keyvault.v7_6_preview_1.models.RandomBytes + :rtype: ~azure.keyvault.v7_5.models.RandomBytes :raises ~azure.core.exceptions.HttpResponseError: """ @@ -3365,12 +3395,15 @@ def get_random_bytes( :type vault_base_url: str :param parameters: The request object to get random bytes. Is either a GetRandomBytesRequest type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.GetRandomBytesRequest or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.GetRandomBytesRequest or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: RandomBytes - :rtype: ~azure.keyvault.v7_6_preview_1.models.RandomBytes + :rtype: ~azure.keyvault.v7_5.models.RandomBytes :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_serialization.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_serialization.py index 2f781d740827..baa661cb82d2 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_serialization.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_serialization.py @@ -170,6 +170,13 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], return None +try: + basestring # type: ignore + unicode_str = unicode # type: ignore +except NameError: + basestring = str + unicode_str = str + _LOGGER = logging.getLogger(__name__) try: @@ -538,7 +545,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -554,7 +561,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -642,7 +649,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): else: # That's a basic type # Integrate namespace if necessary local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) + local_node.text = unicode_str(new_attr) serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore @@ -987,7 +994,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) if obj_type is _long_type: return self.serialize_long(attr) - if obj_type is str: + if obj_type is unicode_str: return self.serialize_unicode(attr) if obj_type is datetime.datetime: return self.serialize_iso(attr) @@ -1363,7 +1370,7 @@ class Deserializer(object): valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1383,7 +1390,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1436,7 +1443,7 @@ def _deserialize(self, target_obj, data): response, class_name = self._classify_target(target_obj, data) - if isinstance(response, str): + if isinstance(response, basestring): return self.deserialize_data(data, response) elif isinstance(response, type) and issubclass(response, Enum): return self.deserialize_enum(data, response) @@ -1507,14 +1514,14 @@ def _classify_target(self, target, data): if target is None: return None, None - if isinstance(target, str): + if isinstance(target, basestring): try: target = self.dependencies[target] except KeyError: return target, target try: - target = target._classify(data, self.dependencies) # type: ignore + target = target._classify(data, self.dependencies) except AttributeError: pass # Target is not a Model, no classify return target, target.__class__.__name__ # type: ignore @@ -1570,7 +1577,7 @@ def _unpack_content(raw_data, content_type=None): if hasattr(raw_data, "_content_consumed"): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data @@ -1692,7 +1699,7 @@ def deserialize_object(self, attr, **kwargs): if isinstance(attr, ET.Element): # Do no recurse on XML, just return the tree as-is return attr - if isinstance(attr, str): + if isinstance(attr, basestring): return self.deserialize_basic(attr, "str") obj_type = type(attr) if obj_type in self.basic_types: @@ -1749,7 +1756,7 @@ def deserialize_basic(self, attr, data_type): if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, str): + elif isinstance(attr, basestring): if attr.lower() in ["true", "1"]: return True elif attr.lower() in ["false", "0"]: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_client.py index d27c48421835..f017310ad823 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_client.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_client.py @@ -23,8 +23,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a """The key vault client performs cryptographic key operations and vault operations against the Key Vault service. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_configuration.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_configuration.py index 6f792e0f6a30..8dd6125e8e1d 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_configuration.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_operations/_operations.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_operations/_operations.py index 5f74dd6d92fc..259c8885d81e 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/aio/_operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -55,16 +54,11 @@ ) from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): # pylint: disable=too-many-public-methods - @overload async def create_key( self, @@ -89,12 +83,12 @@ async def create_key( Required. :type key_name: str :param parameters: The parameters to create a key. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyCreateParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyCreateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -127,7 +121,7 @@ async def create_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -154,12 +148,15 @@ async def create_key( :type key_name: str :param parameters: The parameters to create a key. Is either a KeyCreateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyCreateParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyCreateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -230,10 +227,10 @@ async def rotate_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> specified key. Required. :type key_name: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -302,12 +299,12 @@ async def import_key( identifiable or sensitive information. Required. :type key_name: str :param parameters: The parameters to import a key. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyImportParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyImportParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -340,7 +337,7 @@ async def import_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -367,12 +364,15 @@ async def import_key( :type key_name: str :param parameters: The parameters to import a key. Is either a KeyImportParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyImportParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyImportParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -443,10 +443,10 @@ async def delete_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> :param key_name: The name of the key to delete. Required. :type key_name: str :return: DeletedKeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedKeyBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedKeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -516,12 +516,12 @@ async def update_key( :param key_version: The version of the key to update. Required. :type key_version: str :param parameters: The parameters of the key to update. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyUpdateParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -555,7 +555,7 @@ async def update_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -583,12 +583,15 @@ async def update_key( :type key_version: str :param parameters: The parameters of the key to update. Is either a KeyUpdateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyUpdateParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -662,10 +665,10 @@ async def get_key(self, vault_base_url: str, key_name: str, key_version: str, ** Required. :type key_version: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -728,7 +731,7 @@ def get_key_versions( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of KeyItem - :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.KeyItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.KeyItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -736,7 +739,7 @@ def get_key_versions( cls: ClsType[_models._models.KeyListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -825,7 +828,7 @@ def get_keys( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of KeyItem - :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.KeyItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.KeyItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -833,7 +836,7 @@ def get_keys( cls: ClsType[_models._models.KeyListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -925,10 +928,10 @@ async def backup_key(self, vault_base_url: str, key_name: str, **kwargs: Any) -> :param key_name: The name of the key. Required. :type key_name: str :return: BackupKeyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.BackupKeyResult + :rtype: ~azure.keyvault.v7_5.models.BackupKeyResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -998,12 +1001,12 @@ async def restore_key( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The parameters to restore the key. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyRestoreParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyRestoreParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1032,7 +1035,7 @@ async def restore_key( Default value is "application/json". :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1057,12 +1060,15 @@ async def restore_key( :type vault_base_url: str :param parameters: The parameters to restore the key. Is either a KeyRestoreParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyRestoreParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyRestoreParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1147,12 +1153,12 @@ async def encrypt( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the encryption operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1190,7 +1196,7 @@ async def encrypt( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1222,12 +1228,15 @@ async def encrypt( :type key_version: str :param parameters: The parameters for the encryption operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1315,12 +1324,12 @@ async def decrypt( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the decryption operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1359,7 +1368,7 @@ async def decrypt( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1392,12 +1401,15 @@ async def decrypt( :type key_version: str :param parameters: The parameters for the decryption operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1479,12 +1491,12 @@ async def sign( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the signing operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeySignParameters + :type parameters: ~azure.keyvault.v7_5.models.KeySignParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1517,7 +1529,7 @@ async def sign( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1544,12 +1556,15 @@ async def sign( :type key_version: str :param parameters: The parameters for the signing operation. Is either a KeySignParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeySignParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeySignParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1633,12 +1648,12 @@ async def verify( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for verify operations. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyVerifyParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyVerifyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyResult + :rtype: ~azure.keyvault.v7_5.models.KeyVerifyResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1673,7 +1688,7 @@ async def verify( Default value is "application/json". :paramtype content_type: str :return: KeyVerifyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyResult + :rtype: ~azure.keyvault.v7_5.models.KeyVerifyResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1702,12 +1717,15 @@ async def verify( :type key_version: str :param parameters: The parameters for verify operations. Is either a KeyVerifyParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyVerifyParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyVerifyResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyVerifyResult + :rtype: ~azure.keyvault.v7_5.models.KeyVerifyResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1792,12 +1810,12 @@ async def wrap_key( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for wrap operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1833,7 +1851,7 @@ async def wrap_key( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1863,12 +1881,15 @@ async def wrap_key( :type key_version: str :param parameters: The parameters for wrap operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1951,12 +1972,12 @@ async def unwrap_key( :param key_version: The version of the key. Required. :type key_version: str :param parameters: The parameters for the key operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1990,7 +2011,7 @@ async def unwrap_key( Default value is "application/json". :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2018,12 +2039,15 @@ async def unwrap_key( :type key_version: str :param parameters: The parameters for the key operation. Is either a KeyOperationsParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyOperationsParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyOperationsParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyOperationResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyOperationResult + :rtype: ~azure.keyvault.v7_5.models.KeyOperationResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2105,12 +2129,12 @@ async def release( Required. :type key_version: str :param parameters: The parameters for the key release operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseParameters + :type parameters: ~azure.keyvault.v7_5.models.KeyReleaseParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyReleaseResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseResult + :rtype: ~azure.keyvault.v7_5.models.KeyReleaseResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2143,7 +2167,7 @@ async def release( Default value is "application/json". :paramtype content_type: str :return: KeyReleaseResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseResult + :rtype: ~azure.keyvault.v7_5.models.KeyReleaseResult :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2170,12 +2194,15 @@ async def release( :type key_version: str :param parameters: The parameters for the key release operation. Is either a KeyReleaseParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.KeyReleaseParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyReleaseResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyReleaseResult + :rtype: ~azure.keyvault.v7_5.models.KeyReleaseResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2251,8 +2278,7 @@ def get_deleted_keys( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of DeletedKeyItem - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.DeletedKeyItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.DeletedKeyItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -2260,7 +2286,7 @@ def get_deleted_keys( cls: ClsType[_models._models.DeletedKeyListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2344,10 +2370,10 @@ async def get_deleted_key(self, vault_base_url: str, key_name: str, **kwargs: An :param key_name: The name of the key. Required. :type key_name: str :return: DeletedKeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedKeyBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedKeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2410,7 +2436,7 @@ async def purge_deleted_key( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2465,10 +2491,10 @@ async def recover_deleted_key(self, vault_base_url: str, key_name: str, **kwargs :param key_name: The name of the deleted key. Required. :type key_name: str :return: KeyBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyBundle + :rtype: ~azure.keyvault.v7_5.models.KeyBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2527,10 +2553,10 @@ async def get_key_rotation_policy( :param key_name: The name of the key in a given key vault. Required. :type key_name: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2595,12 +2621,12 @@ async def update_key_rotation_policy( :param key_name: The name of the key in the given vault. Required. :type key_name: str :param key_rotation_policy: The policy for the key. Required. - :type key_rotation_policy: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :type key_rotation_policy: ~azure.keyvault.v7_5.models.KeyRotationPolicy :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2629,7 +2655,7 @@ async def update_key_rotation_policy( Default value is "application/json". :paramtype content_type: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2652,12 +2678,15 @@ async def update_key_rotation_policy( :type key_name: str :param key_rotation_policy: The policy for the key. Is either a KeyRotationPolicy type or a IO[bytes] type. Required. - :type key_rotation_policy: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy or IO[bytes] + :type key_rotation_policy: ~azure.keyvault.v7_5.models.KeyRotationPolicy or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: KeyRotationPolicy - :rtype: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicy + :rtype: ~azure.keyvault.v7_5.models.KeyRotationPolicy :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2730,12 +2759,12 @@ async def get_random_bytes( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The request object to get random bytes. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.GetRandomBytesRequest + :type parameters: ~azure.keyvault.v7_5.models.GetRandomBytesRequest :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: RandomBytes - :rtype: ~azure.keyvault.v7_6_preview_1.models.RandomBytes + :rtype: ~azure.keyvault.v7_5.models.RandomBytes :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2755,7 +2784,7 @@ async def get_random_bytes( Default value is "application/json". :paramtype content_type: str :return: RandomBytes - :rtype: ~azure.keyvault.v7_6_preview_1.models.RandomBytes + :rtype: ~azure.keyvault.v7_5.models.RandomBytes :raises ~azure.core.exceptions.HttpResponseError: """ @@ -2771,12 +2800,15 @@ async def get_random_bytes( :type vault_base_url: str :param parameters: The request object to get random bytes. Is either a GetRandomBytesRequest type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.GetRandomBytesRequest or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.GetRandomBytesRequest or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: RandomBytes - :rtype: ~azure.keyvault.v7_6_preview_1.models.RandomBytes + :rtype: ~azure.keyvault.v7_5.models.RandomBytes :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_enums.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_enums.py index ced05781da73..6e13009627a9 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_enums.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_enums.py @@ -105,7 +105,7 @@ class JsonWebKeyOperation(str, Enum, metaclass=CaseInsensitiveEnumMeta): VERIFY = "verify" WRAP_KEY = "wrapKey" UNWRAP_KEY = "unwrapKey" - IMPORT_ENUM = "import" + IMPORT = "import" EXPORT = "export" diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_models.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_models.py index d324275d5934..bb1b908eb308 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_models.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/models/_models.py @@ -100,16 +100,16 @@ class KeyBundle(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar key: The Json web key. - :vartype key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :vartype key: ~azure.keyvault.v7_5.models.JsonWebKey :ivar attributes: The key management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar managed: True if the key's lifetime is managed by key vault. If this is a key backing a certificate, then managed will be true. :vartype managed: bool :ivar release_policy: The policy rules under which the key can be exported. - :vartype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :vartype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ _validation = { @@ -135,13 +135,13 @@ def __init__( ) -> None: """ :keyword key: The Json web key. - :paramtype key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :paramtype key: ~azure.keyvault.v7_5.models.JsonWebKey :keyword attributes: The key management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword release_policy: The policy rules under which the key can be exported. - :paramtype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :paramtype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ super().__init__(**kwargs) self.key = key @@ -157,16 +157,16 @@ class DeletedKeyBundle(KeyBundle): Variables are only populated by the server, and will be ignored when sending a request. :ivar key: The Json web key. - :vartype key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :vartype key: ~azure.keyvault.v7_5.models.JsonWebKey :ivar attributes: The key management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar managed: True if the key's lifetime is managed by key vault. If this is a key backing a certificate, then managed will be true. :vartype managed: bool :ivar release_policy: The policy rules under which the key can be exported. - :vartype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :vartype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy :ivar recovery_id: The url of the recovery object, used to identify and recover the deleted key. :vartype recovery_id: str @@ -205,13 +205,13 @@ def __init__( ) -> None: """ :keyword key: The Json web key. - :paramtype key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :paramtype key: ~azure.keyvault.v7_5.models.JsonWebKey :keyword attributes: The key management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword release_policy: The policy rules under which the key can be exported. - :paramtype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :paramtype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy :keyword recovery_id: The url of the recovery object, used to identify and recover the deleted key. :paramtype recovery_id: str @@ -230,7 +230,7 @@ class KeyItem(_serialization.Model): :ivar kid: Key identifier. :vartype kid: str :ivar attributes: The key management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar managed: True if the key's lifetime is managed by key vault. If this is a key backing a @@ -261,7 +261,7 @@ def __init__( :keyword kid: Key identifier. :paramtype kid: str :keyword attributes: The key management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -280,7 +280,7 @@ class DeletedKeyItem(KeyItem): :ivar kid: Key identifier. :vartype kid: str :ivar attributes: The key management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar managed: True if the key's lifetime is managed by key vault. If this is a key backing a @@ -324,7 +324,7 @@ def __init__( :keyword kid: Key identifier. :paramtype kid: str :keyword attributes: The key management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword recovery_id: The url of the recovery object, used to identify and recover the deleted @@ -344,7 +344,7 @@ class DeletedKeyListResult(_serialization.Model): :ivar value: A response message containing a list of deleted keys in the vault along with a link to the next page of deleted keys. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.DeletedKeyItem] + :vartype value: list[~azure.keyvault.v7_5.models.DeletedKeyItem] :ivar next_link: The URL to get the next set of deleted keys. :vartype next_link: str """ @@ -376,7 +376,7 @@ class Error(_serialization.Model): :ivar message: The error message. :vartype message: str :ivar inner_error: The key vault server error. - :vartype inner_error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype inner_error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -433,7 +433,7 @@ class JsonWebKey(_serialization.Model): # pylint: disable=too-many-instance-att :ivar kty: JsonWebKey Key Type (kty), as defined in https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :vartype kty: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :vartype kty: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :ivar key_ops: :vartype key_ops: list[str] :ivar n: RSA modulus. @@ -458,7 +458,7 @@ class JsonWebKey(_serialization.Model): # pylint: disable=too-many-instance-att :vartype t: bytes :ivar crv: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :vartype crv: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :vartype crv: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName :ivar x: X component of an EC public key. :vartype x: bytes :ivar y: Y component of an EC public key. @@ -511,7 +511,7 @@ def __init__( :keyword kty: JsonWebKey Key Type (kty), as defined in https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :paramtype kty: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :paramtype kty: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :keyword key_ops: :paramtype key_ops: list[str] :keyword n: RSA modulus. @@ -536,7 +536,7 @@ def __init__( :paramtype t: bytes :keyword crv: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :paramtype crv: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :paramtype crv: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName :keyword x: X component of an EC public key. :paramtype x: bytes :keyword y: Y component of an EC public key. @@ -585,7 +585,7 @@ class KeyAttributes(Attributes): values are: "Purgeable", "Recoverable+Purgeable", "Recoverable", "Recoverable+ProtectedSubscription", "CustomizedRecoverable+Purgeable", "CustomizedRecoverable", and "CustomizedRecoverable+ProtectedSubscription". - :vartype recovery_level: str or ~azure.keyvault.v7_6_preview_1.models.DeletionRecoveryLevel + :vartype recovery_level: str or ~azure.keyvault.v7_5.models.DeletionRecoveryLevel :ivar exportable: Indicates if the private key can be exported. Release policy must be provided when creating the first version of an exportable key. :vartype exportable: bool @@ -647,22 +647,22 @@ class KeyCreateParameters(_serialization.Model): :ivar kty: The type of key to create. For valid values, see JsonWebKeyType. Required. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :vartype kty: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :vartype kty: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :ivar key_size: The key size in bits. For example: 2048, 3072, or 4096 for RSA. :vartype key_size: int :ivar public_exponent: The public exponent for a RSA key. :vartype public_exponent: int :ivar key_ops: - :vartype key_ops: list[str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyOperation] + :vartype key_ops: list[str or ~azure.keyvault.v7_5.models.JsonWebKeyOperation] :ivar key_attributes: The attributes of a key managed by the key vault service. - :vartype key_attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype key_attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar curve: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :vartype curve: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :vartype curve: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName :ivar release_policy: The policy rules under which the key can be exported. - :vartype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :vartype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ _validation = { @@ -696,22 +696,22 @@ def __init__( """ :keyword kty: The type of key to create. For valid values, see JsonWebKeyType. Required. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :paramtype kty: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :paramtype kty: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :keyword key_size: The key size in bits. For example: 2048, 3072, or 4096 for RSA. :paramtype key_size: int :keyword public_exponent: The public exponent for a RSA key. :paramtype public_exponent: int :keyword key_ops: - :paramtype key_ops: list[str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyOperation] + :paramtype key_ops: list[str or ~azure.keyvault.v7_5.models.JsonWebKeyOperation] :keyword key_attributes: The attributes of a key managed by the key vault service. - :paramtype key_attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype key_attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword curve: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :paramtype curve: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :paramtype curve: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName :keyword release_policy: The policy rules under which the key can be exported. - :paramtype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :paramtype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ super().__init__(**kwargs) self.kty = kty @@ -729,13 +729,13 @@ class KeyExportParameters(_serialization.Model): :ivar wrapping_key: The export key encryption Json web key. This key MUST be a RSA key that supports encryption. - :vartype wrapping_key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :vartype wrapping_key: ~azure.keyvault.v7_5.models.JsonWebKey :ivar wrapping_kid: The export key encryption key identifier. This key MUST be a RSA key that supports encryption. :vartype wrapping_kid: str :ivar enc: The encryption algorithm to use to protected the exported key material. Known values are: "CKM_RSA_AES_KEY_WRAP", "RSA_AES_KEY_WRAP_256", and "RSA_AES_KEY_WRAP_384". - :vartype enc: str or ~azure.keyvault.v7_6_preview_1.models.KeyEncryptionAlgorithm + :vartype enc: str or ~azure.keyvault.v7_5.models.KeyEncryptionAlgorithm """ _attribute_map = { @@ -755,13 +755,13 @@ def __init__( """ :keyword wrapping_key: The export key encryption Json web key. This key MUST be a RSA key that supports encryption. - :paramtype wrapping_key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :paramtype wrapping_key: ~azure.keyvault.v7_5.models.JsonWebKey :keyword wrapping_kid: The export key encryption key identifier. This key MUST be a RSA key that supports encryption. :paramtype wrapping_kid: str :keyword enc: The encryption algorithm to use to protected the exported key material. Known values are: "CKM_RSA_AES_KEY_WRAP", "RSA_AES_KEY_WRAP_256", and "RSA_AES_KEY_WRAP_384". - :paramtype enc: str or ~azure.keyvault.v7_6_preview_1.models.KeyEncryptionAlgorithm + :paramtype enc: str or ~azure.keyvault.v7_5.models.KeyEncryptionAlgorithm """ super().__init__(**kwargs) self.wrapping_key = wrapping_key @@ -777,13 +777,13 @@ class KeyImportParameters(_serialization.Model): :ivar hsm: Whether to import as a hardware key (HSM) or software key. :vartype hsm: bool :ivar key: The Json web key. Required. - :vartype key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :vartype key: ~azure.keyvault.v7_5.models.JsonWebKey :ivar key_attributes: The key management attributes. - :vartype key_attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype key_attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar release_policy: The policy rules under which the key can be exported. - :vartype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :vartype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ _validation = { @@ -812,13 +812,13 @@ def __init__( :keyword hsm: Whether to import as a hardware key (HSM) or software key. :paramtype hsm: bool :keyword key: The Json web key. Required. - :paramtype key: ~azure.keyvault.v7_6_preview_1.models.JsonWebKey + :paramtype key: ~azure.keyvault.v7_5.models.JsonWebKey :keyword key_attributes: The key management attributes. - :paramtype key_attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype key_attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword release_policy: The policy rules under which the key can be exported. - :paramtype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :paramtype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ super().__init__(**kwargs) self.hsm = hsm @@ -835,7 +835,7 @@ class KeyListResult(_serialization.Model): :ivar value: A response message containing a list of keys in the key vault along with a link to the next page of keys. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.KeyItem] + :vartype value: list[~azure.keyvault.v7_5.models.KeyItem] :ivar next_link: The URL to get the next set of keys. :vartype next_link: str """ @@ -908,7 +908,7 @@ class KeyOperationsParameters(_serialization.Model): :ivar algorithm: algorithm identifier. Required. Known values are: "RSA-OAEP", "RSA-OAEP-256", "RSA1_5", "A128GCM", "A192GCM", "A256GCM", "A128KW", "A192KW", "A256KW", "A128CBC", "A192CBC", "A256CBC", "A128CBCPAD", "A192CBCPAD", and "A256CBCPAD". - :vartype algorithm: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyEncryptionAlgorithm + :vartype algorithm: str or ~azure.keyvault.v7_5.models.JsonWebKeyEncryptionAlgorithm :ivar value: Required. :vartype value: bytes :ivar iv: Cryptographically random, non-repeating initialization vector for symmetric @@ -948,8 +948,7 @@ def __init__( :keyword algorithm: algorithm identifier. Required. Known values are: "RSA-OAEP", "RSA-OAEP-256", "RSA1_5", "A128GCM", "A192GCM", "A256GCM", "A128KW", "A192KW", "A256KW", "A128CBC", "A192CBC", "A256CBC", "A128CBCPAD", "A192CBCPAD", and "A256CBCPAD". - :paramtype algorithm: str or - ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyEncryptionAlgorithm + :paramtype algorithm: str or ~azure.keyvault.v7_5.models.JsonWebKeyEncryptionAlgorithm :keyword value: Required. :paramtype value: bytes :keyword iv: Cryptographically random, non-repeating initialization vector for symmetric @@ -978,14 +977,14 @@ class KeyProperties(_serialization.Model): :vartype exportable: bool :ivar key_type: The type of key pair to be used for the certificate. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :vartype key_type: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :vartype key_type: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :ivar key_size: The key size in bits. For example: 2048, 3072, or 4096 for RSA. :vartype key_size: int :ivar reuse_key: Indicates if the same key pair will be used on certificate renewal. :vartype reuse_key: bool :ivar curve: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :vartype curve: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :vartype curve: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName """ _attribute_map = { @@ -1012,14 +1011,14 @@ def __init__( :paramtype exportable: bool :keyword key_type: The type of key pair to be used for the certificate. Known values are: "EC", "EC-HSM", "RSA", "RSA-HSM", "oct", and "oct-HSM". - :paramtype key_type: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyType + :paramtype key_type: str or ~azure.keyvault.v7_5.models.JsonWebKeyType :keyword key_size: The key size in bits. For example: 2048, 3072, or 4096 for RSA. :paramtype key_size: int :keyword reuse_key: Indicates if the same key pair will be used on certificate renewal. :paramtype reuse_key: bool :keyword curve: Elliptic curve name. For valid values, see JsonWebKeyCurveName. Known values are: "P-256", "P-384", "P-521", and "P-256K". - :paramtype curve: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyCurveName + :paramtype curve: str or ~azure.keyvault.v7_5.models.JsonWebKeyCurveName """ super().__init__(**kwargs) self.exportable = exportable @@ -1041,7 +1040,7 @@ class KeyReleaseParameters(_serialization.Model): :vartype nonce: str :ivar enc: The encryption algorithm to use to protected the exported key material. Known values are: "CKM_RSA_AES_KEY_WRAP", "RSA_AES_KEY_WRAP_256", and "RSA_AES_KEY_WRAP_384". - :vartype enc: str or ~azure.keyvault.v7_6_preview_1.models.KeyEncryptionAlgorithm + :vartype enc: str or ~azure.keyvault.v7_5.models.KeyEncryptionAlgorithm """ _validation = { @@ -1070,7 +1069,7 @@ def __init__( :paramtype nonce: str :keyword enc: The encryption algorithm to use to protected the exported key material. Known values are: "CKM_RSA_AES_KEY_WRAP", "RSA_AES_KEY_WRAP_256", and "RSA_AES_KEY_WRAP_384". - :paramtype enc: str or ~azure.keyvault.v7_6_preview_1.models.KeyEncryptionAlgorithm + :paramtype enc: str or ~azure.keyvault.v7_5.models.KeyEncryptionAlgorithm """ super().__init__(**kwargs) self.target_attestation_token = target_attestation_token @@ -1180,9 +1179,9 @@ class KeyRotationPolicy(_serialization.Model): :ivar lifetime_actions: Actions that will be performed by Key Vault over the lifetime of a key. For preview, lifetimeActions can only have two items at maximum: one for rotate, one for notify. Notification time would be default to 30 days before expiry and it is not configurable. - :vartype lifetime_actions: list[~azure.keyvault.v7_6_preview_1.models.LifetimeActions] + :vartype lifetime_actions: list[~azure.keyvault.v7_5.models.LifetimeActions] :ivar attributes: The key rotation policy attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicyAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.KeyRotationPolicyAttributes """ _validation = { @@ -1206,9 +1205,9 @@ def __init__( :keyword lifetime_actions: Actions that will be performed by Key Vault over the lifetime of a key. For preview, lifetimeActions can only have two items at maximum: one for rotate, one for notify. Notification time would be default to 30 days before expiry and it is not configurable. - :paramtype lifetime_actions: list[~azure.keyvault.v7_6_preview_1.models.LifetimeActions] + :paramtype lifetime_actions: list[~azure.keyvault.v7_5.models.LifetimeActions] :keyword attributes: The key rotation policy attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.KeyRotationPolicyAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.KeyRotationPolicyAttributes """ super().__init__(**kwargs) self.id = None @@ -1264,7 +1263,7 @@ class KeySignParameters(_serialization.Model): possible algorithm types, see JsonWebKeySignatureAlgorithm. Required. Known values are: "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL", "ES256", "ES384", "ES512", and "ES256K". - :vartype algorithm: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeySignatureAlgorithm + :vartype algorithm: str or ~azure.keyvault.v7_5.models.JsonWebKeySignatureAlgorithm :ivar value: Required. :vartype value: bytes """ @@ -1287,7 +1286,7 @@ def __init__( possible algorithm types, see JsonWebKeySignatureAlgorithm. Required. Known values are: "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL", "ES256", "ES384", "ES512", and "ES256K". - :paramtype algorithm: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeySignatureAlgorithm + :paramtype algorithm: str or ~azure.keyvault.v7_5.models.JsonWebKeySignatureAlgorithm :keyword value: Required. :paramtype value: bytes """ @@ -1301,13 +1300,13 @@ class KeyUpdateParameters(_serialization.Model): :ivar key_ops: Json web key operations. For more information on possible key operations, see JsonWebKeyOperation. - :vartype key_ops: list[str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyOperation] + :vartype key_ops: list[str or ~azure.keyvault.v7_5.models.JsonWebKeyOperation] :ivar key_attributes: The attributes of a key managed by the key vault service. - :vartype key_attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :vartype key_attributes: ~azure.keyvault.v7_5.models.KeyAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar release_policy: The policy rules under which the key can be exported. - :vartype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :vartype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ _attribute_map = { @@ -1329,13 +1328,13 @@ def __init__( """ :keyword key_ops: Json web key operations. For more information on possible key operations, see JsonWebKeyOperation. - :paramtype key_ops: list[str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeyOperation] + :paramtype key_ops: list[str or ~azure.keyvault.v7_5.models.JsonWebKeyOperation] :keyword key_attributes: The attributes of a key managed by the key vault service. - :paramtype key_attributes: ~azure.keyvault.v7_6_preview_1.models.KeyAttributes + :paramtype key_attributes: ~azure.keyvault.v7_5.models.KeyAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword release_policy: The policy rules under which the key can be exported. - :paramtype release_policy: ~azure.keyvault.v7_6_preview_1.models.KeyReleasePolicy + :paramtype release_policy: ~azure.keyvault.v7_5.models.KeyReleasePolicy """ super().__init__(**kwargs) self.key_ops = key_ops @@ -1350,7 +1349,7 @@ class KeyVaultError(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar error: The key vault server error. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -1375,7 +1374,7 @@ class KeyVerifyParameters(_serialization.Model): :ivar algorithm: The signing/verification algorithm. For more information on possible algorithm types, see JsonWebKeySignatureAlgorithm. Required. Known values are: "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL", "ES256", "ES384", "ES512", and "ES256K". - :vartype algorithm: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeySignatureAlgorithm + :vartype algorithm: str or ~azure.keyvault.v7_5.models.JsonWebKeySignatureAlgorithm :ivar digest: The digest used for signing. Required. :vartype digest: bytes :ivar signature: The signature to be verified. Required. @@ -1406,7 +1405,7 @@ def __init__( :keyword algorithm: The signing/verification algorithm. For more information on possible algorithm types, see JsonWebKeySignatureAlgorithm. Required. Known values are: "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL", "ES256", "ES384", "ES512", and "ES256K". - :paramtype algorithm: str or ~azure.keyvault.v7_6_preview_1.models.JsonWebKeySignatureAlgorithm + :paramtype algorithm: str or ~azure.keyvault.v7_5.models.JsonWebKeySignatureAlgorithm :keyword digest: The digest used for signing. Required. :paramtype digest: bytes :keyword signature: The signature to be verified. Required. @@ -1445,9 +1444,9 @@ class LifetimeActions(_serialization.Model): """Action and its trigger that will be performed by Key Vault over the lifetime of a key. :ivar trigger: The condition that will execute the action. - :vartype trigger: ~azure.keyvault.v7_6_preview_1.models.LifetimeActionsTrigger + :vartype trigger: ~azure.keyvault.v7_5.models.LifetimeActionsTrigger :ivar action: The action that will be executed. - :vartype action: ~azure.keyvault.v7_6_preview_1.models.LifetimeActionsType + :vartype action: ~azure.keyvault.v7_5.models.LifetimeActionsType """ _attribute_map = { @@ -1464,9 +1463,9 @@ def __init__( ) -> None: """ :keyword trigger: The condition that will execute the action. - :paramtype trigger: ~azure.keyvault.v7_6_preview_1.models.LifetimeActionsTrigger + :paramtype trigger: ~azure.keyvault.v7_5.models.LifetimeActionsTrigger :keyword action: The action that will be executed. - :paramtype action: ~azure.keyvault.v7_6_preview_1.models.LifetimeActionsType + :paramtype action: ~azure.keyvault.v7_5.models.LifetimeActionsType """ super().__init__(**kwargs) self.trigger = trigger @@ -1510,7 +1509,7 @@ class LifetimeActionsType(_serialization.Model): :ivar type: The type of the action. The value should be compared case-insensitively. Known values are: "Rotate" and "Notify". - :vartype type: str or ~azure.keyvault.v7_6_preview_1.models.ActionType + :vartype type: str or ~azure.keyvault.v7_5.models.ActionType """ _attribute_map = { @@ -1521,7 +1520,7 @@ def __init__(self, *, type: Optional[Union[str, "_models.ActionType"]] = None, * """ :keyword type: The type of the action. The value should be compared case-insensitively. Known values are: "Rotate" and "Notify". - :paramtype type: str or ~azure.keyvault.v7_6_preview_1.models.ActionType + :paramtype type: str or ~azure.keyvault.v7_5.models.ActionType """ super().__init__(**kwargs) self.type = type diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_challenge_auth_policy.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_challenge_auth_policy.py index e9b44fc68e55..dad851f8f58c 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_challenge_auth_policy.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_challenge_auth_policy.py @@ -15,8 +15,9 @@ """ from copy import deepcopy +import sys import time -from typing import Any, Awaitable, Callable, cast, Optional, overload, TypeVar, Union +from typing import Any, Callable, cast, Optional, overload, TypeVar, Union from urllib.parse import urlparse from typing_extensions import ParamSpec @@ -31,6 +32,11 @@ from . import http_challenge_cache as ChallengeCache from .challenge_auth_policy import _enforce_tls, _has_claims, _update_challenge +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + P = ParamSpec("P") T = TypeVar("T") diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py index 5a64cc3f529f..08fb1c9f668e 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py @@ -2,7 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from typing import Any, Awaitable +import sys +from typing import Any from azure.core.credentials_async import AsyncTokenCredential from azure.core.pipeline.policies import HttpLoggingPolicy @@ -15,6 +16,11 @@ from .._generated.aio import KeyVaultClient as _KeyVaultClient from .._generated import models as _models +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + class AsyncKeyVaultClientBase(object): # pylint:disable=protected-access diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index c976c0a2f430..704cea8a0753 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -24,7 +24,6 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version - V7_6_PREVIEW_1 = "7.6-preview.1" V7_5 = "7.5" V7_4 = "7.4" V7_3 = "7.3" @@ -34,7 +33,7 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): V2016_10_01 = "2016-10-01" -DEFAULT_VERSION = ApiVersion.V7_6_PREVIEW_1 +DEFAULT_VERSION = ApiVersion.V7_5 _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_version.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_version.py index 18467da6257b..137385314623 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_version.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "4.10.0b1" +VERSION = "4.10.0" diff --git a/sdk/keyvault/azure-keyvault-keys/setup.py b/sdk/keyvault/azure-keyvault-keys/setup.py index 7bbe28af42c5..662d1a12d4fe 100644 --- a/sdk/keyvault/azure-keyvault-keys/setup.py +++ b/sdk/keyvault/azure-keyvault-keys/setup.py @@ -45,7 +45,7 @@ url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys", keywords="azure, azure sdk", classifiers=[ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", diff --git a/sdk/keyvault/azure-keyvault-keys/tests/_test_case.py b/sdk/keyvault/azure-keyvault-keys/tests/_test_case.py index dac13b948287..56bfa6475fea 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/_test_case.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/_test_case.py @@ -13,7 +13,7 @@ from devtools_testutils import AzureRecordedTestCase -HSM_SUPPORTED_VERSIONS = {ApiVersion.V7_2, ApiVersion.V7_3, ApiVersion.V7_4, ApiVersion.V7_5, ApiVersion.V7_6_PREVIEW_1} +HSM_SUPPORTED_VERSIONS = {ApiVersion.V7_2, ApiVersion.V7_3, ApiVersion.V7_4, ApiVersion.V7_5} def get_attestation_token(attestation_uri): diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py b/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py index 9f3a086aa5df..3b57d5465d9b 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py @@ -84,8 +84,7 @@ def _assert_key_attributes_equal(self, k1: KeyProperties, k2: KeyProperties) -> assert k1.updated_on == k2.updated_on assert k1.tags == k2.tags assert k1.recovery_level == k2.recovery_level - # TODO: Resolve 7.6-preview.1 issue where hsm_platform is None instead of 0, then restore this check - # assert k1.hsm_platform == k2.hsm_platform + assert k1.hsm_platform == k2.hsm_platform def _create_rsa_key(self, client, key_name, **kwargs): key_ops = kwargs.get("key_operations") or ["encrypt", "decrypt", "sign", "verify", "wrapKey", "unwrapKey"] diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py index 4ac71d01a936..b29fd650381c 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py @@ -76,8 +76,7 @@ def _assert_key_attributes_equal(self, k1: KeyProperties, k2: KeyProperties) -> assert k1.updated_on== k2.updated_on assert k1.tags== k2.tags assert k1.recovery_level== k2.recovery_level - # TODO: Resolve 7.6-preview.1 issue where hsm_platform is None instead of 0, then restore this check - # assert k1.hsm_platform == k2.hsm_platform + assert k1.hsm_platform == k2.hsm_platform async def _create_rsa_key(self, client, key_name, **kwargs): key_ops = ["encrypt", "decrypt", "sign", "verify", "wrapKey", "unwrapKey"] diff --git a/sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md b/sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md index e02843b0c0cd..09ccb7a4a5ad 100644 --- a/sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md +++ b/sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md @@ -1,20 +1,16 @@ # Release History -## 4.9.0b1 (Unreleased) +## 4.9.0 (2024-10-17) ### Features Added -- Added support for service API version `7.6-preview.1` - Added support for Continuous Access Evaluation (CAE). `enable_cae=True` is passed to all `get_token` requests. -### Breaking Changes - ### Bugs Fixed - Typing errors from using Key Vault clients as context managers have been fixed ([#34744](https://github.com/Azure/azure-sdk-for-python/issues/34744)) ### Other Changes - Updated minimum `azure-core` version to 1.31.0 -- Key Vault API version `7.6-preview.1` is now the default ## 4.8.0 (2024-02-22) diff --git a/sdk/keyvault/azure-keyvault-secrets/assets.json b/sdk/keyvault/azure-keyvault-secrets/assets.json index 978796511512..75093efde321 100644 --- a/sdk/keyvault/azure-keyvault-secrets/assets.json +++ b/sdk/keyvault/azure-keyvault-secrets/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "python", "TagPrefix": "python/keyvault/azure-keyvault-secrets", - "Tag": "python/keyvault/azure-keyvault-secrets_ffad208c83" + "Tag": "python/keyvault/azure-keyvault-secrets_e959803e9e" } diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_client.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_client.py index f405b504f90c..28ee625036e6 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_client.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_client.py @@ -23,8 +23,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a """The key vault client performs cryptographic key operations and vault operations against the Key Vault service. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_configuration.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_configuration.py index 57ca854de83c..c7b4428506e3 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_configuration.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_operations/_operations.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_operations/_operations.py index ade709ad4480..15793e76fc29 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, overload +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse from azure.core.exceptions import ( @@ -29,10 +28,6 @@ from .._serialization import Serializer from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,7 +40,7 @@ def build_key_vault_set_secret_request(secret_name: str, **kwargs: Any) -> HttpR _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -71,7 +66,7 @@ def build_key_vault_delete_secret_request(secret_name: str, **kwargs: Any) -> Ht _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -96,7 +91,7 @@ def build_key_vault_update_secret_request(secret_name: str, secret_version: str, _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -123,7 +118,7 @@ def build_key_vault_get_secret_request(secret_name: str, secret_version: str, ** _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -148,7 +143,7 @@ def build_key_vault_get_secrets_request(*, maxresults: Optional[int] = None, **k _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -171,7 +166,7 @@ def build_key_vault_get_secret_versions_request( # pylint: disable=name-too-lon _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -199,7 +194,7 @@ def build_key_vault_get_deleted_secrets_request( # pylint: disable=name-too-lon _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -222,7 +217,7 @@ def build_key_vault_get_deleted_secret_request( # pylint: disable=name-too-long _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -248,7 +243,7 @@ def build_key_vault_purge_deleted_secret_request( # pylint: disable=name-too-lo _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -274,7 +269,7 @@ def build_key_vault_recover_deleted_secret_request( # pylint: disable=name-too- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -298,7 +293,7 @@ def build_key_vault_backup_secret_request(secret_name: str, **kwargs: Any) -> Ht _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -323,7 +318,7 @@ def build_key_vault_restore_secret_request(**kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.6-preview.1")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "7.5")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -341,7 +336,6 @@ def build_key_vault_restore_secret_request(**kwargs: Any) -> HttpRequest: class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): - @overload def set_secret( self, @@ -365,12 +359,12 @@ def set_secret( identifiable or sensitive information. Required. :type secret_name: str :param parameters: The parameters for setting the secret. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretSetParameters + :type parameters: ~azure.keyvault.v7_5.models.SecretSetParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -402,7 +396,7 @@ def set_secret( Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -428,12 +422,15 @@ def set_secret( :type secret_name: str :param parameters: The parameters for setting the secret. Is either a SecretSetParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretSetParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.SecretSetParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -502,10 +499,10 @@ def delete_secret(self, vault_base_url: str, secret_name: str, **kwargs: Any) -> :param secret_name: The name of the secret. Required. :type secret_name: str :return: DeletedSecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedSecretBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedSecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -574,12 +571,12 @@ def update_secret( :param secret_version: The version of the secret. Required. :type secret_version: str :param parameters: The parameters for update secret operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretUpdateParameters + :type parameters: ~azure.keyvault.v7_5.models.SecretUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -612,7 +609,7 @@ def update_secret( Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -639,12 +636,15 @@ def update_secret( :type secret_version: str :param parameters: The parameters for update secret operation. Is either a SecretUpdateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretUpdateParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.SecretUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -719,10 +719,10 @@ def get_secret( specified, the latest version of the secret is returned. Required. :type secret_version: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -784,7 +784,7 @@ def get_secrets( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of SecretItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.SecretItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.SecretItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -792,7 +792,7 @@ def get_secrets( cls: ClsType[_models._models.SecretListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -880,7 +880,7 @@ def get_secret_versions( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of SecretItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.SecretItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.SecretItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -888,7 +888,7 @@ def get_secret_versions( cls: ClsType[_models._models.SecretListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -975,7 +975,7 @@ def get_deleted_secrets( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of DeletedSecretItem - :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_6_preview_1.models.DeletedSecretItem] + :rtype: ~azure.core.paging.ItemPaged[~azure.keyvault.v7_5.models.DeletedSecretItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -985,7 +985,7 @@ def get_deleted_secrets( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1068,10 +1068,10 @@ def get_deleted_secret(self, vault_base_url: str, secret_name: str, **kwargs: An :param secret_name: The name of the secret. Required. :type secret_name: str :return: DeletedSecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedSecretBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedSecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1134,7 +1134,7 @@ def purge_deleted_secret( # pylint: disable=inconsistent-return-statements :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1187,10 +1187,10 @@ def recover_deleted_secret(self, vault_base_url: str, secret_name: str, **kwargs :param secret_name: The name of the deleted secret. Required. :type secret_name: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1247,10 +1247,10 @@ def backup_secret(self, vault_base_url: str, secret_name: str, **kwargs: Any) -> :param secret_name: The name of the secret. Required. :type secret_name: str :return: BackupSecretResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.BackupSecretResult + :rtype: ~azure.keyvault.v7_5.models.BackupSecretResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1312,12 +1312,12 @@ def restore_secret( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The parameters to restore the secret. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretRestoreParameters + :type parameters: ~azure.keyvault.v7_5.models.SecretRestoreParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1338,7 +1338,7 @@ def restore_secret( Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1355,12 +1355,15 @@ def restore_secret( :type vault_base_url: str :param parameters: The parameters to restore the secret. Is either a SecretRestoreParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretRestoreParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.SecretRestoreParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_serialization.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_serialization.py index 2f781d740827..baa661cb82d2 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_serialization.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/_serialization.py @@ -170,6 +170,13 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], return None +try: + basestring # type: ignore + unicode_str = unicode # type: ignore +except NameError: + basestring = str + unicode_str = str + _LOGGER = logging.getLogger(__name__) try: @@ -538,7 +545,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -554,7 +561,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -642,7 +649,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): else: # That's a basic type # Integrate namespace if necessary local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) + local_node.text = unicode_str(new_attr) serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore @@ -987,7 +994,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) if obj_type is _long_type: return self.serialize_long(attr) - if obj_type is str: + if obj_type is unicode_str: return self.serialize_unicode(attr) if obj_type is datetime.datetime: return self.serialize_iso(attr) @@ -1363,7 +1370,7 @@ class Deserializer(object): valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes: Optional[Mapping[str, type]] = None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1383,7 +1390,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1436,7 +1443,7 @@ def _deserialize(self, target_obj, data): response, class_name = self._classify_target(target_obj, data) - if isinstance(response, str): + if isinstance(response, basestring): return self.deserialize_data(data, response) elif isinstance(response, type) and issubclass(response, Enum): return self.deserialize_enum(data, response) @@ -1507,14 +1514,14 @@ def _classify_target(self, target, data): if target is None: return None, None - if isinstance(target, str): + if isinstance(target, basestring): try: target = self.dependencies[target] except KeyError: return target, target try: - target = target._classify(data, self.dependencies) # type: ignore + target = target._classify(data, self.dependencies) except AttributeError: pass # Target is not a Model, no classify return target, target.__class__.__name__ # type: ignore @@ -1570,7 +1577,7 @@ def _unpack_content(raw_data, content_type=None): if hasattr(raw_data, "_content_consumed"): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): + if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data @@ -1692,7 +1699,7 @@ def deserialize_object(self, attr, **kwargs): if isinstance(attr, ET.Element): # Do no recurse on XML, just return the tree as-is return attr - if isinstance(attr, str): + if isinstance(attr, basestring): return self.deserialize_basic(attr, "str") obj_type = type(attr) if obj_type in self.basic_types: @@ -1749,7 +1756,7 @@ def deserialize_basic(self, attr, data_type): if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, str): + elif isinstance(attr, basestring): if attr.lower() in ["true", "1"]: return True elif attr.lower() in ["false", "0"]: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_client.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_client.py index d27c48421835..f017310ad823 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_client.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_client.py @@ -23,8 +23,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin): # pylint: disable=client-a """The key vault client performs cryptographic key operations and vault operations against the Key Vault service. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_configuration.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_configuration.py index 6f792e0f6a30..8dd6125e8e1d 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_configuration.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_configuration.py @@ -19,13 +19,13 @@ class KeyVaultClientConfiguration: # pylint: disable=too-many-instance-attribut Note that all parameters used to create this instance are saved as instance attributes. - :keyword api_version: Api Version. Default value is "7.6-preview.1". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default + value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, **kwargs: Any) -> None: - api_version: str = kwargs.pop("api_version", "7.6-preview.1") + api_version: str = kwargs.pop("api_version", "7.5") self.api_version = api_version kwargs.setdefault("sdk_moniker", "keyvault/{}".format(VERSION)) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_operations/_operations.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_operations/_operations.py index 0d5a6eaad0e0..3b052a18fab6 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_operations/_operations.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/aio/_operations/_operations.py @@ -7,8 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -import sys -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -43,16 +42,11 @@ ) from .._vendor import KeyVaultClientMixinABC -if sys.version_info >= (3, 9): - from collections.abc import MutableMapping -else: - from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] class KeyVaultClientOperationsMixin(KeyVaultClientMixinABC): - @overload async def set_secret( self, @@ -76,12 +70,12 @@ async def set_secret( identifiable or sensitive information. Required. :type secret_name: str :param parameters: The parameters for setting the secret. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretSetParameters + :type parameters: ~azure.keyvault.v7_5.models.SecretSetParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -113,7 +107,7 @@ async def set_secret( Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -139,12 +133,15 @@ async def set_secret( :type secret_name: str :param parameters: The parameters for setting the secret. Is either a SecretSetParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretSetParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.SecretSetParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -213,10 +210,10 @@ async def delete_secret(self, vault_base_url: str, secret_name: str, **kwargs: A :param secret_name: The name of the secret. Required. :type secret_name: str :return: DeletedSecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedSecretBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedSecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -285,12 +282,12 @@ async def update_secret( :param secret_version: The version of the secret. Required. :type secret_version: str :param parameters: The parameters for update secret operation. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretUpdateParameters + :type parameters: ~azure.keyvault.v7_5.models.SecretUpdateParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -323,7 +320,7 @@ async def update_secret( Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -350,12 +347,15 @@ async def update_secret( :type secret_version: str :param parameters: The parameters for update secret operation. Is either a SecretUpdateParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretUpdateParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.SecretUpdateParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -430,10 +430,10 @@ async def get_secret( specified, the latest version of the secret is returned. Required. :type secret_version: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -495,8 +495,7 @@ def get_secrets( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of SecretItem - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.SecretItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.SecretItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -504,7 +503,7 @@ def get_secrets( cls: ClsType[_models._models.SecretListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -592,8 +591,7 @@ def get_secret_versions( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of SecretItem - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.SecretItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.SecretItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -601,7 +599,7 @@ def get_secret_versions( cls: ClsType[_models._models.SecretListResult] = kwargs.pop("cls", None) # pylint: disable=protected-access - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -688,8 +686,7 @@ def get_deleted_secrets( service will return up to 25 results. Default value is None. :paramtype maxresults: int :return: An iterator like instance of DeletedSecretItem - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_6_preview_1.models.DeletedSecretItem] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.keyvault.v7_5.models.DeletedSecretItem] :raises ~azure.core.exceptions.HttpResponseError: """ _headers = kwargs.pop("headers", {}) or {} @@ -699,7 +696,7 @@ def get_deleted_secrets( "cls", None ) - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -784,10 +781,10 @@ async def get_deleted_secret( :param secret_name: The name of the secret. Required. :type secret_name: str :return: DeletedSecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.DeletedSecretBundle + :rtype: ~azure.keyvault.v7_5.models.DeletedSecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -850,7 +847,7 @@ async def purge_deleted_secret( # pylint: disable=inconsistent-return-statement :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -905,10 +902,10 @@ async def recover_deleted_secret( :param secret_name: The name of the deleted secret. Required. :type secret_name: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -965,10 +962,10 @@ async def backup_secret(self, vault_base_url: str, secret_name: str, **kwargs: A :param secret_name: The name of the secret. Required. :type secret_name: str :return: BackupSecretResult - :rtype: ~azure.keyvault.v7_6_preview_1.models.BackupSecretResult + :rtype: ~azure.keyvault.v7_5.models.BackupSecretResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1030,12 +1027,12 @@ async def restore_secret( :param vault_base_url: The vault name, for example https://myvault.vault.azure.net. Required. :type vault_base_url: str :param parameters: The parameters to restore the secret. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretRestoreParameters + :type parameters: ~azure.keyvault.v7_5.models.SecretRestoreParameters :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1056,7 +1053,7 @@ async def restore_secret( Default value is "application/json". :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ @@ -1073,12 +1070,15 @@ async def restore_secret( :type vault_base_url: str :param parameters: The parameters to restore the secret. Is either a SecretRestoreParameters type or a IO[bytes] type. Required. - :type parameters: ~azure.keyvault.v7_6_preview_1.models.SecretRestoreParameters or IO[bytes] + :type parameters: ~azure.keyvault.v7_5.models.SecretRestoreParameters or IO[bytes] + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :return: SecretBundle - :rtype: ~azure.keyvault.v7_6_preview_1.models.SecretBundle + :rtype: ~azure.keyvault.v7_5.models.SecretBundle :raises ~azure.core.exceptions.HttpResponseError: """ - error_map: MutableMapping[int, Type[HttpResponseError]] = { + error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/models/_models.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/models/_models.py index 1eb5fd9c769b..fe4da13250aa 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/models/_models.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_generated/models/_models.py @@ -106,7 +106,7 @@ class SecretBundle(_serialization.Model): :ivar content_type: The content type of the secret. :vartype content_type: str :ivar attributes: The secret management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar kid: If this is a secret backing a KV certificate, then this field specifies the @@ -150,7 +150,7 @@ def __init__( :keyword content_type: The content type of the secret. :paramtype content_type: str :keyword attributes: The secret management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ @@ -177,7 +177,7 @@ class DeletedSecretBundle(SecretBundle): :ivar content_type: The content type of the secret. :vartype content_type: str :ivar attributes: The secret management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar kid: If this is a secret backing a KV certificate, then this field specifies the @@ -234,7 +234,7 @@ def __init__( :keyword content_type: The content type of the secret. :paramtype content_type: str :keyword attributes: The secret management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword recovery_id: The url of the recovery object, used to identify and recover the deleted @@ -255,7 +255,7 @@ class SecretItem(_serialization.Model): :ivar id: Secret identifier. :vartype id: str :ivar attributes: The secret management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar content_type: Type of the secret value such as a password. @@ -290,7 +290,7 @@ def __init__( :keyword id: Secret identifier. :paramtype id: str :keyword attributes: The secret management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword content_type: Type of the secret value such as a password. @@ -312,7 +312,7 @@ class DeletedSecretItem(SecretItem): :ivar id: Secret identifier. :vartype id: str :ivar attributes: The secret management attributes. - :vartype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :vartype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] :ivar content_type: Type of the secret value such as a password. @@ -360,7 +360,7 @@ def __init__( :keyword id: Secret identifier. :paramtype id: str :keyword attributes: The secret management attributes. - :paramtype attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :paramtype attributes: ~azure.keyvault.v7_5.models.SecretAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] :keyword content_type: Type of the secret value such as a password. @@ -382,7 +382,7 @@ class DeletedSecretListResult(_serialization.Model): :ivar value: A response message containing a list of the deleted secrets in the vault along with a link to the next page of deleted secrets. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.DeletedSecretItem] + :vartype value: list[~azure.keyvault.v7_5.models.DeletedSecretItem] :ivar next_link: The URL to get the next set of deleted secrets. :vartype next_link: str """ @@ -414,7 +414,7 @@ class Error(_serialization.Model): :ivar message: The error message. :vartype message: str :ivar inner_error: The key vault server error. - :vartype inner_error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype inner_error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -443,7 +443,7 @@ class KeyVaultError(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar error: The key vault server error. - :vartype error: ~azure.keyvault.v7_6_preview_1.models.Error + :vartype error: ~azure.keyvault.v7_5.models.Error """ _validation = { @@ -484,7 +484,7 @@ class SecretAttributes(Attributes): interval. Known values are: "Purgeable", "Recoverable+Purgeable", "Recoverable", "Recoverable+ProtectedSubscription", "CustomizedRecoverable+Purgeable", "CustomizedRecoverable", and "CustomizedRecoverable+ProtectedSubscription". - :vartype recovery_level: str or ~azure.keyvault.v7_6_preview_1.models.DeletionRecoveryLevel + :vartype recovery_level: str or ~azure.keyvault.v7_5.models.DeletionRecoveryLevel """ _validation = { @@ -532,7 +532,7 @@ class SecretListResult(_serialization.Model): :ivar value: A response message containing a list of secrets in the key vault along with a link to the next page of secrets. - :vartype value: list[~azure.keyvault.v7_6_preview_1.models.SecretItem] + :vartype value: list[~azure.keyvault.v7_5.models.SecretItem] :ivar next_link: The URL to get the next set of secrets. :vartype next_link: str """ @@ -612,7 +612,7 @@ class SecretSetParameters(_serialization.Model): :ivar content_type: Type of the secret value such as a password. :vartype content_type: str :ivar secret_attributes: The secret management attributes. - :vartype secret_attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :vartype secret_attributes: ~azure.keyvault.v7_5.models.SecretAttributes """ _validation = { @@ -643,7 +643,7 @@ def __init__( :keyword content_type: Type of the secret value such as a password. :paramtype content_type: str :keyword secret_attributes: The secret management attributes. - :paramtype secret_attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :paramtype secret_attributes: ~azure.keyvault.v7_5.models.SecretAttributes """ super().__init__(**kwargs) self.value = value @@ -658,7 +658,7 @@ class SecretUpdateParameters(_serialization.Model): :ivar content_type: Type of the secret value such as a password. :vartype content_type: str :ivar secret_attributes: The secret management attributes. - :vartype secret_attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :vartype secret_attributes: ~azure.keyvault.v7_5.models.SecretAttributes :ivar tags: Application specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ @@ -681,7 +681,7 @@ def __init__( :keyword content_type: Type of the secret value such as a password. :paramtype content_type: str :keyword secret_attributes: The secret management attributes. - :paramtype secret_attributes: ~azure.keyvault.v7_6_preview_1.models.SecretAttributes + :paramtype secret_attributes: ~azure.keyvault.v7_5.models.SecretAttributes :keyword tags: Application specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_challenge_auth_policy.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_challenge_auth_policy.py index e9b44fc68e55..dad851f8f58c 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_challenge_auth_policy.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_challenge_auth_policy.py @@ -15,8 +15,9 @@ """ from copy import deepcopy +import sys import time -from typing import Any, Awaitable, Callable, cast, Optional, overload, TypeVar, Union +from typing import Any, Callable, cast, Optional, overload, TypeVar, Union from urllib.parse import urlparse from typing_extensions import ParamSpec @@ -31,6 +32,11 @@ from . import http_challenge_cache as ChallengeCache from .challenge_auth_policy import _enforce_tls, _has_claims, _update_challenge +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + P = ParamSpec("P") T = TypeVar("T") diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py index 5a64cc3f529f..08fb1c9f668e 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py @@ -2,7 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from typing import Any, Awaitable +import sys +from typing import Any from azure.core.credentials_async import AsyncTokenCredential from azure.core.pipeline.policies import HttpLoggingPolicy @@ -15,6 +16,11 @@ from .._generated.aio import KeyVaultClient as _KeyVaultClient from .._generated import models as _models +if sys.version_info < (3, 9): + from typing import Awaitable +else: + from collections.abc import Awaitable + class AsyncKeyVaultClientBase(object): # pylint:disable=protected-access diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index c976c0a2f430..704cea8a0753 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -24,7 +24,6 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version - V7_6_PREVIEW_1 = "7.6-preview.1" V7_5 = "7.5" V7_4 = "7.4" V7_3 = "7.3" @@ -34,7 +33,7 @@ class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): V2016_10_01 = "2016-10-01" -DEFAULT_VERSION = ApiVersion.V7_6_PREVIEW_1 +DEFAULT_VERSION = ApiVersion.V7_5 _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_version.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_version.py index a10b2ccd6d1f..553761583a46 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_version.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_version.py @@ -3,4 +3,4 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "4.9.0b1" +VERSION = "4.9.0" diff --git a/sdk/keyvault/azure-keyvault-secrets/setup.py b/sdk/keyvault/azure-keyvault-secrets/setup.py index 54019bafe3b8..8b414e8e9d7a 100644 --- a/sdk/keyvault/azure-keyvault-secrets/setup.py +++ b/sdk/keyvault/azure-keyvault-secrets/setup.py @@ -45,7 +45,7 @@ url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets", keywords="azure, azure sdk", classifiers=[ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", diff --git a/sdk/keyvault/test-resources-cleanup.py b/sdk/keyvault/test-resources-cleanup.py index 95b51da20b98..000f5772bf40 100644 --- a/sdk/keyvault/test-resources-cleanup.py +++ b/sdk/keyvault/test-resources-cleanup.py @@ -6,7 +6,7 @@ from dotenv import load_dotenv import os -from azure.identity.aio import AzurePowerShellCredential, ClientSecretCredential +from azure.identity.aio import ClientSecretCredential from azure.keyvault.certificates.aio import CertificateClient from azure.keyvault.keys.aio import KeyClient from azure.keyvault.secrets.aio import SecretClient @@ -15,26 +15,21 @@ if "AZURE_KEYVAULT_URL" not in os.environ: raise EnvironmentError("Missing a Key Vault URL") - -use_pwsh = os.environ.get("AZURE_TEST_USE_PWSH_AUTH", "false") -if use_pwsh == "true": - credential = AzurePowerShellCredential() -else: - if "KEYVAULT_TENANT_ID" not in os.environ: - raise EnvironmentError("Missing a tenant ID for Key Vault") - if "KEYVAULT_CLIENT_ID" not in os.environ: - raise EnvironmentError("Missing a client ID for Key Vault") - if "KEYVAULT_CLIENT_SECRET" not in os.environ: - raise EnvironmentError("Missing a client secret for Key Vault") - - credential = ClientSecretCredential( - tenant_id=os.environ["KEYVAULT_TENANT_ID"], - client_id=os.environ["KEYVAULT_CLIENT_ID"], - client_secret=os.environ["KEYVAULT_CLIENT_SECRET"] - ) +if "KEYVAULT_TENANT_ID" not in os.environ: + raise EnvironmentError("Missing a tenant ID for Key Vault") +if "KEYVAULT_CLIENT_ID" not in os.environ: + raise EnvironmentError("Missing a client ID for Key Vault") +if "KEYVAULT_CLIENT_SECRET" not in os.environ: + raise EnvironmentError("Missing a client secret for Key Vault") hsm_present = "AZURE_MANAGEDHSM_URL" in os.environ +credential = ClientSecretCredential( + tenant_id=os.environ["KEYVAULT_TENANT_ID"], + client_id=os.environ["KEYVAULT_CLIENT_ID"], + client_secret=os.environ["KEYVAULT_CLIENT_SECRET"] +) + cert_client = CertificateClient(os.environ["AZURE_KEYVAULT_URL"], credential) key_client = KeyClient(os.environ["AZURE_KEYVAULT_URL"], credential) hsm_client = KeyClient(os.environ["AZURE_MANAGEDHSM_URL"], credential) if hsm_present else None