Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCI data types #301

Merged
merged 6 commits into from
Jun 13, 2023
Merged

OCI data types #301

merged 6 commits into from
Jun 13, 2023

Conversation

wobito
Copy link
Contributor

@wobito wobito commented Jun 12, 2023

This PR adds 2 new datatypes in supporting #188

  • OCI.RootIndex which allows the specification of the OCI image index to be added
  • OCI.Blob which allows the specification of OCI artifacts to be added (blob, configs, manifests, and other indexes)

@wobito wobito marked this pull request as ready for review June 12, 2023 21:25
@codecov
Copy link

codecov bot commented Jun 12, 2023

Codecov Report

Merging #301 (a434f25) into main (df10667) will decrease coverage by 0.19%.
The diff coverage is 66.10%.

❗ Current head a434f25 differs from pull request most recent head 6302814. Consider uploading reports for the commit 6302814 to get more accurate results

@@            Coverage Diff             @@
##             main     #301      +/-   ##
==========================================
- Coverage   72.85%   72.67%   -0.19%     
==========================================
  Files          35       35              
  Lines        2899     2953      +54     
==========================================
+ Hits         2112     2146      +34     
- Misses        634      648      +14     
- Partials      153      159       +6     
Impacted Files Coverage Δ
internal/app/siftool/info.go 88.95% <50.00%> (-1.34%) ⬇️
pkg/siftool/add.go 46.28% <57.69%> (+0.13%) ⬆️
pkg/sif/descriptor.go 72.83% <66.66%> (-0.37%) ⬇️
pkg/sif/descriptor_input.go 85.86% <78.57%> (-0.58%) ⬇️
pkg/sif/sif.go 29.46% <100.00%> (+2.61%) ⬆️

Copy link
Member

@tri-adam tri-adam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, a few questions/comments, thank you!

internal/app/siftool/info.go Outdated Show resolved Hide resolved
internal/app/siftool/testdata/TestApp_Info/OCIBlob.golden Outdated Show resolved Hide resolved
pkg/siftool/add.go Show resolved Hide resolved
pkg/sif/descriptor_input.go Outdated Show resolved Hide resolved
pkg/sif/descriptor.go Outdated Show resolved Hide resolved
@wobito wobito force-pushed the oci-data-types branch 3 times, most recently from 78370a3 to d84c7a5 Compare June 13, 2023 14:35
Copy link
Member

@tri-adam tri-adam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few more small things, thank you @wobito.

pkg/sif/descriptor.go Outdated Show resolved Hide resolved
pkg/siftool/add.go Show resolved Hide resolved
pkg/siftool/add.go Show resolved Hide resolved
pkg/siftool/add_test.go Outdated Show resolved Hide resolved
Copy link
Member

@tri-adam tri-adam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more nit, and one that was hidden in the last one, apologies.

pkg/siftool/add.go Show resolved Hide resolved
pkg/siftool/add.go Outdated Show resolved Hide resolved
@wobito wobito force-pushed the oci-data-types branch 3 times, most recently from a434f25 to 5fb8bf0 Compare June 13, 2023 18:17
@wobito wobito merged commit b92b55f into sylabs:main Jun 13, 2023
1 check passed
@wobito wobito deleted the oci-data-types branch June 13, 2023 18:19
edytuk pushed a commit to edytuk/sif that referenced this pull request Jul 27, 2023
* add: oci blob support

remove unused string

* add: oci root index support

* update: address pr requests

* add: oci opt test

* add: flag formatting

* update: opts method to handle a reader

Signed-off-by: Edita Kizinevic <edita.kizinevic@cern.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants