Port over some of clibase

ammario · ammario · commit a57639b34fd5 · 2023-03-09T20:35:47.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/server.go b/cli/server.go
@@ -94,7 +94,7 @@ func ReadGitAuthProvidersFromEnv(environ []string) ([]codersdk.GitAuthConfig, er
 	sort.Strings(environ)
 
 	var providers []codersdk.GitAuthConfig
-	for _, v := range clibase.EnvsWithPrefix(environ, envPrefix+"GITAUTH_") {
+	for _, v := range clibase.ParseEnviron(environ, envPrefix+"GITAUTH_") {
 		tokens := strings.SplitN(v.Name, "_", 2)
 		if len(tokens) != 2 {
 			return nil, xerrors.Errorf("invalid env var: %s", v.Name)
@@ -184,7 +184,7 @@ func Server(newAPI func(context.Context, *coderd.Options) (*coderd.API, io.Close
 				return xerrors.Errorf("set defaults: %w", err)
 			}
 
-			err = cliOpts.ParseEnv(envPrefix, os.Environ())
+			err = cliOpts.ParseEnv(clibase.ParseEnviron(os.Environ(), envPrefix))
 			if err != nil {
 				return xerrors.Errorf("parse env: %w", err)
 			}

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`