Skip to content

{KeyVault} Fix a filter bug while deleting role assignments #15501

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
Bin Ma (bim-msft) merged 3 commits into from
Oct 22, 2020
Merged

{KeyVault} Fix a filter bug while deleting role assignments #15501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33f9e5
Bugfix
bim-msft Oct 13, 2020
400f326
Revert import
bim-msft Oct 13, 2020
8950f93
Fix error
bim-msft Oct 13, 2020
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
15 changes: 11 additions & 4 deletions src/azure-cli/azure/cli/command_modules/keyvault/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from enum import Enum
from knack.util import CLIError

from azure.cli.core.azclierror import RequiredArgumentMissingError
from azure.cli.core.commands import CliCommandType
from azure.cli.core.profiles import get_api_version, ResourceType
from azure.cli.core._profile import Profile
Expand Down Expand Up @@ -200,9 +201,12 @@ def data_plane_azure_keyvault_administration_backup_client(cli_ctx, command_args
version = str(get_api_version(cli_ctx, ResourceType.DATA_KEYVAULT_ADMINISTRATION_BACKUP))
profile = Profile(cli_ctx=cli_ctx)
credential, _, _ = profile.get_login_credentials(resource='https://managedhsm.azure.net')
vault_url = command_args['hsm_name']
vault_url = \
command_args.get('hsm_name', None) or \
command_args.get('vault_base_url', None) or \
command_args.get('identifier', None)
if not vault_url:
vault_url = command_args['vault_base_url']
raise RequiredArgumentMissingError('Please specify --hsm-name or --id')
return KeyVaultBackupClient(
vault_url=vault_url, credential=credential, api_version=version)

Expand All @@ -213,8 +217,11 @@ def data_plane_azure_keyvault_administration_access_control_client(cli_ctx, comm
version = str(get_api_version(cli_ctx, ResourceType.DATA_KEYVAULT_ADMINISTRATION_ACCESS_CONTROL))
profile = Profile(cli_ctx=cli_ctx)
credential, _, _ = profile.get_login_credentials(resource='https://managedhsm.azure.net')
vault_url = command_args['hsm_name']
vault_url = \
command_args.get('hsm_name', None) or \
command_args.get('vault_base_url', None) or \
command_args.get('identifier', None)
if not vault_url:
vault_url = command_args['vault_base_url']
raise RequiredArgumentMissingError('Please specify --hsm-name or --id')
return KeyVaultAccessControlClient(
vault_url=vault_url, credential=credential, api_version=version)
8 changes: 8 additions & 0 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,6 +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 RequiredArgumentMissingError


secret_text_encoding_values = ['utf-8', 'utf-16le', 'utf-16be', 'ascii']
Expand Down Expand Up @@ -437,6 +438,13 @@ def validate_subnet(cmd, namespace):
raise CLIError('incorrect usage: [--subnet ID | --subnet NAME --vnet-name NAME]')


def validate_role_assignment_args(ns):
if not any([ns.role_assignment_name, ns.scope, ns.assignee, ns.assignee_object_id, ns.role, ns.ids]):
raise RequiredArgumentMissingError(
'Please specify at least one of these parameters: '
'--name, --scope, --assignee, --assignee-object-id, --role, --ids')


def validate_vault_or_hsm(ns):
identifier = getattr(ns, 'identifier', None)
vault_base_url = getattr(ns, 'vault_base_url', None)
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/keyvault/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from azure.cli.command_modules.keyvault._validators import (
process_secret_set_namespace, process_certificate_cancel_namespace,
validate_private_endpoint_connection_id)
validate_private_endpoint_connection_id, validate_role_assignment_args)


def transform_assignment_list(result):
Expand Down Expand Up @@ -273,7 +273,7 @@ def load_command_table(self, _):
pass

with self.command_group('keyvault role assignment', data_access_control_entity.command_type) as g:
g.keyvault_custom('delete', 'delete_role_assignment')
g.keyvault_custom('delete', 'delete_role_assignment', validator=validate_role_assignment_args)
g.keyvault_custom('list', 'list_role_assignments', table_transformer=transform_assignment_list)
g.keyvault_custom('create', 'create_role_assignment')

Expand Down