From d2b751ce582f2b777e04c0e5279b97e69eb0bf01 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 9 Mar 2025 22:30:05 +0100 Subject: [PATCH] cli/command: PruneFilters: require smaller interface This function only needs access to the CLI's configfile; use the config.Prider interface to be more clear on what's expected. Signed-off-by: Sebastiaan van Stijn --- cli/command/utils.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/command/utils.go b/cli/command/utils.go index 8a8368fbaa..11dc636910 100644 --- a/cli/command/utils.go +++ b/cli/command/utils.go @@ -13,6 +13,7 @@ import ( "runtime" "strings" + "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/streams" "github.com/docker/docker/api/types/filters" mounttypes "github.com/docker/docker/api/types/mount" @@ -166,11 +167,12 @@ func PromptForConfirmation(ctx context.Context, ins io.Reader, outs io.Writer, m } // PruneFilters returns consolidated prune filters obtained from config.json and cli -func PruneFilters(dockerCli Cli, pruneFilters filters.Args) filters.Args { - if dockerCli.ConfigFile() == nil { +func PruneFilters(dockerCLI config.Provider, pruneFilters filters.Args) filters.Args { + cfg := dockerCLI.ConfigFile() + if cfg == nil { return pruneFilters } - for _, f := range dockerCli.ConfigFile().PruneFilters { + for _, f := range cfg.PruneFilters { k, v, ok := strings.Cut(f, "=") if !ok { continue