Fix filtering in volume prune and ls

Fixes: #26786

Signed-off-by: Šimon Brauner <sbrauner@redhat.com>

Author: simonbrauner

docs/source/markdown/options/filter.volume-ls.md

@@ -5,9 +5,13 @@
 #### **--filter**, **-f**=*filter*
 
 Filter what volumes are shown in the output.
-Multiple filters can be given with multiple uses of the --filter flag.
-Filters with the same key work inclusive, with the only exception being `label`
-which is exclusive. Filters with different keys always work exclusive.
+
+The *filters* argument format is of `key=value`. If there is more than one *filter*, then pass multiple OPTIONS: **--filter** *foo=bar* **--filter** *bif=baz*.
+
+Filters with different `keys` are combined with `AND`.
+Filters with the same `key` are combined with `OR`,
+with the only exceptions being `label` and `label!`,
+which are combined with `AND`.
 
 Volumes can be filtered by the following attributes:
 
@@ -23,3 +27,7 @@ Volumes can be filtered by the following attributes:
 | scope       | Filters volume by scope                                                               |
 | after/since | Filter by volumes created after the given VOLUME (name or tag)                        |
 | until       | Filter by volumes created before given timestamp                                      |
+
+The `label` *filter* accepts two formats. One is the `label`=*key* or `label`=*key*=*value*, which removes volumes with the specified labels. The other format is the `label!`=*key* or `label!`=*key*=*value*, which removes volumes without the specified labels.
+
+The `until` *filter* can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. 10m, 1h30m) computed relative to the machine's time.

docs/source/markdown/podman-volume-prune.1.md

@@ -27,6 +27,11 @@ Provide filter values.
 
 The *filters* argument format is of `key=value`. If there is more than one *filter*, then pass multiple OPTIONS: **--filter** *foo=bar* **--filter** *bif=baz*.
 
+Filters with different `keys` are combined with `AND`.
+Filters with the same `key` are combined with `OR`,
+with the only exceptions being `label` and `label!`,
+which are combined with `AND`.
+
 Supported filters:
 
 | Filter      | Description                                                                                                |

libpod/runtime_volume.go

