Skip to content

Merge sylabs/sif through v2.11.6-0.20230615203820-9fe9b624c3fd#197

Merged
DrDaveD merged 4 commits intoapptainer:mainfrom
edytuk:sylabsv2.11.6-0.20230615203820-9fe9b624c3fd
Jul 28, 2023
Merged

Merge sylabs/sif through v2.11.6-0.20230615203820-9fe9b624c3fd#197
DrDaveD merged 4 commits intoapptainer:mainfrom
edytuk:sylabsv2.11.6-0.20230615203820-9fe9b624c3fd

Conversation

@edytuk
Copy link
Contributor

@edytuk edytuk commented Jul 28, 2023

This pulls in the following PRs, bringing apptainer/sif up to the level of v2.11.6-0.20230615203820-9fe9b624c3fd

The original PR descriptions were:

This PR adds 2 new datatypes in supporting sylabs/sif#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)

Make a few changes related to working with OCI blobs:

  • Remove OptOCIBlobMetadata. Calculate the digest automatically when the data is read instead.
  • Rename OCIBlobMetadata to OCIBlobDigest, and have it return a v1.Hash instead of string.
  • Add WithOCIBlobDigest, to easily locate a sif.Descriptor using via GetDescriptor.

wobito and others added 4 commits July 27, 2023 17:43
* 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 <[email protected]>
Remove OptOCIBlobMetadata, which required caller to explicitly provide
the digest of an OCI blob when creating a DescriptorInput. Calculate the
digest automatically as the DataOCIRootIndex/DataOCIBlob data is read.

Signed-off-by: Edita Kizinevic <[email protected]>
Return v1.Hash type directly instead of string.

Signed-off-by: Edita Kizinevic <[email protected]>
Signed-off-by: Edita Kizinevic <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #197 (7b16946) into main (1738c9e) will increase coverage by 0.09%.
Report is 1 commits behind head on main.
The diff coverage is 78.94%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@            Coverage Diff             @@
##             main     #197      +/-   ##
==========================================
+ Coverage   72.80%   72.89%   +0.09%     
==========================================
  Files          35       35              
  Lines        2901     2955      +54     
==========================================
+ Hits         2112     2154      +42     
- Misses        636      646      +10     
- Partials      153      155       +2     
Flag Coverage Δ
unittests 72.89% <78.94%> (+0.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
pkg/sif/sif.go 25.43% <0.00%> (-0.93%) ⬇️
internal/app/siftool/info.go 88.95% <50.00%> (-1.34%) ⬇️
pkg/siftool/add.go 46.47% <75.00%> (+0.32%) ⬆️
pkg/sif/descriptor.go 75.41% <88.46%> (+2.21%) ⬆️
pkg/sif/descriptor_input.go 86.95% <100.00%> (+0.51%) ⬆️
pkg/sif/select.go 97.29% <100.00%> (+0.15%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@DrDaveD DrDaveD merged commit 4200eef into apptainer:main Jul 28, 2023
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.

5 participants