[ACR] Fix some bugs on uncovered cmds #18786
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,7 +76,7 @@ def acr_connected_registry_create(cmd, # pylint: disable=too-many-locals, too-m | |
| "Enabling the data endpoint might affect your firewall rules.\nTo enable data endpoint run:" + | ||
| "\n\taz acr update -n {} --data-endpoint-enabled true".format(registry_name)) | ||
|
|
||
| from azure.core.exceptions import HttpResponseError as ErrorResponseException | ||
| parent = None | ||
| mode = mode.capitalize() | ||
| if parent_name: | ||
|
|
@@ -129,11 +129,11 @@ def acr_connected_registry_create(cmd, # pylint: disable=too-many-locals, too-m | |
| ) | ||
|
|
||
| try: | ||
| return client.begin_create(subscription_id=subscription_id, | ||
|
Member
There was a problem hiding this comment. why do you need to change the code from xyz to begin_xyz? What is the difference between the two?
Member
There was a problem hiding this comment. https://github.com/Azure/azure-cli/blob/dev/doc/track_2_migration_guidance.md#long-running-operation-function-name-change, no behavior change, only method name change in SDK. |
||
| resource_group_name=resource_group_name, | ||
| registry_name=registry_name, | ||
| connected_registry_name=connected_registry_name, | ||
| connected_registry_create_parameters=connected_registry_create_parameters) | ||
| except ValidationError as e: | ||
| raise CLIError(e) | ||
|
|
||
|
|
@@ -202,10 +202,10 @@ def acr_connected_registry_update(cmd, # pylint: disable=too-many-locals, too-m | |
| ) | ||
|
|
||
| try: | ||
| return client.begin_update(resource_group_name=resource_group_name, | ||
| registry_name=registry_name, | ||
| connected_registry_name=connected_registry_name, | ||
| connected_registry_update_parameters=connected_registry_update_parameters) | ||
| except ValidationError as e: | ||
| raise CLIError(e) | ||
|
|
||
|
|
@@ -224,7 +224,7 @@ def acr_connected_registry_delete(cmd, | |
| try: | ||
| connected_registry = acr_connected_registry_show( | ||
| cmd, client, connected_registry_name, registry_name, resource_group_name) | ||
| result = client.begin_delete(resource_group_name, registry_name, connected_registry_name) | ||
| sync_token = get_token_from_id(cmd, connected_registry.parent.sync_properties.token_id) | ||
| sync_token_name = sync_token.name | ||
| sync_scope_map_name = sync_token.scope_map_id.split('/scopeMaps/')[1] | ||
|
|
@@ -268,10 +268,10 @@ def acr_connected_registry_deactivate(cmd, | |
|
|
||
| user_confirmation("Are you sure you want to deactivate the connected registry '{}' in '{}'?".format( | ||
| connected_registry_name, registry_name), yes) | ||
| return client.begin_deactivate(subscription_id=subscription_id, | ||
| resource_group_name=resource_group_name, | ||
| registry_name=registry_name, | ||
| connected_registry_name=connected_registry_name) | ||
|
|
||
|
|
||
| def acr_connected_registry_list(cmd, | ||
|
|
@@ -355,7 +355,7 @@ def _create_sync_token(cmd, | |
| sync_token_name = SYNC_TOKEN_NAME.format(connected_registry_name) | ||
| logger.warning("If sync token '%s' already exists, it properties will be overwritten", sync_token_name) | ||
| Token = cmd.get_models('Token') | ||
| poller = token_client.begin_create( | ||
| resource_group_name, | ||
| registry_name, | ||
| sync_token_name, | ||
|
|
@@ -520,7 +520,7 @@ def _update_repo_permissions(cmd, | |
| return None | ||
| current_actions = list(final_actions_set) | ||
| logger.warning(msg) | ||
| return scope_map_client.begin_update( | ||
| resource_group_name, | ||
| registry_name, | ||
| sync_scope_map_name, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the type same as before?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Basically, yes. Track2 SDK has removed all these Exceptions in models.