This replaces the visitAll recursive function with a test that verifies that the option is set for all commands and subcommands, so that it doesn't have to be modified at runtime. We currently still have to loop over all functions for the setValidateArgs call, but that can be looked at separately. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
74 lines
2.0 KiB
Go
74 lines
2.0 KiB
Go
package secret
|
|
|
|
import (
|
|
"context"
|
|
"sort"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/formatter"
|
|
flagsHelper "github.com/docker/cli/cli/flags"
|
|
"github.com/docker/cli/opts"
|
|
"github.com/fvbommel/sortorder"
|
|
"github.com/moby/moby/client"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type listOptions struct {
|
|
quiet bool
|
|
format string
|
|
filter opts.FilterOpt
|
|
}
|
|
|
|
func newSecretListCommand(dockerCLI command.Cli) *cobra.Command {
|
|
options := listOptions{filter: opts.NewFilterOpt()}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "ls [OPTIONS]",
|
|
Aliases: []string{"list"},
|
|
Short: "List secrets",
|
|
Args: cli.NoArgs,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return runSecretList(cmd.Context(), dockerCLI, options)
|
|
},
|
|
ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
|
return completeNames(dockerCLI)(cmd, args, toComplete)
|
|
},
|
|
DisableFlagsInUseLine: true,
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only display IDs")
|
|
flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
|
|
flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runSecretList(ctx context.Context, dockerCLI command.Cli, options listOptions) error {
|
|
apiClient := dockerCLI.Client()
|
|
|
|
secrets, err := apiClient.SecretList(ctx, client.SecretListOptions{Filters: options.filter.Value()})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
format := options.format
|
|
if len(format) == 0 {
|
|
if len(dockerCLI.ConfigFile().SecretFormat) > 0 && !options.quiet {
|
|
format = dockerCLI.ConfigFile().SecretFormat
|
|
} else {
|
|
format = formatter.TableFormatKey
|
|
}
|
|
}
|
|
|
|
sort.Slice(secrets, func(i, j int) bool {
|
|
return sortorder.NaturalLess(secrets[i].Spec.Name, secrets[j].Spec.Name)
|
|
})
|
|
|
|
secretCtx := formatter.Context{
|
|
Output: dockerCLI.Out(),
|
|
Format: newFormat(format, options.quiet),
|
|
}
|
|
return formatWrite(secretCtx, secrets)
|
|
}
|