[Backup] Add Azure File Share cross-region restore and soft-delete undelete support - #33809
Open
Bharat Purwar (bharatpurwar) wants to merge 4 commits into
Open
[Backup] Add Azure File Share cross-region restore and soft-delete undelete support#33809Bharat Purwar (bharatpurwar) wants to merge 4 commits into
Bharat Purwar (bharatpurwar) wants to merge 4 commits into
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7a8ea165-11b7-4fc8-9919-ec589073b1fe
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
microsoft-github-policy-service
Bot
requested a review
from Yong Zhang (yonzhan)
July 29, 2026 04:07
Copilot started reviewing on behalf of
Bharat Purwar (bharatpurwar)
July 29, 2026 04:07
View session
microsoft-github-policy-service
Bot
requested review from
Yu Chen (jsntcy) and
ZelinWang (wangzelin007)
July 29, 2026 04:07
microsoft-github-policy-service
Bot
added
Auto-Assign
Contributor
|
🔔 Routing this PR to @Azure/act-observability-squad. |
Member
|
/azp run |
|
Azure Pipelines: Successfully started running 3 pipeline(s). |
Contributor
There was a problem hiding this comment.
Pull request overview
Adds Azure File Share cross-region restore (CRR) support to the backup command module, enabling --use-secondary-region for full-share alternate-location restores and validating target file shares before triggering the passive-stamp CRR workflow. Also adjusts CRR job/task formatting to tolerate task models missing timestamps and adds a record-only scenario test + recording.
Changes:
- Enable CRR restore flow for Azure File Share restores via passive-stamp access token + CRR trigger, tracked as a CRR job.
- Allow
--use-secondary-regionfor AzureStorage recovery point listing and wire the flag through restore entrypoints/params. - Add playback-only scenario test and recording for the AFS CRR restore path; harden CRR task timestamp formatting.
Reviewed changes
Copilot reviewed 7 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/azure-cli/azure/cli/command_modules/backup/custom_afs.py | Implements the AFS CRR restore path (passive stamp) and enables secondary-region recovery point listing; adds target file share validation. |
| src/azure-cli/azure/cli/command_modules/backup/custom_base.py | Threads use_secondary_region into the restore_azurefileshare entrypoint and item resolution. |
| src/azure-cli/azure/cli/command_modules/backup/custom_common.py | Allows AzureStorage to use --use-secondary-region by updating the “not supported” list. |
| src/azure-cli/azure/cli/command_modules/backup/custom_help.py | Makes CRR task timestamp normalization resilient to missing start_time/end_time. |
| src/azure-cli/azure/cli/command_modules/backup/_params.py | Adds --use-secondary-region to backup restore restore-azurefileshare. |
| src/azure-cli/azure/cli/command_modules/backup/_client_factory.py | Introduces a Storage mgmt client factory and a file_shares_cf accessor used for target share validation. |
| src/azure-cli/azure/cli/command_modules/backup/tests/latest/test_afs_commands.py | Adds a record-only scenario test covering AFS CRR restore and CRR job tracking. |
| src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_afs_cross_region_restore.yaml | Adds the test recording for the new scenario. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
18
to
+25
| from azure.cli.core.util import CLIError | ||
| from azure.cli.command_modules.backup._client_factory import protection_containers_cf, protectable_containers_cf, \ | ||
| protection_policies_cf, backup_protection_containers_cf, backup_protectable_items_cf, \ | ||
| resources_cf, backup_protected_items_cf, protected_items_cf | ||
| from azure.cli.core.azclierror import ArgumentUsageError, ValidationError | ||
| resources_cf, backup_protected_items_cf, protected_items_cf, \ | ||
| recovery_points_crr_cf, recovery_points_passive_cf, aad_properties_cf, cross_region_restore_cf, vaults_cf, \ | ||
| file_shares_cf | ||
| from azure.cli.core.azclierror import ArgumentUsageError, ValidationError, InvalidArgumentValueError | ||
| from azure.core.exceptions import ResourceNotFoundError |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7a8ea165-11b7-4fc8-9919-ec589073b1fe
Bharat Purwar (bharatpurwar)
changed the title
Member
|
/azp run |
|
Azure Pipelines: Successfully started running 3 pipeline(s). |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7a8ea165-11b7-4fc8-9919-ec589073b1fe
Member
|
/azp run |
|
Azure Pipelines: Successfully started running 3 pipeline(s). |
Member
Author
|
/azp run Azure.azure-cli |
|
Commenter does not have sufficient privileges for PR 33809 in repo Azure/azure-cli |
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 3 pipeline(s). |
Member
Author
|
Hi Team, please review the changes |
Zubair Abid (zubairabid)
approved these changes
Aug 13, 2026
Zubair Abid (zubairabid)
left a comment
Zubair Abid (zubairabid)
left a comment
Contributor
There was a problem hiding this comment.
Look good, minor changes unrelated to function.
| # CRR path: route through passive stamp (secondary region endpoint) | ||
| if use_secondary_region: | ||
| vault = vaults_cf(cmd.cli_ctx).get(resource_group_name, vault_name) | ||
| import azure.cli.command_modules.backup.custom as custom_module |
Contributor
There was a problem hiding this comment.
nit: move imports to top of file.
Member
Author
There was a problem hiding this comment.
fixed
| recovery_points = client.list(vault_name, resource_group_name, fabric_name, container_uri, item_uri, filter_string) | ||
| paged_recovery_points = helper.get_list_from_paged_response(recovery_points) | ||
| if use_secondary_region: | ||
| crr_client = recovery_points_crr_cf(cmd.cli_ctx) |
Contributor
There was a problem hiding this comment.
nit: having both this and the previous cross_region_restore_cf instance be called crr_client can get a bit confusing, useful to disambiguate the naming a bit.
Member
Author
There was a problem hiding this comment.
fixed
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7a8ea165-11b7-4fc8-9919-ec589073b1fe
Member
|
/azp run |
|
Azure Pipelines: Successfully started running 3 pipeline(s). |
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.
🤖 PR Validation —⚠️ Review suggested
Related commands
az backup item list --use-secondary-regionaz backup item show --use-secondary-regionaz backup recoverypoint list --use-secondary-regionaz backup restore restore-azurefileshare --use-secondary-regionaz backup job show --use-secondary-regionaz backup protection undeleteDescription
Adds Azure File Share cross-region restore support for full-share alternate-location restores. The implementation resolves protected items and recovery points from the secondary region, validates the target file share, builds the passive-stamp CRR request with the Azure Storage access token, triggers the restore, and tracks the resulting CRR job.
Adds Azure File Share soft-delete undelete support. Soft-deleted Azure File Share protected items remain discoverable through item listing and can be rehydrated using
az backup protection undelete. The command validates the deferred-delete state and submits the protected-item rehydrate request.Also fixes Azure Storage CRR job formatting for task models without start/end timestamps.
Testing Guide
azdev test test_afs_cross_region_restore test_afs_backup_protection_undelete --series --no-exitfirstazdev style backupazdev linter backupBoth scenarios use recordings for CI playback. The undelete scenario uses transient resources through preparers and has a dedicated
test_afs_backup_protection_undelete.yamlrecording.History Notes
[Backup]
az backup restore restore-azurefileshare: Add Azure File Share cross-region restore support.[Backup]
az backup protection undelete: Add Azure File Share soft-delete undelete support.