From c003ed1f35ebcfcf95079df3ed45cf9f8d14334a Mon Sep 17 00:00:00 2001 From: Silvin Lubecki Date: Fri, 1 Jun 2018 14:58:43 +0200 Subject: [PATCH] Added a "top-level" annotation to hide persistent flags in all sub-commands, excepting some specific commands, while printing help Fixes issue #1099 Signed-off-by: Silvin Lubecki --- cmd/docker/docker.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go index f20530dac5..4b3c46390b 100644 --- a/cmd/docker/docker.go +++ b/cmd/docker/docker.go @@ -54,6 +54,7 @@ func newDockerCommand(dockerCli *command.DockerCli) *cobra.Command { // Install persistent flags persistentFlags := cmd.PersistentFlags() persistentFlags.StringVar(&opts.Common.Orchestrator, "orchestrator", "", "Orchestrator to use (swarm|kubernetes|all)") + persistentFlags.SetAnnotation("orchestrator", "top-level", []string{"version", "stack"}) setFlagErrorFunc(dockerCli, cmd, flags, opts) @@ -245,6 +246,12 @@ func hideUnsupportedFeatures(cmd *cobra.Command, details versionDetails) { if !isOSTypeSupported(f, osType) || !isVersionSupported(f, clientVersion) { f.Hidden = true } + // root command shows all top-level flags + if cmd.Parent() != nil { + if commands, ok := f.Annotations["top-level"]; ok { + f.Hidden = !findCommand(cmd, commands) + } + } }) for _, subcmd := range cmd.Commands() { @@ -259,6 +266,19 @@ func hideUnsupportedFeatures(cmd *cobra.Command, details versionDetails) { } } +// Checks if a command or one of its ancestors is in the list +func findCommand(cmd *cobra.Command, commands []string) bool { + if cmd == nil { + return false + } + for _, c := range commands { + if c == cmd.Name() { + return true + } + } + return findCommand(cmd.Parent(), commands) +} + func isSupported(cmd *cobra.Command, details versionDetails) error { if err := areSubcommandsSupported(cmd, details); err != nil { return err