diff --git a/cli/command/commands/commands.go b/cli/command/commands/commands.go index 7bce95eaf..8c6e93625 100644 --- a/cli/command/commands/commands.go +++ b/cli/command/commands/commands.go @@ -60,6 +60,7 @@ func AddCommands(cmd *cobra.Command, dockerCli command.Cli) { volume.NewVolumeCommand(dockerCli), // orchestration (swarm) commands + //nolint:staticcheck // TODO: Remove when migration to cli/internal/commands.Register is complete. (see #6283) config.NewConfigCommand(dockerCli), node.NewNodeCommand(dockerCli), secret.NewSecretCommand(dockerCli), diff --git a/cli/command/config/cmd.go b/cli/command/config/cmd.go index a183665a6..f7001fa24 100644 --- a/cli/command/config/cmd.go +++ b/cli/command/config/cmd.go @@ -9,22 +9,28 @@ import ( ) // NewConfigCommand returns a cobra command for `config` subcommands -func NewConfigCommand(dockerCli command.Cli) *cobra.Command { +// +// Deprecated: Do not import commands directly. They will be removed in a future release. +func NewConfigCommand(dockerCLI command.Cli) *cobra.Command { + return newConfigCommand(dockerCLI) +} + +func newConfigCommand(dockerCLI command.Cli) *cobra.Command { cmd := &cobra.Command{ Use: "config", Short: "Manage Swarm configs", Args: cli.NoArgs, - RunE: command.ShowHelp(dockerCli.Err()), + RunE: command.ShowHelp(dockerCLI.Err()), Annotations: map[string]string{ "version": "1.30", "swarm": "manager", }, } cmd.AddCommand( - newConfigListCommand(dockerCli), - newConfigCreateCommand(dockerCli), - newConfigInspectCommand(dockerCli), - newConfigRemoveCommand(dockerCli), + newConfigListCommand(dockerCLI), + newConfigCreateCommand(dockerCLI), + newConfigInspectCommand(dockerCLI), + newConfigRemoveCommand(dockerCLI), ) return cmd }