Skip to content
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

[Keyvault] Fix #20520 az keyvault network-rule: Support removing multiple IP #22025

Merged
merged 2 commits into from
Apr 14, 2022
Merged

[Keyvault] Fix #20520 az keyvault network-rule: Support removing multiple IP #22025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f42ee5
[Keyvault] Fix #20520 `az keyvault network-rule`: Support removing mu…
bebound Apr 8, 2022
2f5368d
Minor fix
bebound Apr 13, 2022
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: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/keyvault/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,10 @@ class CLISecurityDomainOperation(str, Enum):
c.argument('subnet', help='Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.')
c.argument('vnet_name', help='Name of a virtual network.', validator=validate_subnet)

with self.argument_context('keyvault network-rule add', min_api='2018-02-14') as c:
c.argument('ip_address', nargs='*', help='IPv4 address or CIDR range. Can supply a list: --ip-address ip1 [ip2]...', validator=validate_ip_address)
for item in ['add', 'remove']:
with self.argument_context('keyvault network-rule {}'.format(item), min_api='2018-02-14') as c:
c.argument('ip_address', nargs='*', help='IPv4 address or CIDR range. Can supply a list: --ip-address ip1 '
'[ip2]...', validator=validate_ip_address)

for item in ['approve', 'reject', 'delete', 'show', 'wait']:
with self.argument_context('keyvault private-endpoint-connection {}'.format(item), min_api='2018-02-14') as c:
Expand Down
3 changes: 2 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 @@ -1068,7 +1068,8 @@ def remove_network_rule(cmd, client, resource_group_name, vault_name, ip_address
rules.virtual_network_rules = new_rules

if ip_address and rules.ip_rules:
new_rules = [x for x in rules.ip_rules if ip_network(x.value) != ip_network(ip_address)]
to_remove = [ip_network(x) for x in ip_address]
new_rules = list(filter(lambda x: all(ip_network(x.value) != i for i in to_remove), rules.ip_rules))
to_modify |= len(new_rules) != len(rules.ip_rules)
if to_modify:
rules.ip_rules = new_rules
Expand Down
Loading