Skip to content

{ACR} Hotfix: az acr connected-registry create: Remove ancestors active validation #17749

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
fengzhou-msft merged 1 commit into from
Apr 19, 2021
Merged

{ACR} Hotfix: az acr connected-registry create: Remove ancestors active validation #17749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions src/azure-cli/azure/cli/command_modules/acr/connected_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ def acr_connected_registry_create(cmd, # pylint: disable=too-many-locals, too-m
"when the connected registry parent '{}' mode is '{}'. ".format(parent_name, parent.mode) +
"For more information on connected registries " +
"please visit https://aka.ms/acr/connected-registry.")
msg = "Can't create the registry '{}'. The ancestor connected ".format(connected_registry_name) +\
"registry activation status is not '{}'. ".format(ConnectedRegistryActivationStatus.ACTIVE.value) +\
"Please install the parent connected registry and try again. For more information on connected " +\
"registries, please visit https://aka.ms/acr/connected-registry."
_check_ancestors_are_active(family_tree, parent.id, msg)
_update_ancestor_permissions(cmd, family_tree, resource_group_name, registry_name, parent.id,
connected_registry_name, repositories, mode, False)

Expand Down Expand Up @@ -471,14 +466,6 @@ def _get_install_info(cmd,
# endregion


def _check_ancestors_are_active(family_tree, parent_id, msg):
while parent_id and not parent_id.isspace():
ancestor = family_tree[parent_id]["connectedRegistry"]
if ancestor.activation.status != ConnectedRegistryActivationStatus.ACTIVE.value:
raise CLIError(msg)
parent_id = ancestor.parent.id


def _update_ancestor_permissions(cmd,
family_tree,
resource_group_name,
Expand Down