From 598e341712506ad4900c1065da899413e6bf343d Mon Sep 17 00:00:00 2001 From: Cory Twitty Date: Fri, 24 Jun 2022 23:33:11 +0000 Subject: [PATCH 1/2] Terraform workspace returns nonzero exit code when given an invalid arg --- internal/command/workspace_command.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/internal/command/workspace_command.go b/internal/command/workspace_command.go index a0f5f542ac..ff2716880f 100644 --- a/internal/command/workspace_command.go +++ b/internal/command/workspace_command.go @@ -15,14 +15,7 @@ type WorkspaceCommand struct { } func (c *WorkspaceCommand) Run(args []string) int { - c.Meta.process(args) - envCommandShowWarning(c.Ui, c.LegacyName) - - 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 { From fa319494d842564b14a716015d7c4cdaccb1f84a Mon Sep 17 00:00:00 2001 From: Cory Twitty Date: Fri, 24 Jun 2022 23:57:44 +0000 Subject: [PATCH 2/2] readd missing extended args for workspace command --- internal/command/workspace_command.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/command/workspace_command.go b/internal/command/workspace_command.go index ff2716880f..7d1d8b24a0 100644 --- a/internal/command/workspace_command.go +++ b/internal/command/workspace_command.go @@ -15,6 +15,12 @@ type WorkspaceCommand struct { } func (c *WorkspaceCommand) Run(args []string) int { + c.Meta.process(args) + envCommandShowWarning(c.Ui, c.LegacyName) + + cmdFlags := c.Meta.extendedFlagSet("workspace") + cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } + return cli.RunResultHelp }