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

thaJeztah · web-flow · commit e6ee7ea94bdd · 2025-02-10T19:02:55.000+01:00
Remove preceding white space from cobra help template
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
`@@ -518,4 +518,4 @@ Run '{{.CommandPath}} COMMAND --help' for more information on a command.`
`518`	`518`	`
`519`	`519`
`520`	`520`	const helpTemplate = `
`521`		-{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
	`521`	+{{- if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`Usage: docker helloworld goodbye`
`3`	`2`
`4`	`3`	`Say Goodbye instead of Hello`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`Usage: docker helloworld [OPTIONS] COMMAND`
`3`	`2`
`4`	`3`	`A basic Hello World plugin for tests`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`Usage: docker stack deploy [OPTIONS] STACK`
`3`	`2`
`4`	`3`	`Deploy a new stack or update an existing stack`