Skip to content

[KeyVault] az keyvault recover: Support MHSM #18150

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 5 commits into from
May 28, 2021
Merged

[KeyVault] az keyvault recover: Support MHSM #18150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a558ca
recover for MHSM
evelyn-ys May 12, 2021
823133f
fix
evelyn-ys May 20, 2021
44dcd3f
tests
evelyn-ys May 26, 2021
b590c5e
Merge remote-tracking branch 'upstream/dev' into keyvault_recover_hsm
evelyn-ys May 26, 2021
ab8a201
linter
evelyn-ys May 26, 2021
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
Next Next commit
recover for MHSM
  • Loading branch information
@evelyn-ys
evelyn-ys committed May 12, 2021
commit 8a558ca21de66f8eec6dcd5ca0568ef769d7750d
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/keyvault/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ def validate_deleted_vault_or_hsm_name(cmd, ns):
vault_name = getattr(ns, 'vault_name', None)
hsm_name = getattr(ns, 'hsm_name', None)

if hsm_name and 'keyvault recover' in cmd.name:
raise InvalidArgumentValueError('Operation "recover" has not been supported for HSM.')
# if hsm_name and 'keyvault recover' in cmd.name:
# raise InvalidArgumentValueError('Operation "recover" has not been supported for HSM.')

if not vault_name and not hsm_name:
raise CLIError('Please specify --vault-name or --hsm-name.')
Expand Down
4 changes: 3 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 @@ -401,6 +401,7 @@ def recover_vault_or_hsm(cmd, client, resource_group_name=None, location=None, v


def recover_hsm(cmd, client, hsm_name, resource_group_name, location, no_wait=False):
deleted = client.get_deleted(name=hsm_name, location=location)
from azure.cli.core._profile import Profile

ManagedHsm = cmd.get_models('ManagedHsm', resource_type=ResourceType.MGMT_KEYVAULT)
Expand All @@ -414,7 +415,8 @@ def recover_hsm(cmd, client, hsm_name, resource_group_name, location, no_wait=Fa

parameters = ManagedHsm(location=location,
sku=ManagedHsmSku(name='Standard_B1', family='B'),
properties={'tenant_id': tenant_id, 'create_mode': CreateMode.recover.value})
properties={'tenant_id': tenant_id, 'create_mode': CreateMode.recover.value,
'initial_admin_object_ids': deleted.properties.additional_properties.get('initialAdminObjectIds')})

return sdk_no_wait(
no_wait, client.begin_create_or_update,
Expand Down