From 02fda07211c6125410e6aa2f9bb2641852a5db37 Mon Sep 17 00:00:00 2001
From: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:40:26 +0200
Subject: [PATCH] Unexport manifest command

This patch deprecates exported manifest commands and moves the implementation
details to an unexported function.

Commands that are affected include:

- manifest.NewManifestCommand

Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
---
 cli/command/commands/commands.go |  1 +
 cli/command/manifest/cmd.go      | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cli/command/commands/commands.go b/cli/command/commands/commands.go
index 8abe3a3ac4..9a9e863156 100644
--- a/cli/command/commands/commands.go
+++ b/cli/command/commands/commands.go
@@ -63,6 +63,7 @@ func AddCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		context.NewContextCommand(dockerCli),
 		//nolint:staticcheck // TODO: Remove when migration to cli/internal/commands.Register is complete. (see #6283)
 		image.NewImageCommand(dockerCli),
+		//nolint:staticcheck // TODO: Remove when migration to cli/internal/commands.Register is complete. (see #6283)
 		manifest.NewManifestCommand(dockerCli),
 		network.NewNetworkCommand(dockerCli),
 		plugin.NewPluginCommand(dockerCli),
diff --git a/cli/command/manifest/cmd.go b/cli/command/manifest/cmd.go
index 939f02b7bc..46d1b0d668 100644
--- a/cli/command/manifest/cmd.go
+++ b/cli/command/manifest/cmd.go
@@ -10,7 +10,14 @@ import (
 )
 
 // NewManifestCommand returns a cobra command for `manifest` subcommands
-func NewManifestCommand(dockerCli command.Cli) *cobra.Command {
+//
+// Deprecated: Do not import commands directly. They will be removed in a future release.
+func NewManifestCommand(dockerCLI command.Cli) *cobra.Command {
+	return newManifestCommand(dockerCLI)
+}
+
+// newManifestCommand returns a cobra command for `manifest` subcommands
+func newManifestCommand(dockerCLI command.Cli) *cobra.Command {
 	// use dockerCli as command.Cli
 	cmd := &cobra.Command{
 		Use:   "manifest COMMAND",
@@ -18,16 +25,16 @@ func NewManifestCommand(dockerCli command.Cli) *cobra.Command {
 		Long:  manifestDescription,
 		Args:  cli.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			_, _ = fmt.Fprint(dockerCli.Err(), "\n"+cmd.UsageString())
+			_, _ = fmt.Fprint(dockerCLI.Err(), "\n"+cmd.UsageString())
 		},
 		Annotations: map[string]string{"experimentalCLI": ""},
 	}
 	cmd.AddCommand(
-		newCreateListCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newAnnotateCommand(dockerCli),
-		newPushListCommand(dockerCli),
-		newRmManifestListCommand(dockerCli),
+		newCreateListCommand(dockerCLI),
+		newInspectCommand(dockerCLI),
+		newAnnotateCommand(dockerCLI),
+		newPushListCommand(dockerCLI),
+		newRmManifestListCommand(dockerCLI),
 	)
 	return cmd
 }