Commitf6a8670

committed

Port over some of clibase

1 parent2ad1d62 commitf6a8670Copy full SHA for f6a8670

File tree

-23

lines changed

-23

lines changed

Lines changed: 1 addition & 0 deletions

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`	`ifi.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`

Lines changed: 0 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -349,24 +349,3 @@ func TestCommand_HyphenHypen(t *testing.T) {`
`349`	`349`
`350`	`350`	`require.Equal(t,"--verbose --friendly",stdio.Stdout.String())`
`351`	`351`	`}`
`352`		`-`
`353`		`-funcTestCommand_Help(t*testing.T) {`
`354`		`-t.Parallel()`
`355`		`-`
`356`		`-cmd:=&clibase.Cmd{`
`357`		`-Options: []clibase.Option{`
`358`		`-{`
`359`		`-Flag:"superautopets",`
`360`		`-},`
`361`		`-},`
`362`		`-Handler:func(i*clibase.Invokation)error {`
`363`		`-t.Fatalf("should not be called")`
`364`		`-returnnil`
`365`		`-},`
`366`		`-}`
`367`		`-`
`368`		`-inv,stdio:=clibasetest.Invoke(cmd,"-h")`
`369`		`-err:=inv.Run()`
`370`		`-require.NoError(t,err)`
`371`		`-require.Contains(t,stdio.Stdout.String(),"superautopets")`
`372`		`-}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func ReadGitAuthProvidersFromEnv(environ []string) ([]codersdk.GitAuthConfig, er`
`94`	`94`	`sort.Strings(environ)`
`95`	`95`
`96`	`96`	`varproviders []codersdk.GitAuthConfig`
`97`		`-for_,v:=rangeclibase.EnvsWithPrefix(environ,envPrefix+"GITAUTH_") {`
	`97`	`+for_,v:=rangeclibase.ParseEnviron(environ,envPrefix+"GITAUTH_") {`
`98`	`98`	`tokens:=strings.SplitN(v.Name,"_",2)`
`99`	`99`	`iflen(tokens)!=2 {`
`100`	`100`	`returnnil,xerrors.Errorf("invalid env var: %s",v.Name)`
`@@ -184,7 +184,7 @@ func Server(newAPI func(context.Context, coderd.Options) (coderd.API, io.Close`
`184`	`184`	`returnxerrors.Errorf("set defaults: %w",err)`
`185`	`185`	`}`
`186`	`186`
`187`		`-err=cliOpts.ParseEnv(envPrefix,os.Environ())`
	`187`	`+err=cliOpts.ParseEnv(clibase.ParseEnviron(os.Environ(),envPrefix))`
`188`	`188`	`iferr!=nil {`
`189`	`189`	`returnxerrors.Errorf("parse env: %w",err)`
`190`	`190`	`}`

Comments

(0)