cli/connhelper: raise remote binary evaluation out of dialer context

mattmacleod · mattmacleod · commit 43dd6ea46417 · 2024-11-18T15:27:40.000Z
Signed-off-by: Matthew MacLeod &lt;matt@umm.io&gt;
diff --git a/cli/connhelper/connhelper.go b/cli/connhelper/connhelper.go
@@ -54,9 +54,10 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*ConnectionHelper
 		}
 		sshFlags = addSSHTimeout(sshFlags)
 		sshFlags = disablePseudoTerminalAllocation(sshFlags)
+		remoteDockerBinary := dockerSSHRemoteBinary()
 		return &ConnectionHelper{
 			Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
-				args := []string{dockerSSHRemoteBinary()}
+				args := []string{remoteDockerBinary}
 				if sp.Path != "" {
 					args = append(args, "--host", "unix://"+sp.Path)
 				}

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,10 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*ConnectionHelper`
`54`	`54`	`}`
`55`	`55`	`sshFlags = addSSHTimeout(sshFlags)`
`56`	`56`	`sshFlags = disablePseudoTerminalAllocation(sshFlags)`
	`57`	`+ remoteDockerBinary := dockerSSHRemoteBinary()`
`57`	`58`	`return &ConnectionHelper{`
`58`	`59`	`Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {`
`59`		`- args := []string{dockerSSHRemoteBinary()}`
	`60`	`+ args := []string{remoteDockerBinary}`
`60`	`61`	`if sp.Path != "" {`
`61`	`62`	`args = append(args, "--host", "unix://"+sp.Path)`
`62`	`63`	`}`