Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 3 additions & 138 deletions azure-keyvault/azure/keyvault/key_vault_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -3934,141 +3934,6 @@ def merge_certificate(
return deserialized
merge_certificate.metadata = {'url': '/certificates/{certificate-name}/pending/merge'}

def backup_certificate(
self, vault_base_url, certificate_name, custom_headers=None, raw=False, **operation_config):
"""Backs up the specified certificate.

Requests that a backup of the specified certificate be downloaded to
the client. All versions of the certificate will be downloaded. This
operation requires the certificates/backup permission.

:param vault_base_url: The vault name, for example
https://myvault.vault.azure.net.
:type vault_base_url: str
:param certificate_name: The name of the certificate.
:type certificate_name: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:return: BackupCertificateResult or ClientRawResponse if raw=true
:rtype: ~azure.keyvault.models.BackupCertificateResult or
~msrest.pipeline.ClientRawResponse
:raises:
:class:`KeyVaultErrorException<azure.keyvault.models.KeyVaultErrorException>`
"""
# Construct URL
url = self.backup_certificate.metadata['url']
path_format_arguments = {
'vaultBaseUrl': self._serialize.url("vault_base_url", vault_base_url, 'str', skip_quote=True),
'certificate-name': self._serialize.url("certificate_name", certificate_name, 'str')
}
url = self._client.format_url(url, **path_format_arguments)

# Construct parameters
query_parameters = {}
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')

# Construct headers
header_parameters = {}
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
if self.config.generate_client_request_id:
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
if custom_headers:
header_parameters.update(custom_headers)
if self.config.accept_language is not None:
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')

# Construct and send request
request = self._client.post(url, query_parameters)
response = self._client.send(request, header_parameters, stream=False, **operation_config)

if response.status_code not in [200]:
raise models.KeyVaultErrorException(self._deserialize, response)

deserialized = None

if response.status_code == 200:
deserialized = self._deserialize('BackupCertificateResult', response)

if raw:
client_raw_response = ClientRawResponse(deserialized, response)
return client_raw_response

return deserialized
backup_certificate.metadata = {'url': '/certificates/{certificate-name}/backup'}

def restore_certificate(
self, vault_base_url, certificate_bundle_backup, custom_headers=None, raw=False, **operation_config):
"""Restores a backed up certificate to a vault.

Restores a backed up certificate, and all its versions, to a vault.
This operation requires the certificates/restore permission.

:param vault_base_url: The vault name, for example
https://myvault.vault.azure.net.
:type vault_base_url: str
:param certificate_bundle_backup: The backup blob associated with a
certificate bundle.
:type certificate_bundle_backup: bytes
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:return: CertificateBundle or ClientRawResponse if raw=true
:rtype: ~azure.keyvault.models.CertificateBundle or
~msrest.pipeline.ClientRawResponse
:raises:
:class:`KeyVaultErrorException<azure.keyvault.models.KeyVaultErrorException>`
"""
parameters = models.CertificateRestoreParameters(certificate_bundle_backup=certificate_bundle_backup)

# Construct URL
url = self.restore_certificate.metadata['url']
path_format_arguments = {
'vaultBaseUrl': self._serialize.url("vault_base_url", vault_base_url, 'str', skip_quote=True)
}
url = self._client.format_url(url, **path_format_arguments)

# Construct parameters
query_parameters = {}
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')

# Construct headers
header_parameters = {}
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
if self.config.generate_client_request_id:
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
if custom_headers:
header_parameters.update(custom_headers)
if self.config.accept_language is not None:
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')

# Construct body
body_content = self._serialize.body(parameters, 'CertificateRestoreParameters')

# Construct and send request
request = self._client.post(url, query_parameters)
response = self._client.send(
request, header_parameters, body_content, stream=False, **operation_config)

if response.status_code not in [200]:
raise models.KeyVaultErrorException(self._deserialize, response)

deserialized = None

if response.status_code == 200:
deserialized = self._deserialize('CertificateBundle', response)

if raw:
client_raw_response = ClientRawResponse(deserialized, response)
return client_raw_response

return deserialized
restore_certificate.metadata = {'url': '/certificates/restore'}

def get_deleted_certificates(
self, vault_base_url, maxresults=None, include_pending=None, custom_headers=None, raw=False, **operation_config):
"""Lists the deleted certificates in the specified vault currently
Expand Down Expand Up @@ -4559,7 +4424,7 @@ def get_deleted_storage_account(
return deserialized
get_deleted_storage_account.metadata = {'url': '/deletedstorage/{storage-account-name}'}

def purge_deleted_storage_account(
def purge_deleted_storge_account(
self, vault_base_url, storage_account_name, custom_headers=None, raw=False, **operation_config):
"""Permanently deletes the specified storage account.

Expand All @@ -4584,7 +4449,7 @@ def purge_deleted_storage_account(
:class:`KeyVaultErrorException<azure.keyvault.models.KeyVaultErrorException>`
"""
# Construct URL
url = self.purge_deleted_storage_account.metadata['url']
url = self.purge_deleted_storge_account.metadata['url']
path_format_arguments = {
'vaultBaseUrl': self._serialize.url("vault_base_url", vault_base_url, 'str', skip_quote=True),
'storage-account-name': self._serialize.url("storage_account_name", storage_account_name, 'str', pattern=r'^[0-9a-zA-Z]+$')
Expand Down Expand Up @@ -4615,7 +4480,7 @@ def purge_deleted_storage_account(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
purge_deleted_storage_account.metadata = {'url': '/deletedstorage/{storage-account-name}'}
purge_deleted_storge_account.metadata = {'url': '/deletedstorage/{storage-account-name}'}

def recover_deleted_storage_account(
self, vault_base_url, storage_account_name, custom_headers=None, raw=False, **operation_config):
Expand Down
6 changes: 0 additions & 6 deletions azure-keyvault/azure/keyvault/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@
from .sas_definition_create_parameters_py3 import SasDefinitionCreateParameters
from .sas_definition_update_parameters_py3 import SasDefinitionUpdateParameters
from .key_vault_error_py3 import KeyVaultError, KeyVaultErrorException
from .certificate_restore_parameters_py3 import CertificateRestoreParameters
from .backup_certificate_result_py3 import BackupCertificateResult
except (SyntaxError, ImportError):
from .attributes import Attributes
from .json_web_key import JsonWebKey
Expand Down Expand Up @@ -165,8 +163,6 @@
from .sas_definition_create_parameters import SasDefinitionCreateParameters
from .sas_definition_update_parameters import SasDefinitionUpdateParameters
from .key_vault_error import KeyVaultError, KeyVaultErrorException
from .certificate_restore_parameters import CertificateRestoreParameters
from .backup_certificate_result import BackupCertificateResult
from .key_item_paged import KeyItemPaged
from .deleted_key_item_paged import DeletedKeyItemPaged
from .secret_item_paged import SecretItemPaged
Expand Down Expand Up @@ -267,8 +263,6 @@
'SasDefinitionCreateParameters',
'SasDefinitionUpdateParameters',
'KeyVaultError', 'KeyVaultErrorException',
'CertificateRestoreParameters',
'BackupCertificateResult',
'KeyItemPaged',
'DeletedKeyItemPaged',
'SecretItemPaged',
Expand Down
35 changes: 0 additions & 35 deletions azure-keyvault/azure/keyvault/models/backup_certificate_result.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading