From 62c1231bff97dfecd8d488e260a5b9eaeb7a4968 Mon Sep 17 00:00:00 2001 From: zelahi Date: Tue, 23 Jul 2019 10:15:32 -0700 Subject: [PATCH] Formatted code with gofmt Signed-off-by: zelahi --- commands/prune.go | 93 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/commands/prune.go b/commands/prune.go index 141d7f14..905ae0c8 100644 --- a/commands/prune.go +++ b/commands/prune.go @@ -1,11 +1,11 @@ package commands import ( - "context" + "context" "fmt" "strings" - "github.com/docker/cli/cli" + "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/opts" "github.com/docker/docker/api/types" @@ -14,10 +14,10 @@ import ( ) type pruneOptions struct { - force bool - all bool - filter opts.FilterOpt - keepStorage opts.MemBytes + force bool + all bool + filter opts.FilterOpt + keepStorage opts.MemBytes } const ( @@ -27,40 +27,40 @@ const ( func runPrune(dockerCli command.Cli, options pruneOptions) (spaceReclaimed uint64, output string, err error) { pruneFilters := options.filter.Value() - pruneFilters = command.PruneFilters(dockerCli, pruneFilters) + pruneFilters = command.PruneFilters(dockerCli, pruneFilters) - warning := normalWarning - if options.all { - warning = allCacheWarning - } - if !options.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) { - return 0, "", nil - } + warning := normalWarning + if options.all { + warning = allCacheWarning + } + if !options.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) { + return 0, "", nil + } - report, err := dockerCli.Client().BuildCachePrune(context.Background(), types.BuildCachePruneOptions{ - All: options.all, - KeepStorage: options.keepStorage.Value(), - Filters: pruneFilters, - }) - if err != nil { - return 0, "", err - } + report, err := dockerCli.Client().BuildCachePrune(context.Background(), types.BuildCachePruneOptions{ + All: options.all, + KeepStorage: options.keepStorage.Value(), + Filters: pruneFilters, + }) + if err != nil { + return 0, "", err + } - if len(report.CachesDeleted) > 0 { - var sb strings.Builder - sb.WriteString("Deleted build cache objects:\n") - for _, id := range report.CachesDeleted { - sb.WriteString(id) - sb.WriteByte('\n') - } - output = sb.String() - } + if len(report.CachesDeleted) > 0 { + var sb strings.Builder + sb.WriteString("Deleted build cache objects:\n") + for _, id := range report.CachesDeleted { + sb.WriteString(id) + sb.WriteByte('\n') + } + output = sb.String() + } return report.SpaceReclaimed, output, nil } func pruneCmd(dockerCli command.Cli) *cobra.Command { - options := pruneOptions{filter: opts.NewFilterOpt()} + options := pruneOptions{filter: opts.NewFilterOpt()} cmd := &cobra.Command{ Use: "prune", @@ -68,24 +68,23 @@ func pruneCmd(dockerCli command.Cli) *cobra.Command { Args: cli.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { spaceReclaimed, output, err := runPrune(dockerCli, options) - if err != nil { - return err - } - if output != "" { - fmt.Fprintln(dockerCli.Out(), output) - } - fmt.Fprintln(dockerCli.Out(), "Total reclaimed space:", units.HumanSize(float64(spaceReclaimed))) - return nil + if err != nil { + return err + } + if output != "" { + fmt.Fprintln(dockerCli.Out(), output) + } + fmt.Fprintln(dockerCli.Out(), "Total reclaimed space:", units.HumanSize(float64(spaceReclaimed))) + return nil }, - Annotations: map[string]string{"version":"1.00"}, - + Annotations: map[string]string{"version": "1.00"}, } -flags := cmd.Flags() -flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation") -flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused images, not just dangling ones") -flags.Var(&options.filter, "filter", "Provide filter values (e.g. 'unused-for=24h')") -flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache") + flags := cmd.Flags() + flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation") + flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused images, not just dangling ones") + flags.Var(&options.filter, "filter", "Provide filter values (e.g. 'unused-for=24h')") + flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache") return cmd }