Commita8346bd

authored

feat: Allow unsetting ssh config options from deployment (#6847)

This allows deleting ssh config options

1 parent1176256 commita8346bdCopy full SHA for a8346bd

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (o *sshConfigOptions) addOptions(options ...string) error {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func (o*sshConfigOptions)addOption(optionstring)error {`
`65`		`-key,_,err:=codersdk.ParseSSHConfigOption(option)`
	`65`	`+key,value,err:=codersdk.ParseSSHConfigOption(option)`
`66`	`66`	`iferr!=nil {`
`67`	`67`	`returnerr`
`68`	`68`	`}`
`@@ -77,11 +77,20 @@ func (o *sshConfigOptions) addOption(option string) error {`
`77`	`77`	`continue`
`78`	`78`	`}`
`79`	`79`	`ifstrings.EqualFold(existingKey,key) {`
`80`		`-o.sshOptions[i]=option`
	`80`	`+ifvalue=="" {`
	`81`	`+// Delete existing option.`
	`82`	`+o.sshOptions=append(o.sshOptions[:i],o.sshOptions[i+1:]...)`
	`83`	`+}else {`
	`84`	`+// Override existing option.`
	`85`	`+o.sshOptions[i]=option`
	`86`	`+}`
`81`	`87`	`returnnil`
`82`	`88`	`}`
`83`	`89`	`}`
`84`		`-o.sshOptions=append(o.sshOptions,option)`
	`90`	`+// Only append the option if it is not empty.`
	`91`	`+ifvalue!="" {`
	`92`	`+o.sshOptions=append(o.sshOptions,option)`
	`93`	`+}`
`85`	`94`	`returnnil`
`86`	`95`	`}`
`87`	`96`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,15 @@ func TestConfigSSH(t *testing.T) {`
`66`	`66`
`67`	`67`	`consthostname="test-coder."`
`68`	`68`	`constexpectedKey="ConnectionAttempts"`
	`69`	`+constremoveKey="ConnectionTimeout"`
`69`	`70`	`client:=coderdtest.New(t,&coderdtest.Options{`
`70`	`71`	`IncludeProvisionerDaemon:true,`
`71`	`72`	`ConfigSSH: codersdk.SSHConfigResponse{`
`72`	`73`	`HostnamePrefix:hostname,`
`73`	`74`	`SSHConfigOptions:map[string]string{`
`74`	`75`	`// Something we can test for`
`75`	`76`	`expectedKey:"3",`
	`77`	`+removeKey:"",`
`76`	`78`	`},`
`77`	`79`	`},`
`78`	`80`	`})`
`@@ -176,6 +178,7 @@ func TestConfigSSH(t *testing.T) {`
`176`	`178`	`fileContents,err:=os.ReadFile(sshConfigFile)`
`177`	`179`	`require.NoError(t,err,"read ssh config file")`
`178`	`180`	`require.Contains(t,string(fileContents),expectedKey,"ssh config file contains expected key")`
	`181`	`+require.NotContains(t,string(fileContents),removeKey,"ssh config file should not have removed key")`
`179`	`182`
`180`	`183`	`home:=filepath.Dir(filepath.Dir(sshConfigFile))`
`181`	`184`	`// #nosec`

Comments

(0)