Port over some of clibase

ammario · ammario · commit 9ad3e7053c0f · 2023-03-09T19:56:25.000Z
diff --git a/cli/clibase/cmd.go b/cli/clibase/cmd.go
@@ -185,6 +185,7 @@ func (i *Invokation) run(state *runState) error {
 
 	if i.parsedFlags == nil {
 		i.parsedFlags = pflag.NewFlagSet(i.Command.Name(), pflag.ContinueOnError)
+		// We handle Usage ourselves.
 		i.parsedFlags.Usage = func() {}
 	}
 
diff --git a/cli/clibase/cmd_test.go b/cli/clibase/cmd_test.go
@@ -349,24 +349,3 @@ func TestCommand_HyphenHypen(t *testing.T) {
 
 	require.Equal(t, "--verbose --friendly", stdio.Stdout.String())
 }
-
-func TestCommand_Help(t *testing.T) {
-	t.Parallel()
-
-	cmd := &clibase.Cmd{
-		Options: []clibase.Option{
-			{
-				Flag: "superautopets",
-			},
-		},
-		Handler: func(i *clibase.Invokation) error {
-			t.Fatalf("should not be called")
-			return nil
-		},
-	}
-
-	inv, stdio := clibasetest.Invoke(cmd, "-h")
-	err := inv.Run()
-	require.NoError(t, err)
-	require.Contains(t, stdio.Stdout.String(), "superautopets")
-}
diff --git a/cli/clibase/option_test.go b/cli/clibase/option_test.go
@@ -111,7 +111,9 @@ func TestOptionSet_ParseEnv(t *testing.T) {
 		err := os.SetDefaults()
 		require.NoError(t, err)
 
-		err = os.ParseEnv("CODER_", []string{"CODER_WORKSPACE_NAME="})
+		err = os.ParseEnv(
+			clibase.ParseEnviron([]string{"CODER_WORKSPACE_NAME="}, "CODER_"),
+		)
 		require.NoError(t, err)
 		require.EqualValues(t, "defname", workspaceName)
 	})

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ func (i Invokation) run(state runState) error {`
`185`	`185`
`186`	`186`	`if i.parsedFlags == nil {`
`187`	`187`	`i.parsedFlags = pflag.NewFlagSet(i.Command.Name(), pflag.ContinueOnError)`
	`188`	`+ // We handle Usage ourselves.`
`188`	`189`	`i.parsedFlags.Usage = func() {}`
`189`	`190`	`}`
`190`	`191`