Conversation
IannGeorges
requested review from
jsntcy,
yanzhudd and
zhoxing-ms
as code owners
️✔️AzureCLI-FullTest
|
️✔️AzureCLI-BreakingChangeTest
|
Collaborator
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
|
The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR. Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
microsoft-github-policy-service
bot
requested review from
wangzelin007 and
yonzhan
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug in the Azure File Share (AFS) restore command where the restore operation would fail if the source storage account had been deleted. The fix implements a fallback mechanism to retrieve the source resource ID from the protected item's properties when the storage account is unavailable.
- Adds exception handling around the storage account ID retrieval
- Implements a fallback to use the source resource ID from the protected item
- Adds a new helper function to extract source resource ID from protected items
| if not afs_restore_request.source_resource_id: | ||
| raise CLIError("Source resource ID is null or empty after retrieval from storage account.") | ||
| except Exception as e: | ||
| logger.warning("Failed to get storage account ID: %s. Falling back to source resource ID from protected item.", str(e)) |
There was a problem hiding this comment.
The logger variable is not imported or defined in this context. You need to add 'from azure.cli.core import logger' at the top of the file or use an alternative logging approach.
IannGeorges
changed the title
zubairabid
reviewed
Jul 30, 2025
zubairabid
approved these changes
Jul 30, 2025
Contributor
zubairabid
left a comment
zubairabid
left a comment
There was a problem hiding this comment.
Approved, requesting general clarification on code behaviour.
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
yanzhudd
changed the title
az backup restore restore-azurefileshare: Fix a bug where the source storage account is deleted and the required sourceResourceId property is missing from the restore request payload
yanzhudd
approved these changes
Aug 26, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Related command
az backup restore restore-azurefileshare
Description
Implementing fix to handle cases where the source storage account is deleted & required sourceResourceId property is missing for restore request payload.
Testing Guide
Tested restore where AFS source storage account was deleted before changes were made to reproduce bug.
Tested restore where AFS source storage account was deleted after changes were made to validate fix.
History Notes
[Component Name 1] BREAKING CHANGE:
az command a: Make some customer-facing breaking change[Component Name 2]
az command b: Add some customer-facing featureThis checklist is used to make sure that common guidelines for a pull request are followed.
The PR title and description has followed the guideline in Submitting Pull Requests.
I adhere to the Command Guidelines.
I adhere to the Error Handling Guidelines.