Move code closer to where it's used

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

cmd/docker-mcp/command.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli-plugins/plugin"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/backup"
@@ -43,7 +44,7 @@ Examples:
 `
 
 // rootCommand returns the root command for the init plugin
-func rootCommand(ctx context.Context, cwd string, docker docker.Client) *cobra.Command {
+func rootCommand(ctx context.Context, cwd string, dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:              "mcp [OPTIONS]",
 		TraverseChildren: true,
@@ -74,15 +75,17 @@ func rootCommand(ctx context.Context, cwd string, docker docker.Client) *cobra.C
 		return []string{"--help"}, cobra.ShellCompDirectiveNoFileComp
 	})
 
-	cmd.AddCommand(secret.NewSecretsCmd(docker))
+	dockerClient := docker.NewClient(dockerCli)
+
+	cmd.AddCommand(secret.NewSecretsCmd(dockerClient))
 	cmd.AddCommand(policy.NewPolicyCmd())
 	cmd.AddCommand(oauth.NewOAuthCmd())
 	cmd.AddCommand(client.NewClientCmd(cwd))
 	cmd.AddCommand(catalog.NewCatalogCmd())
 	cmd.AddCommand(versionCommand())
-	cmd.AddCommand(gatewayCommand(docker))
-	cmd.AddCommand(configCommand(docker))
-	cmd.AddCommand(serverCommand(docker))
+	cmd.AddCommand(gatewayCommand(dockerClient))
+	cmd.AddCommand(configCommand(dockerClient))
+	cmd.AddCommand(serverCommand(dockerClient))
 	cmd.AddCommand(toolsCommand())
 
 	if os.Getenv("DOCKER_MCP_SHOW_HIDDEN") == "1" {

cmd/docker-mcp/main.go

@@ -12,7 +12,6 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/mcp-gateway/cmd/docker-mcp/internal/docker"
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/version"
 )
 
@@ -31,8 +30,7 @@ func main() {
 	}
 
 	plugin.Run(func(dockerCli command.Cli) *cobra.Command {
-		dockerClient := docker.NewClient(dockerCli)
-		return rootCommand(ctx, cwd, dockerClient)
+		return rootCommand(ctx, cwd, dockerCli)
 	},
 		manager.Metadata{
 			SchemaVersion:    "0.1.0",