Resolve merge conflicts with main branch #44851

Copilot · 2026-01-26T21:49:58Z

Merged latest changes from origin/main into the blob storage TypeSpec migration branch, resolving conflicts from the _generated folder restructuring.

Conflicts Resolved

Modify/delete conflicts (19 files): Removed old _generated files at root level that were relocated to _generated/azure/storage/blobs/ subfolder structure. Includes sync/async operations, models, and configuration files.

Import path update: Fixed tests/test_common_blob.py import statement for RehydratePriority to use new nested path structure:

# Updated from:
from azure.storage.blob._generated.models import RehydratePriority
# To:
from azure.storage.blob._generated.azure.storage.blobs.models import RehydratePriority

Import structure fix: Added placeholder _operations.py and _patch.py files in _operations/ directory to satisfy module imports pending full code regeneration.

Note

Code generation remains incomplete as documented in original PR. Full regeneration with @pageable false still required.

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

* updated patch pickle * update * format * updated patch * update * fix pylint * updated version and changelog * update

Co-authored-by: Alitzel Mendez <almend@microsoft.com> Co-authored-by: Alitzel Mendez <6895254+AlitzelMendez@users.noreply.github.com>

* add azure-keyvault-admin to the smoketest set on a core change * Update eng/scripts/Language-Settings.ps1 to mirror appropriate keyvault package name Co-authored-by: McCoy Patiño <39780829+mccoyp@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* remove multiapi * fix test * update autorest readme to fix issues with latest versions

* Fixing/Adding samples * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update README.md * removing fail as we create the keys * fixing test mypy issue * update tests * fixing sample * format fixes * Fixing sample + disable one live test --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Zixin Yao <ziyao@microsoft.com>

* Added more eval sample tests * Address PR review comments: async executor consistency, robust timestamp regex * Use specific regex patterns for timestamp sanitization

* update test disables * updates * this * bump

Co-authored-by: Scott Beddall <scbedd@microsoft.com>

