From 5923656f321a9ca7b222c81cdb5f3387cc7cd3ad Mon Sep 17 00:00:00 2001 From: Baron Lenardson Date: Mon, 21 Dec 2020 10:35:21 -0600 Subject: Add volume filters to system prune This change was missed in pull/8689. Now that volume pruneing supports filters system pruneing can pass its filters down to the volume pruneing. Additionally this change adds tests for the following components * podman system prune subcommand with `--volumes` & `--filter` options * apiv2 api tests for `/system/` and `/libpod/system` endpoints Relates to #8453, #8672 Signed-off-by: Baron Lenardson --- pkg/domain/entities/system.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/domain/entities') diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index 5266dc4cf..d5118f6a8 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -17,9 +17,9 @@ type ServiceOptions struct { // SystemPruneOptions provides options to prune system. type SystemPruneOptions struct { - All bool - Volume bool - ContainerPruneOptions + All bool + Volume bool + Filters map[string][]string `json:"filters" schema:"filters"` } // SystemPruneReport provides report after system prune is executed. -- cgit v1.2.3-54-g00ecf