Skip to content

[ACR] az acr update: Update networkRuleSet.defaultAction to deny when --public-network-enabled is disabled #23251

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
zhoxing-ms merged 3 commits into from
Jul 21, 2022
Merged

[ACR] az acr update: Update networkRuleSet.defaultAction to deny when --public-network-enabled is disabled #23251

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
f9e83c6
Changes to update networkRuleSet.defaultAction to deny when public ac…
ankit-acr Jul 18, 2022
39c23f5
Adding unit test for the code changes
ankit-acr Jul 19, 2022
a644c1e
Adding recording yaml file of test_acr_with_public_network_access_dis…
ankit-acr Jul 20, 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
14 changes: 10 additions & 4 deletions src/azure-cli/azure/cli/command_modules/acr/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
logger = get_logger(__name__)
DEF_DIAG_SETTINGS_NAME_TEMPLATE = '{}-diagnostic-settings'
SYSTEM_ASSIGNED_IDENTITY_ALIAS = '[system]'
DENY_ACTION = 'Deny'


def acr_check_name(client, registry_name):
Expand Down Expand Up @@ -132,10 +133,6 @@ def acr_update_custom(cmd,
if tags is not None:
instance.tags = tags

if default_action is not None:
NetworkRuleSet = cmd.get_models('NetworkRuleSet')
instance.network_rule_set = NetworkRuleSet(default_action=default_action)

if data_endpoint_enabled is not None:
instance.data_endpoint_enabled = data_endpoint_enabled

Expand All @@ -145,6 +142,9 @@ def acr_update_custom(cmd,
if anonymous_pull_enabled is not None:
instance.anonymous_pull_enabled = anonymous_pull_enabled

if default_action is not None:
_configure_default_action(cmd, instance, default_action)

_handle_network_bypass(cmd, instance, allow_trusted_services)
_handle_export_policy(cmd, instance, allow_exports)

Expand All @@ -158,9 +158,15 @@ def _configure_public_network_access(cmd, registry, enabled):
registry.public_network_access = PublicNetworkAccess.enabled
else:
registry.public_network_access = PublicNetworkAccess.disabled
_configure_default_action(cmd, registry, DENY_ACTION)
logger.warning('Disabling the public endpoint overrides all firewall configurations.')


def _configure_default_action(cmd, registry, action):
NetworkRuleSet = cmd.get_models('NetworkRuleSet')
registry.network_rule_set = NetworkRuleSet(default_action=action)


def _handle_network_bypass(cmd, registry, allow_trusted_services):
if allow_trusted_services is not None:
NetworkRuleBypassOptions = cmd.get_models('NetworkRuleBypassOptions')
Expand Down
Loading