… Azure SDKs (#44814)

Bumps the npm_and_yarn group with 1 update in the /eng/common/tsp-client directory: [tar](https://github.com/isaacs/node-tar). Updates `tar` from 7.4.3 to 7.5.3 - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v7.4.3...v7.5.3) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

@jimmyca15

* Update CHANGELOG.md * 1.8.0 * Apply suggestion from @jimmyca15 Co-authored-by: Jimmy Campbell <jimmyca@microsoft.com> * Update CHANGELOG.md --------- Co-authored-by: Jimmy Campbell <jimmyca@microsoft.com>

…er-structure` (#44580)

* [Identity] TSG update for token binding Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com> * Update formatting Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com> --------- Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com>

Resolved conflicts: - Updated import path in tests/test_common_blob.py to use new _generated folder structure - Removed old _generated files that were moved to azure/storage/blobs subfolder

Co-authored-by: l0lawrence <100643745+l0lawrence@users.noreply.github.com>

Copilot · 2026-01-26T22:02:44Z

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

ghcr.io
- Triggering command: /tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph npm_and_yarn org/repo --local /home/REDACTED/work/azure-sdk-for-python/azure-sdk-for-python --branch main --directory eng/common/tsp-client --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt /usr/share/ca-certificates/mozilla/TWCA_Global_Root_CA.crt /bin/test /models/__init__node A.crt rs test (dns block)
- Triggering command: /tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph pip org/repo --local /tmp/dependabot-base-Q5PC5w/repo --branch main --directory sdk/ai/azure-ai-projects --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt test /bin/test _CA.pem bash ine test (dns block)
- Triggering command: /tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph pip org/repo --local /home/REDACTED/work/azure-sdk-for-python/azure-sdk-for-python --branch main --directory sdk/ai/azure-ai-projects --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt test /usr/local/.pyenv/bin/test bot-ca.pem grep /usr/sbin/test test (dns block)
scanning-api.github.com
- Triggering command: /home/REDACTED/work/_temp/ghcca-node/node/bin/node /home/REDACTED/work/_temp/ghcca-node/node/bin/node --enable-source-maps /home/REDACTED/work/_temp/copilot-developer-action-main/dist/index.js (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

Configure Actions setup steps to set up my environment, which run before the firewall is enabled
Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

amber-Chen-86 and others added 17 commits January 22, 2026 15:00

[Conv authoring] fix pickle issue (#44806)

a3d655b

* updated patch pickle * update * format * updated patch * update * fix pylint * updated version and changelog * update

Fix API Change Check (#44808)

0c75e9a

Co-authored-by: Alitzel Mendez <almend@microsoft.com> Co-authored-by: Alitzel Mendez <6895254+AlitzelMendez@users.noreply.github.com>

Remove multiapi since it's getting deprecated (#44779)

bbc7bcd

* remove multiapi * fix test * update autorest readme to fix issues with latest versions

update (#44795)

0510d74

Co-authored-by: Zixin Yao <ziyao@microsoft.com>

Added more evaluation sample tests (set 2) (#44812)

84905e8

* Added more eval sample tests * Address PR review comments: async executor consistency, robust timestamp regex * Use specific regex patterns for timestamp sanitization

update disables for next-* (#44828)

3645e13

* update test disables * updates * this * bump

bump default doc-warden version (#44833)

7956c88

Co-authored-by: Scott Beddall <scbedd@microsoft.com>

Adding new documentation about code customizations for TypeSpec-based…

60a9d5a

… Azure SDKs (#44814)

Update @azure-tools/openai-typespec to latest version (1.7.1) (#44839)

41022bf

App Config 1.8.0 Release (#44847)

f0a1882

* Update CHANGELOG.md * 1.8.0 * Apply suggestion from @jimmyca15 Co-authored-by: Jimmy Campbell <jimmyca@microsoft.com> * Update CHANGELOG.md --------- Co-authored-by: Jimmy Campbell <jimmyca@microsoft.com>

Python SDK emitted from TypeSpec branch `feature/foundry-v2-spec-fold…

afbdce0

…er-structure` (#44580)

[Storage] STG 101 Features (#44320)

d80e98e

[Identity] TSG update for token binding (#44789)

d1955dd

* [Identity] TSG update for token binding Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com> * Update formatting Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com> --------- Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com>

Initial plan

0387213

Copilot AI assigned Copilot and l0lawrence Jan 26, 2026

Copilot AI mentioned this pull request Jan 26, 2026

blob storage #44827

Draft

Copilot started work on behalf of l0lawrence January 26, 2026 21:50 View session

GitHub Copilot and others added 2 commits January 26, 2026 21:55

Merge origin/main into copilot/sub-pr-44827

30fa78b

Resolved conflicts: - Updated import path in tests/test_common_blob.py to use new _generated folder structure - Removed old _generated files that were moved to azure/storage/blobs subfolder

Add placeholder files for _operations to fix import structure

a8c0066

Co-authored-by: l0lawrence <100643745+l0lawrence@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Fix blob storage operations and tests~~ Resolve merge conflicts with main branch Jan 26, 2026

Copilot AI requested a review from l0lawrence January 26, 2026 22:02

Copilot finished work on behalf of l0lawrence January 26, 2026 22:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolve merge conflicts with main branch #44851

Resolve merge conflicts with main branch #44851

Uh oh!

Copilot AI commented Jan 26, 2026 •

edited

Loading

Uh oh!

Copilot AI commented Jan 26, 2026

I tried to connect to the following addresses, but was blocked by firewall rules:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Resolve merge conflicts with main branch #44851

Are you sure you want to change the base?

Resolve merge conflicts with main branch #44851

Uh oh!

Conversation

Copilot AI commented Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts Resolved

Note

Uh oh!

Copilot AI commented Jan 26, 2026

I tried to connect to the following addresses, but was blocked by firewall rules:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Copilot AI commented Jan 26, 2026 •

edited

Loading