Merge pull request #6326 from Benehiko/command/plugin

Unexport plugin commands

Author: Benehiko

cli/command/commands/commands.go

@@ -71,6 +71,7 @@ func AddCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		manifest.NewManifestCommand(dockerCli),
 		//nolint:staticcheck // TODO: Remove when migration to cli/internal/commands.Register is complete. (see #6283)
 		network.NewNetworkCommand(dockerCli),
+		//nolint:staticcheck // TODO: Remove when migration to cli/internal/commands.Register is complete. (see #6283)
 		plugin.NewPluginCommand(dockerCli),
 		//nolint:staticcheck // TODO: Remove when migration to cli/internal/commands.Register is complete. (see #6283)
 		system.NewSystemCommand(dockerCli),

cli/command/plugin/cmd.go

@@ -7,26 +7,33 @@ import (
 )
 
 // NewPluginCommand returns a cobra command for `plugin` subcommands
-func NewPluginCommand(dockerCli command.Cli) *cobra.Command {
+//
+// Deprecated: Do not import commands directly. They will be removed in a future release.
+func NewPluginCommand(dockerCLI command.Cli) *cobra.Command {
+	return newPluginCommand(dockerCLI)
+}
+
+// newPluginCommand returns a cobra command for `plugin` subcommands
+func newPluginCommand(dockerCLI command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:         "plugin",
 		Short:       "Manage plugins",
 		Args:        cli.NoArgs,
-		RunE:        command.ShowHelp(dockerCli.Err()),
+		RunE:        command.ShowHelp(dockerCLI.Err()),
 		Annotations: map[string]string{"version": "1.25"},
 	}
 
 	cmd.AddCommand(
-		newDisableCommand(dockerCli),
-		newEnableCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newInstallCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newSetCommand(dockerCli),
-		newPushCommand(dockerCli),
-		newCreateCommand(dockerCli),
-		newUpgradeCommand(dockerCli),
+		newDisableCommand(dockerCLI),
+		newEnableCommand(dockerCLI),
+		newInspectCommand(dockerCLI),
+		newInstallCommand(dockerCLI),
+		newListCommand(dockerCLI),
+		newRemoveCommand(dockerCLI),
+		newSetCommand(dockerCLI),
+		newPushCommand(dockerCLI),
+		newCreateCommand(dockerCLI),
+		newUpgradeCommand(dockerCLI),
 	)
 	return cmd
 }