fix: add --oci-layout flag for OCI Image Layout blob paths #1723
+955
−36
Conversation
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
github-actions
bot
added
kind/bugfix
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
3 times, most recently
from
da1e69b to
3c64d21
Compare
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
2 times, most recently
from
b5a9e8c to
ed1de51
Compare
github-actions
bot
added
the
component/github-actions
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
6 times, most recently
from
4d5f150 to
4ece648
Compare
Member
jakobmoellerdev
left a comment
jakobmoellerdev
left a comment
There was a problem hiding this comment.
in general this is lgtm in approach for the artifact downloader, but:
- I was expecting the download resource to be fixed alongside, i only see ocm download artifact. whats the behavior for downloading resources with a downloader
- I think the test is not setup stable. you expect the docker daemon to be available but we should test against an actual OCI registry imho. nothing that will block the PR though
| type accessObjectInfo struct { | ||
| accessobj.DefaultAccessObjectInfo | ||
| // ociBlobLayout enables OCI Image Layout Specification compliant blob paths. | ||
| // When true, blobs are stored at blobs/<algorithm>/<encoded> instead of blobs/<algorithm>.<encoded>. |
Member
There was a problem hiding this comment.
the artifactset format should not receive an alternative form to be stored as OCI layout imho.
| }) | ||
|
|
||
| AfterAll(func() { | ||
| GinkgoWriter.Printf("Cleaning up registry packages in: %s\n", registryHost) |
Member
There was a problem hiding this comment.
nit: we have ginkgo logger for such uses
Author
There was a problem hiding this comment.
@jakobmoellerdev I could not find such logger, can you point it?
Member
There was a problem hiding this comment.
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
from
4ece648 to
1089c99
Compare
Member
jakobmoellerdev
left a comment
jakobmoellerdev
left a comment
There was a problem hiding this comment.
Im pretty sure that this is breaking backwards compatibility. That is because the oci layout flag was present before and I believe we can now no longer read from layouts that had the "old" incorrect oci layout flag. I think we need to version this off... I have encountered a very similar issue during my testing of local blob compatibility
cmds/ocm/commands/ocicmds/artifacts/download/oci_layout_roundtrip_test.go
Show resolved
Hide resolved
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
from
1089c99 to
9822ee2
Compare
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
4 times, most recently
from
58d89bd to
0d1928c
Compare
piotrjanik
commented
Jan 2, 2026
api/oci/extensions/repositories/artifactset/ctf_roundtrip_test.go
Outdated
Show resolved
Hide resolved
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
from
0d1928c to
42a688b
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
from
42a688b to
a00fbed
Compare
<!-- markdownlint-disable MD041 --> This change adds an optional --oci-layout flag to the `ocm download artifacts|resources` command to store blobs at blobs/<algorithm>/<encoded> per OCI Image Layout Specification instead of the default blobs/<algorithm>.<encoded> format. This enables compatibility with tools that expect OCI-compliant blob paths. <!-- Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. --> Fixes open-component-model#1668 Signed-off-by: Piotr Janik <piotr.janik@sap.com>
piotrjanik
force-pushed
the
fix/oci-blob-path
branch
from
a00fbed to
0fb86c7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
This PR adds an
--oci-layoutflag toocm download artifactandocm download resourcescommands to produce OCI Image Layout compliant output.Changes Introduced
New
--oci-layoutFlagWhen specified, OCI artifacts are downloaded with:
blobs/sha256/<digest>instead ofblobs/sha256.<digest>index.json+oci-layoutorg.opencontainers.image.ref.nameannotationNew Format Constant
Added
FORMAT_OCI_COMPLIANT(oci/v1+compliant) which behaves likeFORMAT_OCIbut uses nested blob directory structure per OCI Image Layout specification.Behavior
--oci-layout--oci-layoutdownload artifactdownload resourcesref.nameAnnotationdownload artifact: Uses tag from source reference (e.g.,latest)download resources: Uses resource versionFixes #1668