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

refactor(scrub): replace umoci logic in scrub implementation #1845

Merged
merged 1 commit into from
Sep 26, 2023

Conversation

Andreea-Lupu
Copy link
Contributor

@Andreea-Lupu Andreea-Lupu commented Sep 22, 2023

  • implement scrub also for S3 storage by replacing umoci
  • change scrub implementation for ImageIndex
  • take the Subject into consideration when running scrub
  • remove test code relying on the umoci library. Since we started
    relying on images in test/data, and we create our own images using
    go code we can obtain digests by other means. (cherry picked from commit andaaron@489d4e2)

What type of PR is this?

Which issue does this PR fix:
#1685 #734

What does this PR do / Why do we need it:

If an issue # is not available please add repro steps and logs showing the issue:

Testing done on this change:

Automation added to e2e:

Will this break upgrades or downgrades?

Does this PR introduce any user-facing change?:


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

errors/errors.go Outdated Show resolved Hide resolved
pkg/storage/scrub.go Outdated Show resolved Hide resolved
pkg/storage/scrub.go Outdated Show resolved Hide resolved
pkg/storage/scrub.go Outdated Show resolved Hide resolved
pkg/storage/scrub.go Outdated Show resolved Hide resolved
pkg/storage/scrub.go Outdated Show resolved Hide resolved
pkg/storage/scrub.go Show resolved Hide resolved
@andaaron
Copy link
Contributor

Why do we still have umoci in go.mod?

@codecov
Copy link

codecov bot commented Sep 22, 2023

Codecov Report

Merging #1845 (e25d343) into main (9096031) will increase coverage by 0.06%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1845      +/-   ##
==========================================
+ Coverage   91.99%   92.05%   +0.06%     
==========================================
  Files         146      146              
  Lines       26462    26465       +3     
==========================================
+ Hits        24343    24363      +20     
+ Misses       1563     1552      -11     
+ Partials      556      550       -6     
Files Coverage Δ
errors/errors.go 100.00% <ø> (ø)
pkg/extensions/extension_scrub.go 93.61% <100.00%> (-0.39%) ⬇️
pkg/extensions/scrub/scrub.go 100.00% <100.00%> (ø)
pkg/storage/scrub.go 96.70% <100.00%> (+5.58%) ⬆️
pkg/test/common.go 85.51% <ø> (-0.24%) ⬇️

... and 3 files with indirect coverage changes

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

pkg/storage/scrub.go Outdated Show resolved Hide resolved
- implement scrub also for S3 storage by replacing umoci
- change scrub implementation for ImageIndex
- take the `Subject` into consideration when running scrub
- remove test code relying on the umoci library. Since we started
relying on images in test/data, and we create our own images using
go code we can obtain digests by other means. (cherry picked from commit 489d4e2)

Signed-off-by: Andrei Aaron <[email protected]>
Signed-off-by: Andreea-Lupu <[email protected]>
Copy link
Contributor

@rchincha rchincha left a comment

Choose a reason for hiding this comment

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

lgtm

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.

3 participants