Merge pull request #6335 from thaJeztah/rm_exported_cobra_funcs

cli/command/*: remove deprecated cobra command constructors

Author: thaJeztah

cli/command/builder/cmd.go

@@ -16,13 +16,7 @@ func init() {
 	})
 }
 
-// NewBuilderCommand returns a cobra command for `builder` subcommands
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewBuilderCommand(dockerCLI command.Cli) *cobra.Command {
-	return newBuilderCommand(dockerCLI)
-}
-
+// newBuilderCommand returns a cobra command for `builder` subcommands
 func newBuilderCommand(dockerCLI command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:         "builder",
@@ -40,16 +34,10 @@ func newBuilderCommand(dockerCLI command.Cli) *cobra.Command {
 	return cmd
 }
 
-// NewBakeStubCommand returns a cobra command "stub" for the "bake" subcommand.
+// newBakeStubCommand returns a cobra command "stub" for the "bake" subcommand.
 // This command is a placeholder / stub that is dynamically replaced by an
 // alias for "docker buildx bake" if BuildKit is enabled (and the buildx plugin
 // installed).
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewBakeStubCommand(dockerCLI command.Streams) *cobra.Command {
-	return newBakeStubCommand(dockerCLI)
-}
-
 func newBakeStubCommand(dockerCLI command.Streams) *cobra.Command {
 	return &cobra.Command{
 		Use:   "bake [OPTIONS] [TARGET...]",

cli/command/checkpoint/cmd.go

@@ -11,13 +11,7 @@ func init() {
 	commands.Register(newCheckpointCommand)
 }
 
-// NewCheckpointCommand returns the `checkpoint` subcommand (only in experimental)
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewCheckpointCommand(dockerCLI command.Cli) *cobra.Command {
-	return newCheckpointCommand(dockerCLI)
-}
-
+// newCheckpointCommand returns the `checkpoint` subcommand (only in experimental)
 func newCheckpointCommand(dockerCLI command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "checkpoint",

cli/command/config/cmd.go

@@ -13,13 +13,7 @@ func init() {
 	commands.Register(newConfigCommand)
 }
 
-// NewConfigCommand returns a cobra command for `config` subcommands
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewConfigCommand(dockerCLI command.Cli) *cobra.Command {
-	return newConfigCommand(dockerCLI)
-}
-
+// newConfigCommand returns a cobra command for `config` subcommands
 func newConfigCommand(dockerCLI command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "config",

cli/command/container/attach.go

@@ -40,13 +40,7 @@ func inspectContainerAndCheckState(ctx context.Context, apiClient client.APIClie
 	return &c, nil
 }
 
-// NewAttachCommand creates a new cobra.Command for `docker attach`
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewAttachCommand(dockerCLI command.Cli) *cobra.Command {
-	return newAttachCommand(dockerCLI)
-}
-
+// newAttachCommand creates a new cobra.Command for `docker attach`
 func newAttachCommand(dockerCLI command.Cli) *cobra.Command {
 	var opts AttachOptions
 

cli/command/container/cmd.go

@@ -34,13 +34,7 @@ func init() {
 	commands.RegisterLegacy(newWaitCommand)
 }
 
-// NewContainerCommand returns a cobra command for `container` subcommands
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewContainerCommand(dockerCLI command.Cli) *cobra.Command {
-	return newContainerCommand(dockerCLI)
-}
-
+// newContainerCommand returns a cobra command for `container` subcommands
 func newContainerCommand(dockerCLI command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "container",

cli/command/container/commit.go

@@ -22,13 +22,7 @@ type commitOptions struct {
 	changes opts.ListOpts
 }
 
-// NewCommitCommand creates a new cobra.Command for `docker commit`
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewCommitCommand(dockerCLI command.Cli) *cobra.Command {
-	return newCommitCommand(dockerCLI)
-}
-
+// newCommitCommand creates a new cobra.Command for `docker commit`
 func newCommitCommand(dockerCLI command.Cli) *cobra.Command {
 	var options commitOptions
 

cli/command/container/cp.go

@@ -121,13 +121,7 @@ func copyProgress(ctx context.Context, dst io.Writer, header string, total *int6
 	return restore, done
 }
 
-// NewCopyCommand creates a new `docker cp` command
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewCopyCommand(dockerCLI command.Cli) *cobra.Command {
-	return newCopyCommand(dockerCLI)
-}
-
+// newCopyCommand creates a new `docker cp` command
 func newCopyCommand(dockerCLI command.Cli) *cobra.Command {
 	var opts copyOptions
 

cli/command/container/create.go

@@ -51,13 +51,7 @@ type createOptions struct {
 	useAPISocket bool
 }
 
-// NewCreateCommand creates a new cobra.Command for `docker create`
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewCreateCommand(dockerCLI command.Cli) *cobra.Command {
-	return newCreateCommand(dockerCLI)
-}
-
+// newCreateCommand creates a new cobra.Command for `docker create`
 func newCreateCommand(dockerCLI command.Cli) *cobra.Command {
 	var options createOptions
 	var copts *containerOptions

cli/command/container/diff.go

@@ -10,13 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// NewDiffCommand creates a new cobra.Command for `docker diff`
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewDiffCommand(dockerCLI command.Cli) *cobra.Command {
-	return newDiffCommand(dockerCLI)
-}
-
+// newDiffCommand creates a new cobra.Command for `docker diff`
 func newDiffCommand(dockerCLI command.Cli) *cobra.Command {
 	return &cobra.Command{
 		Use:   "diff CONTAINER",

cli/command/container/exec.go

@@ -39,13 +39,7 @@ func NewExecOptions() ExecOptions {
 	}
 }
 
-// NewExecCommand creates a new cobra.Command for `docker exec`
-//
-// Deprecated: Do not import commands directly. They will be removed in a future release.
-func NewExecCommand(dockerCLI command.Cli) *cobra.Command {
-	return newExecCommand(dockerCLI)
-}
-
+// newExecCommand creates a new cobra.Command for "docker exec".
 func newExecCommand(dockerCLI command.Cli) *cobra.Command {
 	options := NewExecOptions()