docker: hide legacy commands

carapace-sh · Jan 6, 2023 · 122e6b5 · 122e6b5
1 parent e3a77fe
commit 122e6b5
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 148 deletions.
diff --git a/completers/docker_completer/cmd/builder.go b/completers/docker_completer/cmd/builder.go
@@ -6,9 +6,10 @@ import (
 )
 
 var builderCmd = &cobra.Command{
-	Use:   "builder",
-	Short: "Manage builds",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "builder",
+	Short:   "Manage builds",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/config.go b/completers/docker_completer/cmd/config.go
@@ -6,9 +6,10 @@ import (
 )
 
 var configCmd = &cobra.Command{
-	Use:   "config",
-	Short: "Manage Docker configs",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "config",
+	Short:   "Manage Docker configs",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/container.go b/completers/docker_completer/cmd/container.go
@@ -6,9 +6,10 @@ import (
 )
 
 var containerCmd = &cobra.Command{
-	Use:   "container",
-	Short: "Manage containers",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "container",
+	Short:   "Manage containers",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/context.go b/completers/docker_completer/cmd/context.go
@@ -6,9 +6,10 @@ import (
 )
 
 var contextCmd = &cobra.Command{
-	Use:   "context",
-	Short: "Manage contexts",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "context",
+	Short:   "Manage contexts",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/engine.go b/completers/docker_completer/cmd/engine.go
diff --git a/completers/docker_completer/cmd/engine_activate.go b/completers/docker_completer/cmd/engine_activate.go
diff --git a/completers/docker_completer/cmd/engine_check.go b/completers/docker_completer/cmd/engine_check.go
diff --git a/completers/docker_completer/cmd/engine_update.go b/completers/docker_completer/cmd/engine_update.go
diff --git a/completers/docker_completer/cmd/image.go b/completers/docker_completer/cmd/image.go
@@ -6,9 +6,10 @@ import (
 )
 
 var imageCmd = &cobra.Command{
-	Use:   "image",
-	Short: "Manage images",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "image",
+	Short:   "Manage images",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/inspect.go b/completers/docker_completer/cmd/inspect.go
@@ -7,9 +7,10 @@ import (
 )
 
 var inspectCmd = &cobra.Command{
-	Use:   "inspect",
-	Short: "Return low-level information on Docker objects",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:    "inspect",
+	Short:  "Return low-level information on Docker objects",
+	Hidden: true, // TODO legacy
+	Run:    func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/network.go b/completers/docker_completer/cmd/network.go
@@ -6,9 +6,10 @@ import (
 )
 
 var networkCmd = &cobra.Command{
-	Use:   "network",
-	Short: "Manage networks",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "network",
+	Short:   "Manage networks",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/node.go b/completers/docker_completer/cmd/node.go
@@ -6,9 +6,10 @@ import (
 )
 
 var nodeCmd = &cobra.Command{
-	Use:   "node",
-	Short: "Manage Swarm nodes",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "node",
+	Short:   "Manage Swarm nodes",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/plugin.go b/completers/docker_completer/cmd/plugin.go
@@ -6,9 +6,10 @@ import (
 )
 
 var pluginCmd = &cobra.Command{
-	Use:   "plugin",
-	Short: "Manage plugins",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "plugin",
+	Short:   "Manage plugins",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/root.go b/completers/docker_completer/cmd/root.go
@@ -24,6 +24,8 @@ func Execute() error {
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 
+	rootCmd.AddGroup(&cobra.Group{ID: "management", Title: "Management Commands"})
+
 	rootCmd.Flags().String("config", "", "Location of client config files (default \"/home/user/.docker\")")
 	rootCmd.Flags().StringP("context", "c", "", "Name of the context to use to connect to the daemon (overrides DOCKER_HOST env var and default context set with \"docker context use\")")
 	rootCmd.Flags().BoolP("debug", "D", false, "Enable debug mode")
@@ -55,6 +57,7 @@ func init() {
 					pluginCmd := &cobra.Command{
 						Use:                name,
 						Short:              description,
+						GroupID:            "management",
 						Run:                func(cmd *cobra.Command, args []string) {},
 						DisableFlagParsing: true,
 					}
@@ -76,6 +79,11 @@ func init() {
 
 func rootAlias(cmd *cobra.Command, initCompletion func(cmd *cobra.Command, isAlias bool)) {
 	aliasCmd := *cmd
+	switch aliasCmd.Name() {
+	case "build", "run":
+	default:
+		aliasCmd.Hidden = true // hide legacy commands
+	}
 	rootCmd.AddCommand(&aliasCmd)
 
 	for i, c := range []*cobra.Command{cmd, &aliasCmd} {

diff --git a/completers/docker_completer/cmd/secret.go b/completers/docker_completer/cmd/secret.go
@@ -6,9 +6,10 @@ import (
 )
 
 var secretCmd = &cobra.Command{
-	Use:   "secret",
-	Short: "Manage Docker secrets",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "secret",
+	Short:   "Manage Docker secrets",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/service.go b/completers/docker_completer/cmd/service.go
@@ -6,9 +6,10 @@ import (
 )
 
 var serviceCmd = &cobra.Command{
-	Use:   "service",
-	Short: "Manage services",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "service",
+	Short:   "Manage services",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/...ters/docker_completer/cmd/docker_stack.go → completers/docker_completer/cmd/stack.go b/...ters/docker_completer/cmd/docker_stack.go → completers/docker_completer/cmd/stack.go
@@ -6,9 +6,10 @@ import (
 )
 
 var stackCmd = &cobra.Command{
-	Use:   "stack",
-	Short: "Manage Docker stacks",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "stack",
+	Short:   "Manage Docker stacks",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/swarm.go b/completers/docker_completer/cmd/swarm.go
@@ -6,9 +6,10 @@ import (
 )
 
 var swarmCmd = &cobra.Command{
-	Use:   "swarm",
-	Short: "Manage Swarm",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "swarm",
+	Short:   "Manage Swarm",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/system.go b/completers/docker_completer/cmd/system.go
@@ -6,9 +6,10 @@ import (
 )
 
 var systemCmd = &cobra.Command{
-	Use:   "system",
-	Short: "Manage Docker",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "system",
+	Short:   "Manage Docker",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/trust.go b/completers/docker_completer/cmd/trust.go
@@ -6,9 +6,10 @@ import (
 )
 
 var trustCmd = &cobra.Command{
-	Use:   "trust",
-	Short: "Manage trust on Docker images",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "trust",
+	Short:   "Manage trust on Docker images",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/docker_completer/cmd/volume.go b/completers/docker_completer/cmd/volume.go
@@ -6,9 +6,10 @@ import (
 )
 
 var volumeCmd = &cobra.Command{
-	Use:   "volume",
-	Short: "Manage volumes",
-	Run:   func(cmd *cobra.Command, args []string) {},
+	Use:     "volume",
+	Short:   "Manage volumes",
+	GroupID: "management",
+	Run:     func(cmd *cobra.Command, args []string) {},
 }
 
 func init() {

diff --git a/completers/rsync_completer/cmd/root.go b/completers/rsync_completer/cmd/root.go
@@ -237,7 +237,7 @@ func init() {
 			return carapace.ActionMultiParts(":", func(c carapace.Context) carapace.Action {
 				switch len(c.Parts) {
 				case 0:
-					return os.ActionUsers().Invoke(c).Suffix(":").ToA()
+					return os.ActionUsers().Suffix(":")
 				default:
 					return carapace.ActionValues()
 				}
@@ -259,11 +259,11 @@ func init() {
 						switch len(c.Parts) {
 						case 0:
 							return carapace.Batch(
-								os.ActionUsers().Invoke(c).Suffix("@").ToA(),
-								net.ActionHosts().Invoke(c).Suffix(":").ToA(),
+								os.ActionUsers().Suffix("@"),
+								net.ActionHosts().Suffix(":"),
 							).ToA()
 						case 1:
-							return net.ActionHosts().Invoke(c).Suffix(":").ToA()
+							return net.ActionHosts().Suffix(":")
 						default:
 							return carapace.ActionValues()
 						}