Fix import cycle

Author: cmoog

client.go

@@ -21,9 +21,19 @@ func RemoteExecer(conn *websocket.Conn) Execer {
 	return remoteExec{conn: conn}
 }
 
-func (r remoteExec) Start(ctx context.Context, c proto.Command) (Process, error) {
+type Command struct {
+	Command    string
+	Args       []string
+	TTY        bool
+	UID        uint32
+	GID        uint32
+	Env        []string
+	WorkingDir string
+}
+
+func (r remoteExec) Start(ctx context.Context, c Command) (Process, error) {
 	header := proto.ClientStartHeader{
-		Command: c,
+		Command: mapToProtoCmd(c),
 		Type:    proto.TypeStart,
 	}
 	payload, err := json.Marshal(header)

dev/client/main.go

@@ -6,7 +6,6 @@ import (
 	"os"
 
 	"cdr.dev/wsep"
-	"cdr.dev/wsep/internal/proto"
 	"github.com/spf13/pflag"
 	"go.coder.com/cli"
 	"go.coder.com/flog"
@@ -64,7 +63,7 @@ func do(fl *pflag.FlagSet, tty bool) {
 	if len(fl.Args()) > 1 {
 		args = fl.Args()[1:]
 	}
-	process, err := executor.Start(ctx, proto.Command{
+	process, err := executor.Start(ctx, wsep.Command{
 		Command: fl.Arg(0),
 		Args:    args,
 		TTY:     tty,

exec.go

@@ -34,5 +34,30 @@ type Process interface {
 
 // Execer starts commands.
 type Execer interface {
-	Start(ctx context.Context, c proto.Command) (Process, error)
+	Start(ctx context.Context, c Command) (Process, error)
+}
+
+// theses maps are needed to prevent an import cycle
+func mapToProtoCmd(c Command) proto.Command {
+	return proto.Command{
+		Command:    c.Command,
+		Args:       c.Args,
+		TTY:        c.TTY,
+		UID:        c.UID,
+		GID:        c.GID,
+		Env:        c.Env,
+		WorkingDir: c.WorkingDir,
+	}
+}
+
+func mapToClientCmd(c proto.Command) Command {
+	return Command{
+		Command:    c.Command,
+		Args:       c.Args,
+		TTY:        c.TTY,
+		UID:        c.UID,
+		GID:        c.GID,
+		Env:        c.Env,
+		WorkingDir: c.WorkingDir,
+	}
 }

localexec.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"syscall"
 
-	"cdr.dev/wsep/internal/proto"
 	"github.com/creack/pty"
 	"golang.org/x/xerrors"
 )
@@ -66,7 +65,7 @@ func (l *localProcess) Pid() int {
 	return l.cmd.Process.Pid
 }
 
-func (l LocalExecer) Start(ctx context.Context, c proto.Command) (Process, error) {
+func (l LocalExecer) Start(ctx context.Context, c Command) (Process, error) {
 	var (
 		process localProcess
 		err     error

server.go

@@ -61,7 +61,7 @@ func Serve(ctx context.Context, c *websocket.Conn, execer Execer) error {
 			if err != nil {
 				return xerrors.Errorf("unmarshal start header: %w", err)
 			}
-			process, err = execer.Start(ctx, header.Command)
+			process, err = execer.Start(ctx, mapToClientCmd(header.Command))
 			if err != nil {
 				return err
 			}