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 all commits
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
12 changes: 4 additions & 8 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 @@ -16,7 +16,7 @@

from azure.cli.core.commands.client_factory import get_mgmt_service_client
from azure.cli.core.commands.validators import validate_tags
from azure.cli.core.azclierror import InvalidArgumentValueError, RequiredArgumentMissingError
from azure.cli.core.azclierror import RequiredArgumentMissingError


secret_text_encoding_values = ['utf-8', 'utf-16le', 'utf-16be', 'ascii']
Expand Down Expand Up @@ -289,9 +289,6 @@ 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 not vault_name and not hsm_name:
raise CLIError('Please specify --vault-name or --hsm-name.')

Expand All @@ -312,19 +309,18 @@ def validate_deleted_vault_or_hsm_name(cmd, ns):
if vault_name:
id_comps = parse_resource_id(resource.properties.vault_id)
else:
id_comps = parse_resource_id(resource.id)
id_comps = parse_resource_id(resource.properties.mhsm_id)

# otherwise, iterate through deleted vaults to find one with a matching name
else:
for v in client.list_deleted():
if vault_name:
id_comps = parse_resource_id(v.properties.vault_id)
else:
id_comps = parse_resource_id(v.id)
id_comps = parse_resource_id(v.properties.mhsm_id)
if id_comps['name'].lower() == resource_name.lower():
resource = v
ns.location = resource.properties.location if vault_name \
else resource.additional_properties.get('location')
ns.location = resource.properties.location
break

# if the vault was not found, throw an error
Expand Down
5 changes: 3 additions & 2 deletions 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 @@ -405,16 +405,17 @@ def recover_hsm(cmd, client, hsm_name, resource_group_name, location, no_wait=Fa

ManagedHsm = cmd.get_models('ManagedHsm', resource_type=ResourceType.MGMT_KEYVAULT)
ManagedHsmSku = cmd.get_models('ManagedHsmSku', resource_type=ResourceType.MGMT_KEYVAULT)
CreateMode = cmd.get_models('CreateMode', resource_type=ResourceType.MGMT_KEYVAULT)

# tenantId and sku shouldn't be required
profile = Profile(cli_ctx=cmd.cli_ctx)
_, _, tenant_id = profile.get_login_credentials(
resource=cmd.cli_ctx.cloud.endpoints.active_directory_graph_resource_id)

# Use 'Recover' as 'create_mode' temporarily since it's a bug from service side making 'create_mode' case-sensitive
# Will change it back to CreateMode.recover.value('recover') from SDK definition after service fix
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': 'Recover'})

return sdk_no_wait(
no_wait, client.begin_create_or_update,
Expand Down
Loading