@@ -71,7 +71,7 @@ func (r *Runtime) HasVolume(name string) (bool, error) {
 // Volumes retrieves all volumes
 // Filters can be provided which will determine which volumes are included in the
 // output. If multiple filters are used, a volume will be returned if
-// any of the filters are matched
+// all of the filters are matched
 func (r *Runtime) Volumes(filters ...VolumeFilter) ([]*Volume, error) {
 	if !r.valid {
 		return nil, define.ErrRuntimeStopped
@@ -88,9 +88,9 @@ func (r *Runtime) Volumes(filters ...VolumeFilter) ([]*Volume, error) {
 
 	volsFiltered := make([]*Volume, 0, len(vols))
 	for _, vol := range vols {
-		include := false
+		include := true
 		for _, filter := range filters {
-			include = include || filter(vol)
+			include = include && filter(vol)
 		}
 
 		if include {

pkg/domain/filters/containers.go

@@ -32,7 +32,7 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
 		}, nil
 	case "label!":
 		return func(c *libpod.Container) bool {
-			return !filters.MatchLabelFilters(filterValues, c.Labels())
+			return filters.MatchNegatedLabelFilters(filterValues, c.Labels())
 		}, nil
 	case "name":
 		// we only have to match one name
@@ -309,7 +309,7 @@ func GeneratePruneContainerFilterFuncs(filter string, filterValues []string, _ *
 		}, nil
 	case "label!":
 		return func(c *libpod.Container) bool {
-			return !filters.MatchLabelFilters(filterValues, c.Labels())
+			return filters.MatchNegatedLabelFilters(filterValues, c.Labels())
 		}, nil
 	case "until":
 		return prepareUntilFilterFunc(filterValues)
@@ -478,7 +478,11 @@ func GenerateExternalContainerFilterFuncs(filter string, filterValues []string,
 		}, nil
 	case "label":
 		return func(listContainer *types.ListContainer) bool {
-			return !filters.MatchLabelFilters(filterValues, listContainer.Labels)
+			return filters.MatchLabelFilters(filterValues, listContainer.Labels)
+		}, nil
+	case "label!":
+		return func(listContainer *types.ListContainer) bool {
+			return filters.MatchNegatedLabelFilters(filterValues, listContainer.Labels)
 		}, nil
 	case "pod":
 		var pods []*libpod.Pod

pkg/domain/filters/pods.go

@@ -122,7 +122,7 @@ func GeneratePodFilterFunc(filter string, filterValues []string, r *libpod.Runti
 	case "label!":
 		return func(p *libpod.Pod) bool {
 			labels := p.Labels()
-			return !filters.MatchLabelFilters(filterValues, labels)
+			return filters.MatchNegatedLabelFilters(filterValues, labels)
 		}, nil
 	case "until":
 		return func(p *libpod.Pod) bool {

pkg/domain/filters/volumes.go

@@ -35,7 +35,7 @@ func GenerateVolumeFilters(filter string, filterValues []string, runtime *libpod
 		}, nil
 	case "label!":
 		return func(v *libpod.Volume) bool {
-			return !filters.MatchLabelFilters(filterValues, v.Labels())
+			return filters.MatchNegatedLabelFilters(filterValues, v.Labels())
 		}, nil
 	case "opt":
 		return func(v *libpod.Volume) bool {
@@ -101,7 +101,7 @@ func GeneratePruneVolumeFilters(filter string, filterValues []string, runtime *l
 		}, nil
 	case "label!":
 		return func(v *libpod.Volume) bool {
-			return !filters.MatchLabelFilters(filterValues, v.Labels())
+			return filters.MatchNegatedLabelFilters(filterValues, v.Labels())
 		}, nil
 	case "until":
 		return createUntilFilterVolumeFunction(filterValues)

test/e2e/volume_ls_test.go

@@ -189,7 +189,7 @@ var _ = Describe("Podman volume ls", func() {
 
 		vol1Name := session.OutputToString()
 
-		session = podmanTest.Podman([]string{"volume", "create", "--label", "b=c", "--label", "a=b", "vol2"})
+		session = podmanTest.Podman([]string{"volume", "create", "--label", "a=b", "--label", "b=c", "--label", "d=e", "vol2"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
 
@@ -208,11 +208,25 @@ var _ = Describe("Podman volume ls", func() {
 		Expect(session.OutputToStringArray()[0]).To(Equal(vol1Name))
 		Expect(session.OutputToStringArray()[1]).To(Equal(vol2Name))
 
-		session = podmanTest.Podman([]string{"volume", "ls", "-q", "--filter", "label=c=d", "--filter", "label=b=c"})
+		session = podmanTest.Podman([]string{"volume", "ls", "-q", "--filter", "label=b=c", "--filter", "label=c=d"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
 		Expect(session.OutputToStringArray()).To(HaveLen(1))
 		Expect(session.OutputToStringArray()[0]).To(Equal(vol3Name))
+
+		// Filters with label! key
+		session = podmanTest.Podman([]string{"volume", "ls", "-q", "--filter", "label!=c=d", "--filter", "label!=d=e"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(ExitCleanly())
+		Expect(session.OutputToStringArray()).To(HaveLen(1))
+		Expect(session.OutputToStringArray()[0]).To(Equal(vol1Name))
+
+		// Filters with different keys
+		session = podmanTest.Podman([]string{"volume", "ls", "-q", "--filter", "label=b=c", "--filter", "name=vol1"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(ExitCleanly())
+		Expect(session.OutputToStringArray()).To(HaveLen(1))
+		Expect(session.OutputToStringArray()[0]).To(Equal(vol1Name))
 	})
 
 	It("podman ls volume with --filter since/after", func() {