OCPBUGS-95238: Dump compact cache to CM for persistence #6379
+1,057
−105
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package imageutils | ||
|
|
||
| // CacheEntryFilter decides whether a cache entry should be included in | ||
| // external persistence. Implementations must not mutate the input entry. | ||
| type CacheEntryFilter func(digest string, entry *InspectionCacheEntry) bool | ||
|
|
||
| // CacheEntryTransformer returns a (possibly reduced) copy of an | ||
| // InspectionCacheEntry for external persistence. Implementations must not | ||
| // mutate the input entry. | ||
| type CacheEntryTransformer func(digest string, entry *InspectionCacheEntry) *InspectionCacheEntry | ||
|
|
||
| // NewCacheFileTransformer returns a CacheEntryTransformer that applies a | ||
| // transformation function to a cached file matching the given path. Other | ||
| // files and labels are preserved. | ||
| func NewCacheFileTransformer(path string, transform func([]byte) ([]byte, error)) CacheEntryTransformer { | ||
| return func(_ string, entry *InspectionCacheEntry) *InspectionCacheEntry { | ||
| if entry.Files == nil { | ||
| return entry | ||
| } | ||
| _, ok := entry.Files[path] | ||
| if !ok { | ||
| return entry | ||
| } | ||
|
|
||
| cp := entry.DeepCopy() | ||
| transformed, err := transform(cp.Files[path]) | ||
| if err != nil { | ||
| return entry | ||
| } | ||
|
|
||
| cp.Files[path] = transformed | ||
| return cp | ||
| } | ||
| } | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| // NewCacheEntryFilter returns a filter that accepts entries having at least | ||
| // one of the specified label keys. | ||
| func NewCacheEntryFilter(requiredLabelKeys ...string) CacheEntryFilter { | ||
| keys := make(map[string]struct{}, len(requiredLabelKeys)) | ||
| for _, k := range requiredLabelKeys { | ||
| keys[k] = struct{}{} | ||
| } | ||
| return func(_ string, entry *InspectionCacheEntry) bool { | ||
| for k := range entry.Labels { | ||
| if _, ok := keys[k]; ok { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package imageutils | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestEntryFilter_KeepsEntryWithMatchingLabel(t *testing.T) { | ||
| filter := NewCacheEntryFilter("io.openshift.os.streamclass", "io.openshift.release") | ||
|
|
||
| entry := &InspectionCacheEntry{ | ||
| Labels: map[string]string{ | ||
| "io.openshift.os.streamclass": "rhel-9", | ||
| "vendor": "Red Hat", | ||
| }, | ||
| } | ||
|
|
||
| assert.True(t, filter("sha256:aaa", entry)) | ||
| } | ||
|
|
||
| func TestEntryFilter_ExcludesEntryWithoutMatchingLabels(t *testing.T) { | ||
| filter := NewCacheEntryFilter("io.openshift.os.streamclass", "io.openshift.release") | ||
|
|
||
| entry := &InspectionCacheEntry{ | ||
| Labels: map[string]string{ | ||
| "vendor": "Red Hat", | ||
| "version": "9.4", | ||
| }, | ||
| } | ||
|
|
||
| assert.False(t, filter("sha256:aaa", entry)) | ||
| } | ||
|
|
||
| func TestEntryFilter_EmptyLabels(t *testing.T) { | ||
| filter := NewCacheEntryFilter("io.openshift.os.streamclass") | ||
|
|
||
| assert.False(t, filter("sha256:aaa", &InspectionCacheEntry{Labels: nil})) | ||
| assert.False(t, filter("sha256:aaa", &InspectionCacheEntry{Labels: map[string]string{}})) | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.