Skip to content

Fix az acr network-rule list missing virtualNetworkSubnetResourceId #33663

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

Draft
Copilot wants to merge 3 commits into
base: dev
Choose a base branch
from
+12 −3
Draft

Fix az acr network-rule list missing virtualNetworkSubnetResourceId #33663

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
10043cf
Initial plan
Copilot Jun 27, 2026
0175719
Fix az acr network-rule list missing virtualNetworkSubnetResourceId
Copilot Jun 27, 2026
888d9c4
[ACR] Fix #33660: `az acr network-rule list`: Add HISTORY.rst entry
Copilot Jun 27, 2026
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
1 change: 1 addition & 0 deletions src/azure-cli/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Release History
* `az acr update`: Add `--endpoint-protocol` parameter to support specifying the endpoint protocol for the registry (#33089)
* `az acr login`: Fix regional endpoint matching for registries with DNL suffix (#33381)
* `az acr config content-trust/show/update`: Add deprecation labels and notices (#33174)
* `az acr network-rule list`: Fix `virtualNetworkRules` entries always showing `virtualNetworkResourceId` as null; add `virtualNetworkSubnetResourceId` field to output (#33660)

**AKS**

Expand Down
11 changes: 8 additions & 3 deletions src/azure-cli/azure/cli/command_modules/acr/network_rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ def _format_registry_response(response):
network_rule_set = properties.get('networkRuleSet', {})

virtual_network_rules = [
{'virtualNetworkResourceId': rule.get('id'), 'action': rule.get('action', 'Allow')}
{
'virtualNetworkResourceId': rule.get('virtualNetworkSubnetResourceId') or rule.get('id'),
'virtualNetworkSubnetResourceId': rule.get('virtualNetworkSubnetResourceId') or rule.get('id'),
'action': rule.get('action', 'Allow')
}
for rule in (network_rule_set.get('virtualNetworkRules') or [])
]
ip_rules = [
Expand Down Expand Up @@ -93,7 +97,7 @@ def acr_network_rule_add(cmd,
if subnet or vnet_name:
virtual_network_rules = list(rules.get('virtualNetworkRules') or [])
subnet_id = _validate_subnet(cmd.cli_ctx, subnet, vnet_name, resource_group_name)
virtual_network_rules.append({'id': subnet_id, 'action': 'Allow'})
virtual_network_rules.append({'virtualNetworkSubnetResourceId': subnet_id, 'action': 'Allow'})
rules['virtualNetworkRules'] = virtual_network_rules

if ip_address:
Expand Down Expand Up @@ -122,7 +126,8 @@ def acr_network_rule_remove(cmd,
virtual_network_rules = list(rules.get('virtualNetworkRules') or [])
subnet_id = _validate_subnet(cmd.cli_ctx, subnet, vnet_name, resource_group_name).lower()
rules['virtualNetworkRules'] = [
x for x in virtual_network_rules if x.get('id', '').lower() != subnet_id
x for x in virtual_network_rules
if (x.get('virtualNetworkSubnetResourceId') or x.get('id') or '').lower() != subnet_id
]

if ip_address:
Expand Down
3 changes: 3 additions & 0 deletions src/azure-cli/azure/cli/command_modules/acr/tests/latest/test_acr_network_rule_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def test_acr_network_rule(self, resource_group, resource_group_location):
self.check('provisioningState', 'Succeeded'),
self.check('networkRuleSet.defaultAction', '{deny_action}'),
self.check('networkRuleSet.virtualNetworkRules[0].virtualNetworkResourceId', subnet_id),
self.check('networkRuleSet.virtualNetworkRules[0].virtualNetworkSubnetResourceId', subnet_id),
self.check('networkRuleSet.virtualNetworkRules[0].action', '{allow_action}'),
self.check('networkRuleSet.ipRules', [])])

Expand All @@ -60,12 +61,14 @@ def test_acr_network_rule(self, resource_group, resource_group_location):
self.check('provisioningState', 'Succeeded'),
self.check('networkRuleSet.defaultAction', '{deny_action}'),
self.check('networkRuleSet.virtualNetworkRules[0].virtualNetworkResourceId', subnet_id),
self.check('networkRuleSet.virtualNetworkRules[0].virtualNetworkSubnetResourceId', subnet_id),
self.check('networkRuleSet.virtualNetworkRules[0].action', '{allow_action}'),
self.check('networkRuleSet.ipRules[0].ipAddressOrRange', '{ip_address}'),
self.check('networkRuleSet.ipRules[0].action', '{allow_action}')])

self.cmd('acr network-rule list -g {rg} -n {registry_name}',
checks=[self.check('virtualNetworkRules[0].virtualNetworkResourceId', subnet_id),
self.check('virtualNetworkRules[0].virtualNetworkSubnetResourceId', subnet_id),
self.check('virtualNetworkRules[0].action', '{allow_action}'),
self.check('ipRules[0].ipAddressOrRange', '{ip_address}'),
self.check('ipRules[0].action', '{allow_action}')])
Expand Down
Loading