Merge pull request docker#5730 from thelovekesh/update/help-template

Remove preceding white space from cobra help template
thaJeztah · Feb 10, 2025 · e6ee7ea · e6ee7ea
2 parents f7c3d1c + 61a3b4b
commit e6ee7ea
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/cli/cobra.go b/cli/cobra.go
@@ -518,4 +518,4 @@ Run '{{.CommandPath}} COMMAND --help' for more information on a command.
 `
 
 const helpTemplate = `
-{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
+{{- if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
diff --git a/e2e/cli-plugins/testdata/docker-help-helloworld-goodbye.golden b/e2e/cli-plugins/testdata/docker-help-helloworld-goodbye.golden
@@ -1,4 +1,3 @@
-
 Usage:  docker helloworld goodbye
 
 Say Goodbye instead of Hello
diff --git a/e2e/cli-plugins/testdata/docker-help-helloworld.golden b/e2e/cli-plugins/testdata/docker-help-helloworld.golden
@@ -1,4 +1,3 @@
-
 Usage:  docker helloworld [OPTIONS] COMMAND
 
 A basic Hello World plugin for tests

diff --git a/e2e/stack/testdata/stack-deploy-help.golden b/e2e/stack/testdata/stack-deploy-help.golden
@@ -1,4 +1,3 @@
-
 Usage:  docker stack deploy [OPTIONS] STACK
 
 Deploy a new stack or update an existing stack
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		Usage: docker helloworld goodbye

		Say Goodbye instead of Hello
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		Usage: docker helloworld [OPTIONS] COMMAND

		A basic Hello World plugin for tests
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		Usage: docker stack deploy [OPTIONS] STACK

		Deploy a new stack or update an existing stack
Expand Down