fix: oras cp should copy root index when the index has no referrers#1749
Merged
Conversation
added 4 commits
June 4, 2025 10:55
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1749 +/- ##
==========================================
+ Coverage 85.58% 85.61% +0.03%
==========================================
Files 137 137
Lines 5993 6006 +13
==========================================
+ Hits 5129 5142 +13
Misses 613 613
Partials 251 251 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
added 5 commits
June 5, 2025 12:51
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
qweeah
approved these changes
Jun 5, 2025
qweeah
left a comment
Contributor
There was a problem hiding this comment.
LGTM with minor suggestions.
Contributor
|
IMO fix here is still hacky. But it's good enough for a bug fix to unblock users. Implementations in this PR are duplicated to SDK-side work like finding DAG roots. Would be ideal to fix via oras-project/oras-go#957. |
added 2 commits
June 9, 2025 11:05
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Wwwsylvia
requested changes
Jun 9, 2025
added 7 commits
June 13, 2025 13:05
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
added 5 commits
July 1, 2025 19:26
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
shizhMSFT
reviewed
Jul 2, 2025
added 2 commits
July 2, 2025 15:28
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Wwwsylvia
reviewed
Jul 4, 2025
added 4 commits
July 10, 2025 14:33
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Wwwsylvia
approved these changes
Jul 11, 2025
Wwwsylvia
left a comment
Member
There was a problem hiding this comment.
LGTM with a minor suggestion
added 2 commits
July 14, 2025 12:57
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
Contributor
There was a problem hiding this comment.
Pull Request Overview
Ensures oras cp -r includes the root index when it has no referrers by adjusting the copy entrypoint and expanding tests.
- Change
prepareCopyOptionto return a custom entrypoint (copyRoot) for indexes without referrers. - Update
recursiveCopyto invokeExtendedCopyGraphon the returnedcopyRootand properly tag the original index. - Add E2E tests, testdata JSON, and diagram updates for both registry and OCI layout scenarios.
Reviewed Changes
Copilot reviewed 17 out of 17 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| cmd/oras/root/cp.go | Extend prepareCopyOption to return copyRoot and update recursiveCopy logic |
| cmd/oras/root/cp_test.go | Update tests to handle the new prepareCopyOption signature |
| test/e2e/testdata/zot/command/artifacts/index.json | Expand index manifests and annotations for the new test case |
| test/e2e/suite/command/cp.go | Add E2E tests for copying root index and its referrers in registry and OCI layout |
| test/e2e/README.md | Update ASCII diagram to reflect the new index and referrer relationships |
Comments suppressed due to low confidence (1)
cmd/oras/root/cp.go:242
- [nitpick] Add a doc comment explaining the new
copyRootreturn descriptor and how it affects the copy entrypoint when the root index has no referrers.
func prepareCopyOption(ctx context.Context, src oras.ReadOnlyGraphTarget, dst oras.Target, root ocispec.Descriptor, opts oras.ExtendedCopyOptions) (oras.ExtendedCopyOptions, ocispec.Descriptor, error) {
shizhMSFT
reviewed
Jul 14, 2025
added 2 commits
July 14, 2025 18:08
This was referenced Aug 7, 2025
6 tasks
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.
What this PR does / why we need it:
Added the following test case to the E2E test suite. On copying
v.1.3.8, the expected behavior would be that all six nodes in the graph are copied, including the index, two images and three referrers.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #1728
Please check the following list: