Skip to content

[Keyvault] az keyvault backup start: Add status in output #27902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evelyn-ys merged 1 commit into from
Nov 22, 2023
Merged

[Keyvault] az keyvault backup start: Add status in output #27902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/azure-cli/azure/cli/command_modules/keyvault/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,7 +2172,11 @@ def full_backup(cmd, client, storage_resource_uri=None, storage_account_name=Non
if not storage_resource_uri:
storage_resource_uri = construct_storage_uri(
cmd.cli_ctx.cloud.suffixes.storage_endpoint, storage_account_name, blob_container_name)
return client.begin_backup(storage_resource_uri, sas_token=token, use_managed_identity=use_managed_identity)
poller = client.begin_backup(storage_resource_uri, sas_token=token, use_managed_identity=use_managed_identity)
from knack.util import todict
result = todict(poller.result())
result['status'] = poller.status()
return result


def full_restore(cmd, client, folder_to_restore,
Expand Down
842 changes: 842 additions & 0 deletions ...mmand_modules/keyvault/tests/latest/recordings/test_keyvault_hsm_full_backup_restore.yaml
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 9 additions & 15 deletions src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ def test_keyvault_hsm_selective_key_restore(self):
'--storage-account-name {storage_account} '
'--storage-container-SAS-token "{sas}"',
checks=[
# self.check('status', 'Succeeded'),
self.check('status', 'Succeeded'),
# self.exists('startTime'),
# self.exists('jobId'),
self.exists('folderUrl')
Expand All @@ -664,20 +664,19 @@ def test_keyvault_hsm_selective_key_restore(self):


class KeyVaultHSMFullBackupRestoreScenarioTest(ScenarioTest):
# @record_only()
@unittest.skip('cannot run')
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_hsm_full_backup')
@ManagedHSMPreparer(name_prefix='cli-test-hsm-bcup-', certs_path=CERTS_DIR, roles=['Managed HSM Crypto Officer', 'Managed HSM Crypto User'])
@StorageAccountPreparer(name_prefix='clitesthsmsa')
@AllowLargeResponse()
def test_keyvault_hsm_full_backup_restore(self):
def test_keyvault_hsm_full_backup_restore(self, resource_group, managed_hsm, storage_account):
self.kwargs.update({
'hsm_url': ACTIVE_HSM_URL,
'hsm_name': ACTIVE_HSM_NAME,
'storage_account': self.create_random_name('clitesthsmsa', 24),
'hsm_url': f'https://{managed_hsm}.managedhsm.azure.net',
'hsm_name': managed_hsm,
'storage_account': storage_account,
'blob': self.create_random_name('clitesthsmblob', 24),
'sas_start': (datetime.utcnow() - timedelta(minutes=30)).strftime('%Y-%m-%dT%H:%M:%SZ'),
'sas_expiry': (datetime.utcnow() + timedelta(minutes=30)).strftime('%Y-%m-%dT%H:%M:%SZ')
})
self.cmd('az storage account create -n {storage_account} -g {rg}')
self.cmd('az storage container create -n {blob} --account-name {storage_account} -g {rg}')

self.kwargs['sas'] = '?' + self.cmd('az storage account generate-sas --start {sas_start} --expiry {sas_expiry} '
Expand All @@ -689,7 +688,7 @@ def test_keyvault_hsm_full_backup_restore(self):
'--storage-account-name {storage_account} '
'--storage-container-SAS-token "{sas}"',
checks=[
# self.check('status', 'Succeeded'),
self.check('status', 'Succeeded'),
# self.exists('startTime'),
# self.exists('jobId'),
self.exists('folderUrl')
Expand All @@ -699,7 +698,7 @@ def test_keyvault_hsm_full_backup_restore(self):
'--storage-account-name {storage_account} '
'--storage-container-SAS-token "{sas}"',
checks=[
# self.check('status', 'Succeeded'),
self.check('status', 'Succeeded'),
# self.exists('startTime'),
# self.exists('jobId'),
self.exists('folderUrl')
Expand All @@ -710,11 +709,6 @@ def test_keyvault_hsm_full_backup_restore(self):
'--storage-account-name {storage_account} '
'--storage-container-SAS-token "{sas}" '
'--backup-folder "{backup_folder}"')
# checks=[
# self.check('status', 'Succeeded'),
# self.exists('startTime'),
# self.exists('jobId')
# ])


class KeyVaultHSMSettingScenarioTest(ScenarioTest):
Expand Down