Commit4c29770

authored

fix: treat empty env as defaults (#6538)

1 parent62a64d5 commit4c29770Copy full SHA for 4c29770

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,12 @@ func (s *OptionSet) ParseEnv(globalPrefix string, environ []string) error {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`envVal,ok:=envs[opt.Env]`
`110`		`-if!ok {`
	`110`	`+// Currently, empty values are treated as if the environment variable is`
	`111`	`+// unset. This behavior is technically not correct as there is now no`
	`112`	`+// way for a user to change a Default value to an empty string from`
	`113`	`+// the environment. Unfortunately, we have old configuration files`
	`114`	`+// that rely on the faulty behavior.`
	`115`	`+if!ok\|\|envVal=="" {`
`111`	`116`	`continue`
`112`	`117`	`}`
`113`	`118`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,26 @@ func TestOptionSet_ParseEnv(t *testing.T) {`
`91`	`91`	`require.NoError(t,err)`
`92`	`92`	`require.EqualValues(t,"foo",workspaceName)`
`93`	`93`	`})`
	`94`	`+`
	`95`	`+t.Run("EmptyValue",func(t*testing.T) {`
	`96`	`+t.Parallel()`
	`97`	`+`
	`98`	`+varworkspaceName clibase.String`
	`99`	`+`
	`100`	`+os:= clibase.OptionSet{`
	`101`	`+clibase.Option{`
	`102`	`+Name:"Workspace Name",`
	`103`	`+Value:&workspaceName,`
	`104`	`+Default:"defname",`
	`105`	`+Env:"WORKSPACE_NAME",`
	`106`	`+},`
	`107`	`+}`
	`108`	`+`
	`109`	`+err:=os.SetDefaults()`
	`110`	`+require.NoError(t,err)`
	`111`	`+`
	`112`	`+err=os.ParseEnv("CODER_", []string{"CODER_WORKSPACE_NAME="})`
	`113`	`+require.NoError(t,err)`
	`114`	`+require.EqualValues(t,"defname",workspaceName)`
	`115`	`+})`
`94`	`116`	`}`

Comments

(0)