Merge pull request #31318 from twittyc/twittyc/terraformWorkspaceInvalidArgsReturnsNon0

jbardin · web-flow · commit d60d247e4097 · 2022-12-16T13:16:56.000-05:00
Bug fix: Terraform workspace command returns zero exit code when given an invalid argument.
diff --git a/internal/command/workspace_command.go b/internal/command/workspace_command.go
@@ -21,8 +21,7 @@ func (c *WorkspaceCommand) Run(args []string) int {
 	cmdFlags := c.Meta.extendedFlagSet("workspace")
 	cmdFlags.Usage = func() { c.Ui.Error(c.Help()) }
 
-	c.Ui.Output(c.Help())
-	return 0
+	return cli.RunResultHelp
 }
 
 func (c *WorkspaceCommand) Help() string {

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ func (c *WorkspaceCommand) Run(args []string) int {`
`21`	`21`	`cmdFlags := c.Meta.extendedFlagSet("workspace")`
`22`	`22`	`cmdFlags.Usage = func() { c.Ui.Error(c.Help()) }`
`23`	`23`
`24`		`- c.Ui.Output(c.Help())`
`25`		`- return 0`
	`24`	`+ return cli.RunResultHelp`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`func (c *WorkspaceCommand) Help() string {`