Skip to content

Update to sylabs/sif 2.15.1#217

Merged
DrDaveD merged 4 commits intoapptainer:mainfrom
DrDaveD:pick-sylabs-2.15.1
Dec 28, 2023
Merged

Update to sylabs/sif 2.15.1#217
DrDaveD merged 4 commits intoapptainer:mainfrom
DrDaveD:pick-sylabs-2.15.1

Conversation

@DrDaveD
Copy link
Contributor

@DrDaveD DrDaveD commented Dec 27, 2023

This cherry-picks the following PRs, bringing apptainer/sif up to date with sylabs/sif 2.15.1:

Original PR descriptions were
327:

A bug was discovered while deleting an object from a SIF, where the in-memory descriptor wasn't marked as unused.

This fixes that by simplifying the process by reseting the descriptor on the memory allocation, then calling writeDescriptors to persist the change to the backing SIF.

328:

Replace func zeroData with a simpler implementation that uses an io.Reader that streams zero bytes.

325:

Mark github.com/sylabs/sif/v2/pkg/user package deprecated. Remove experimental mount and unmount commands.

Closes sylabs/sif#323

341:
No description provided.

wobito and others added 4 commits December 27, 2023 08:44
@wobito @DrDaveD
fix: delete object
d264e8b 
Signed-off-by: Dave Dykstra <[email protected]>
@tri-adam @DrDaveD
refactor: simplify zero implementation
1a03c5a 
Signed-off-by: Dave Dykstra <[email protected]>
@tri-adam @DrDaveD
feat: deprecate user package
6a43be0 
Signed-off-by: Dave Dykstra <[email protected]>
@tri-adam @DrDaveD
build(deps): bump github.com/ProtonMail/go-crypto from v0.0.0-2023071…
ceb19fa 
…7121422-5aa5874ade95 to v0.0.0-20230923063757-afb1ddc0824c

Signed-off-by: Dave Dykstra <[email protected]>
@codecov
Copy link

codecov bot commented Dec 27, 2023

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (384ce86) 72.83% compared to head (ceb19fa) 73.06%.
Report is 1 commits behind head on main.

Files Patch % Lines
pkg/sif/create.go 75.00% 2 Missing and 3 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #217      +/-   ##
==========================================
+ Coverage   72.83%   73.06%   +0.23%     
==========================================
  Files          35       31       -4     
  Lines        2974     2918      -56     
==========================================
- Hits         2166     2132      -34     
+ Misses        648      630      -18     
+ Partials      160      156       -4
Flag Coverage Δ
unittests 73.06% <75.00%> (+0.23%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DrDaveD DrDaveD requested a review from ikaneshiro December 27, 2023 15:09
@DrDaveD DrDaveD merged commit ee8e90b into apptainer:main Dec 28, 2023
@DrDaveD DrDaveD deleted the pick-sylabs-2.15.1 branch December 28, 2023 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ikaneshiro ikaneshiro ikaneshiro approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Deprecate pkg/user package?

4 participants

@DrDaveD @ikaneshiro @wobito @tri-adam