diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-24 03:10:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 03:10:28 -0700 |
| commit | 0cb306674af4a8740464e57767d6defb020efb8e (patch) | |
| tree | cf047fc93a7f0183b6c3312736ed12b014189114 /pkg/domain/filters/volumes.go | |
| parent | 860de13d4fe530e585c82a87a81fb46f3d0275ef (diff) | |
| parent | 914218c1e8fd0dc11c1caee807bbed0cf26fdaf8 (diff) | |
| download | podman-0cb306674af4a8740464e57767d6defb020efb8e.tar.gz podman-0cb306674af4a8740464e57767d6defb020efb8e.tar.bz2 podman-0cb306674af4a8740464e57767d6defb020efb8e.zip | |
Merge pull request #9785 from jmguzik/unification-of-label-filter
Unification of label and until filters across list/prune endpoints
Diffstat (limited to 'pkg/domain/filters/volumes.go')
| -rw-r--r-- | pkg/domain/filters/volumes.go | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index bc1756cf5..9b2fc5280 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/containers/podman/v3/libpod" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" ) @@ -29,21 +30,9 @@ func GenerateVolumeFilters(filters url.Values) ([]libpod.VolumeFilter, error) { return v.Scope() == scopeVal }) case "label": - filterArray := strings.SplitN(val, "=", 2) - filterKey := filterArray[0] - var filterVal string - if len(filterArray) > 1 { - filterVal = filterArray[1] - } else { - filterVal = "" - } + filter := val vf = append(vf, func(v *libpod.Volume) bool { - for labelKey, labelValue := range v.Labels() { - if labelKey == filterKey && (filterVal == "" || labelValue == filterVal) { - return true - } - } - return false + return util.MatchLabelFilters([]string{filter}, v.Labels()) }) case "opt": filterArray := strings.SplitN(val, "=", 2) |