containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from vrothberg/fix-podman-12582 

libimage: filter: check if image is corrupted in case of error
This commit is contained in:
OpenShift Merge Robot 2021-12-14 15:57:44 +01:00 committed by GitHub
parent 11ea0135d9 f9d367b72f
commit 9555cb154f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/libimage/filters.go
View File

@ -19,12 +19,20 @@ import (
// indicates that the image matches the criteria.
type filterFunc func(*Image) (bool, error)
func matches(image *Image, filters map[string][]filterFunc) (bool, error) {
// Apply the specified filters. At least one filter of each key must apply.
func (i *Image) applyFilters(filters map[string][]filterFunc) (bool, error) {
for key := range filters { // and
matches := false
for _, filter := range filters[key] { // or
match, err := filter(image)
match, err := filter(i)
if err != nil {
// Some images may have been corrupted in the
// meantime, so do an extra check and make the
// error non-fatal (see containers/podman/issues/12582).
if errCorrupted := i.isCorrupted(""); errCorrupted != nil {
logrus.Errorf(errCorrupted.Error())
return false, nil
}
return false, err
}
if match {
@ -50,13 +58,13 @@ func (r *Runtime) filterImages(ctx context.Context, images []*Image, options *Li
return nil, err
}
result := []*Image{}
for _, i := range images {
match, err := matches(i, filters)
for i := range images {
match, err := images[i].applyFilters(filters)
if err != nil {
return nil, err
}
if match {
result = append(result, i)
result = append(result, images[i])
}
}
return result, nil