refactor(sshtunnel): ExecuteCommand to use options struct

.golangci.yaml

@@ -32,3 +32,5 @@ linters:
       rules:
         - name: argument-limit
           arguments: [4]
+        - name: function-result-limit
+          arguments: [3]

cmd/up.go

@@ -661,15 +661,15 @@ func (cmd *UpCmd) devPodUpMachine(
 		})
 	}
 
-	return sshtunnel.ExecuteCommand(
-		ctx,
-		client,
-		devPodConfig.ContextOption(config.ContextOptionSSHAddPrivateKeys) == "true",
-		agentInjectFunc,
-		sshTunnelCmd,
-		agentCommand,
-		log,
-		func(ctx context.Context, stdin io.WriteCloser, stdout io.Reader) (*config2.Result, error) {
+	return sshtunnel.ExecuteCommand(sshtunnel.ExecuteCommandOptions{
+		Ctx:            ctx,
+		Client:         client,
+		AddPrivateKeys: devPodConfig.ContextOption(config.ContextOptionSSHAddPrivateKeys) == "true",
+		AgentInject:    agentInjectFunc,
+		SSHCommand:     sshTunnelCmd,
+		Command:        agentCommand,
+		Log:            log,
+		TunnelServerFunc: func(ctx context.Context, stdin io.WriteCloser, stdout io.Reader) (*config2.Result, error) {
 			return tunnelserver.RunUpServer(
 				ctx,
 				stdout,
@@ -680,7 +680,7 @@ func (cmd *UpCmd) devPodUpMachine(
 				log,
 			)
 		},
-	)
+	})
 }
 
 func startJupyterNotebookInBrowser(

pkg/devcontainer/setup.go

@@ -249,16 +249,16 @@ func (r *runner) executeSetup(ctx context.Context, result *config.Result, setupC
 		)
 	}
 
-	return sshtunnel.ExecuteCommand(
-		ctx,
-		nil,
-		false,
-		agentInjectFunc,
-		sshTunnelCmd,
-		setupCommand,
-		r.Log,
-		runSetupServer,
-	)
+	return sshtunnel.ExecuteCommand(sshtunnel.ExecuteCommandOptions{
+		Ctx:              ctx,
+		Client:           nil,
+		AddPrivateKeys:   false,
+		AgentInject:      agentInjectFunc,
+		SSHCommand:       sshTunnelCmd,
+		Command:          setupCommand,
+		Log:              r.Log,
+		TunnelServerFunc: runSetupServer,
+	})
 }
 
 func (r *runner) buildSSHTunnelCommand() string {