feat(configssh): add any provided header command to the SSH config also

JoshVee · JoshVee · commit 42a751256c55 · 2023-10-20T09:26:14.000+11:00
diff --git a/cli/configssh.go b/cli/configssh.go
@@ -388,13 +388,18 @@ func (r *RootCmd) configSSH() *clibase.Cmd {
 					}
 
 					if !skipProxyCommand {
+						rootFlags := fmt.Sprintf("--global-config %s", escapedGlobalConfig)
+						if r.headerCommand != "" {
+							rootFlags += fmt.Sprintf(" --header-command %s", r.headerCommand)
+						}
+
 						flags := ""
 						if sshConfigOpts.waitEnum != "auto" {
 							flags += " --wait=" + sshConfigOpts.waitEnum
 						}
 						defaultOptions = append(defaultOptions, fmt.Sprintf(
-							"ProxyCommand %s --global-config %s ssh --stdio%s %s",
-							escapedCoderBinary, escapedGlobalConfig, flags, workspaceHostname,
+							"ProxyCommand %s %s ssh --stdio%s %s",
+							escapedCoderBinary, rootFlags, flags, workspaceHostname,
 						))
 					}
 
diff --git a/cli/configssh_test.go b/cli/configssh_test.go
@@ -585,6 +585,20 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
 				regexMatch: "ProxyCommand /foo/bar/coder",
 			},
 		},
+		{
+			name: "Header command",
+			args: []string{
+				"--header-command", "/foo/bar/coder",
+			},
+			wantErr: false,
+			echoResponse: &echo.Responses{
+				Parse:          echo.ParseComplete,
+				ProvisionApply: echo.ProvisionApplyWithAgent(""),
+			},
+			wantConfig: wantConfig{
+				regexMatch: "--header-command /foo/bar/coder ssh",
+			},
+		},
 	}
 	for _, tt := range tests {
 		tt := tt

Original file line number	Diff line number	Diff line change
`@@ -388,13 +388,18 @@ func (r RootCmd) configSSH() clibase.Cmd {`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if !skipProxyCommand {`
	`391`	`+ rootFlags := fmt.Sprintf("--global-config %s", escapedGlobalConfig)`
	`392`	`+ if r.headerCommand != "" {`
	`393`	`+ rootFlags += fmt.Sprintf(" --header-command %s", r.headerCommand)`
	`394`	`+ }`
	`395`	`+`
`391`	`396`	`flags := ""`
`392`	`397`	`if sshConfigOpts.waitEnum != "auto" {`
`393`	`398`	`flags += " --wait=" + sshConfigOpts.waitEnum`
`394`	`399`	`}`
`395`	`400`	`defaultOptions = append(defaultOptions, fmt.Sprintf(`
`396`		`- "ProxyCommand %s --global-config %s ssh --stdio%s %s",`
`397`		`- escapedCoderBinary, escapedGlobalConfig, flags, workspaceHostname,`
	`401`	`+ "ProxyCommand %s %s ssh --stdio%s %s",`
	`402`	`+ escapedCoderBinary, rootFlags, flags, workspaceHostname,`
`398`	`403`	`))`
`399`	`404`	`}`
`400`	`405`