Commit697b30e

committed

Fix equals being lost in SSH config value

This was causing issues with the header flag as those contain equalsigns.

1 parent8193a11 commit697b30eCopy full SHA for 697b30e

File tree

+16

-4

lines changed

+16

-4

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,13 @@`
`35`	`35`	`}],`
`36`	`36`	`"import/no-unresolved": ["error", {`
`37`	`37`	`"ignore": ["vscode"]`
`38`		`- }]`
	`38`	`+ }],`
	`39`	`+"@typescript-eslint/no-unused-vars": [`
	`40`	`+"error",`
	`41`	`+ {`
	`42`	`+"varsIgnorePattern":"^_"`
	`43`	`+ }`
	`44`	`+ ]`
`39`	`45`	`},`
`40`	`46`	`"ignorePatterns": [`
`41`	`47`	`"out",`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,14 @@ it("computes the config for a host", () => {`
`29`	`29`	`Host coder-vscode--*`
`30`	`30`	`StrictHostKeyChecking no`
`31`	`31`	`Another=true`
	`32`	`+ ProxyCommand=/tmp/coder --header="X-FOO=bar" coder.dev`
`32`	`33`	`# --- END CODER VSCODE ---`
`33`	`34`	`,
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`expect(properties).toEqual({`
`37`	`38`	`Another:"true",`
`38`	`39`	`StrictHostKeyChecking:"yes",`
	`40`	`+ProxyCommand:'/tmp/coder --header="X-FOO=bar" coder.dev',`
`39`	`41`	`})`
`40`	`42`	`})`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,11 @@ export function computeSSHProperties(host: string, config: string): Record<strin`
`52`	`52`	`if(line===""){`
`53`	`53`	`return`
`54`	`54`	`}`
`55`		`-const[key, ...valueParts]=line.split(/\s+\|=/)`
	`55`	`+// The capture group here will include the captured portion in the array`
	`56`	`+// which we need to join them back up with their original values. The first`
	`57`	`+// separate is ignored since it splits the key and value but is not part of`
	`58`	`+// the value itself.`
	`59`	`+const[key,_, ...valueParts]=line.split(/(\s+\|=)/)`
`56`	`60`	`if(key.startsWith("#")){`
`57`	`61`	`// Ignore comments!`
`58`	`62`	`return`
`@@ -62,15 +66,15 @@ export function computeSSHProperties(host: string, config: string): Record<strin`
`62`	`66`	`configs.push(currentConfig)`
`63`	`67`	`}`
`64`	`68`	`currentConfig={`
`65`		`-Host:valueParts.join(""),`
	`69`	`+Host:valueParts.join(""),`
`66`	`70`	`properties:{},`
`67`	`71`	`}`
`68`	`72`	`return`
`69`	`73`	`}`
`70`	`74`	`if(!currentConfig){`
`71`	`75`	`return`
`72`	`76`	`}`
`73`		`-currentConfig.properties[key]=valueParts.join("")`
	`77`	`+currentConfig.properties[key]=valueParts.join("")`
`74`	`78`	`})`
`75`	`79`	`if(currentConfig){`
`76`	`80`	`configs.push(currentConfig)`

Comments

(0)