cmd/cp: Fix --from-oci-layout when using full reference #1507
Conversation
This file contains 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
Copying an image from an OCI layout with a value like "foo/bar:latest" for "org.opencontainers.image.ref.name" was failing with: ``` $ oras cp --from-oci-layout ./myimage:foo/bar:latest localhost:5000/foo:latest Error: invalid argument "./myimage:foo/bar:latest": failed to find path "./myimage:foo/bar:": stat /myimage:foo/bar: no such file or directory ``` According to [0], foo/bar:latest if a valid value for "org.opencontainers.image.ref.name", so the command should work. This commit fixes that by using strings.Index() instead of strings.LastIndex(). [0]: https://github.com/opencontainers/image-spec/blob/v1.1.0-rc5/annotations.md Signed-off-by: Mauricio Vásquez <[email protected]>
mauriciovasquezbernal
requested review from
sajayantony,
shizhMSFT,
SteveLasker,
qweeah and
TerryHowe
as code owners
1 task
TerryHowe
reviewed
Sep 23, 2024
| {"Empty digest", "path@", "path", "", false}, | ||
| {"Empty tag", "path:", "path", "", false}, | ||
| {"path and digest", "path@digest", "path", "digest", false}, | ||
| {"path and tag", "path:tag", "path", "tag", false}, | ||
| {"path with full reference", "path:repo:tag", "path", "repo:tag", false}, |
There was a problem hiding this comment.
Shouldn't the path be path:repo?
There was a problem hiding this comment.
path:repo fails, but the included content passes
sabre1041
approved these changes
Sep 26, 2024
| {"Empty digest", "path@", "path", "", false}, | ||
| {"Empty tag", "path:", "path", "", false}, | ||
| {"path and digest", "path@digest", "path", "digest", false}, | ||
| {"path and tag", "path:tag", "path", "tag", false}, | ||
| {"path with full reference", "path:repo:tag", "path", "repo:tag", false}, |
There was a problem hiding this comment.
path:repo fails, but the included content passes
TerryHowe
requested changes
Oct 1, 2024
| if err != nil { | ||
| return errors.Join(err, errdef.ErrInvalidReference) | ||
| } | ||
| } else if idx := strings.Index(raw, ":"); idx != -1 { |
There was a problem hiding this comment.
Suggested change
| } else if idx := strings.Index(raw, ":"); idx != -1 { | |
| } else if idx := strings.LastIndex(raw, ":"); idx != -1 { |
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:
Copying an image from an OCI layout with a value like "foo/bar:latest" for "org.opencontainers.image.ref.name" was failing with:
According to 0, foo/bar:latest if a valid value for "org.opencontainers.image.ref.name", so the command should work.
This commit fixes that by using strings.Index() instead of strings.LastIndex().
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 #1505
Please check the following list: