Merge upstream Azure/Azurite main (d9de4da) into blob versioning branch - #5
Conversation
Added mandatory final response format for code reviews.
Updated ChangeLog to reflect recent dependency updates and fixes.
…eam-main-into-blobversioning # Conflicts: # ChangeLog.md # README.md # src/blob/handlers/ContainerHandler.ts # src/blob/persistence/IBlobMetadataStore.ts # src/blob/persistence/LokiBlobMetadataStore.ts # src/blob/persistence/SqlBlobMetadataStore.ts Co-authored-by: rorozcov <44987991+rorozcov@users.noreply.github.com>
| 9. **Summary** — post a final comment explaining why this update matters, what the impact/risk is, and what could go wrong if it weren't applied, along with your self-rating and reasoning. | ||
| 9. **Summary** — your final response must use the following structure exactly (no free-form paragraph summary). | ||
| ## Impact analysis |
There was a problem hiding this comment.
Where did this whole section come from? Do we need to fill this out if it came from main? I'd check the repo and its contribution rules and history to see
There was a problem hiding this comment.
That section came entirely from upstream Azure/Azurite:main — it isn't something this branch added or edited.
Verification: .github/copilot-dependabot-instructions.md at the merge commit 9993abd is byte-identical to upstream d9de4da (git diff d9de4da HEAD -- .github/copilot-dependabot-instructions.md is empty). The file existed on both parents; the 41 added lines relative to the feature-branch parent 1b253b4 are upstream's, and it was not one of the six conflicted files.
No, it doesn't need filling out here. The headings starting at line 13 are a response template that the agent handling a Dependabot PR fills in for that PR — they aren't blanks belonging to this repo or this merge.
| @@ -0,0 +1,91 @@ | |||
| --- | |||
There was a problem hiding this comment.
If this file is only from main and we did not touch it then disregard this comment
Uh oh!
There was an error while loading. Please reload this page.
Upstream synchronization pass for the blob versioning branch, which had drifted into a conflicted state against
Azure/Azurite:main. Merged (not rebased) upstreamd9de4da— "Bump axios from 1.19.0 to 1.20.0 (Azure#2763)" — producing a true two-parent merge commit (1b253b4+d9de4da). No feature changes, refactors, or review fixes are included.Conflict resolutions
All six conflicts were resolved by integrating both sides; nothing was discarded and no tests were dropped or weakened.
listBlobssignature (IBlobMetadataStore.ts,LokiBlobMetadataStore.ts,SqlBlobMetadataStore.ts) — versioning parameters and upstream's newstartFromparameter now coexist:Store bodies auto-merged cleanly: the versioning filters and upstream's inclusive
startFromfilter are both retained.ContainerHandler.ts— flat and hierarchy listing both forward the versioning flags plusrequest.getQuery("startFrom").ChangeLog.md/README.md— kept both sides' entries (versioning alongside upstream's copy-source HEAD validation,startFrom, and CRC-64/NVME checksums).Versioning behavior confirmed intact after the merge
ListAllBlobsMarker-encoded GC continuation marker and its page-boundary regression test, cross-version blob type consistency enforcement, requiredaccountModelStoreonBlobServerFactory.createServer,PageWithDelimiterlegacy name-only marker mode used by the SQL store,x-ms-is-current-versionon Get Blob Properties/Download, and strictversionidvalidation.Points for reviewer attention
startFrom; consistent across interface, both stores, and the handler, but arbitrary.includeVersions/includeDeletedWithVersions, unchanged from before the merge. SQL-backend tests were not exercised (no MySQL available).BlockBlobHandlersocket null check, two token-authenticator unit tests usingas any) originate in upstream-authored files and were left untouched as out of scope for a sync merge.