Implement tar directory transfer

Author: ammario

Diff for: cmd/coder/main.go

@@ -28,6 +28,7 @@ func (r *rootCmd) Subcommands() []cli.Command {
 	return []cli.Command{
 		loginCmd{},
 		logoutCmd{},
+		&shellCmd{},
 		&syncCmd{},
 	}
 }

Diff for: cmd/coder/shell.go

@@ -0,0 +1,63 @@
+package main
+
+import (
+	"context"
+	"io"
+	"os"
+
+	"github.com/spf13/pflag"
+	"go.coder.com/cli"
+	"go.coder.com/flog"
+
+	client "cdr.dev/coder-cli/internal/client"
+	"cdr.dev/coder-cli/wush"
+)
+
+type shellCmd struct {
+}
+
+func (cmd *shellCmd) Spec() cli.CommandSpec {
+	return cli.CommandSpec{
+		Name:    "sh",
+		Usage:   "<env name> -- <command [command args...]>",
+		Desc:    "executes a remote command on the environment",
+		RawArgs: true,
+	}
+}
+
+func (cmd *shellCmd) Run(fl *pflag.FlagSet) {
+	if len(fl.Args()) < 3 {
+		exitUsage(fl)
+	}
+	var (
+		envName = fl.Arg(0)
+		_       = fl.Arg(1)
+		command = fl.Arg(2)
+		args    = fl.Args()[3:]
+	)
+
+	entClient := requireAuth()
+	env := findEnv(entClient, envName)
+
+	conn, err := entClient.DialWush(
+		env,
+		&client.WushOptions{
+			TTY:   false,
+			Stdin: true,
+		}, command, args...)
+	if err != nil {
+		flog.Fatal("dial wush: %v", err)
+	}
+	ctx := context.Background()
+
+	wc := wush.NewClient(ctx, conn)
+	go io.Copy(wc.Stdin, os.Stdin)
+	go io.Copy(os.Stdout, wc.Stdout)
+	go io.Copy(os.Stderr, wc.Stderr)
+
+	exitCode, err := wc.Wait()
+	if err != nil {
+		flog.Fatal("wush error: %v", err)
+	}
+	os.Exit(int(exitCode))
+}

Diff for: cmd/coder/sync.go

@@ -52,7 +52,7 @@ outer:
 	return uo
 }
 
-func (cmd *syncCmd) findEnv(client *client.Client, name string) client.Environment {
+func findEnv(client *client.Client, name string) client.Environment {
 	me, err := client.Me()
 	if err != nil {
 		flog.Fatal("get self: %+v", err)
@@ -86,11 +86,11 @@ func (cmd *syncCmd) findEnv(client *client.Client, name string) client.Environme
 }
 
 func (cmd *syncCmd) bench(client *client.Client, env client.Environment) {
-	conn, err := client.Wush(env, "cat")
+	conn, err := client.DialWush(env, nil, "cat")
 	if err != nil {
 		flog.Fatal("wush failed: %v", err)
 	}
-	wc := wush.Dial(context.Background(), conn)
+	wc := wush.NewClient(context.Background(), conn)
 	bar := pb.New64(cmd.benchSize)
 	bar.Start()
 	go io.Copy(ioutil.Discard, wc.Stdout)
@@ -133,7 +133,7 @@ func (cmd *syncCmd) Run(fl *pflag.FlagSet) {
 		remoteDir = remoteTokens[1]
 	)
 
-	env := cmd.findEnv(client, envName)
+	env := findEnv(client, envName)
 
 	if cmd.benchSize > 0 {
 		cmd.bench(client, env)

Diff for: go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/cheggaaa/pb/v3 v3.0.4
 	github.com/dustin/go-humanize v1.0.0
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
+	github.com/mattn/go-isatty v0.0.12
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/rjeczalik/notify v0.9.2
 	github.com/spf13/pflag v1.0.5

Diff for: go.sum

@@ -27,6 +27,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
@@ -46,6 +48,7 @@ golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

Diff for: internal/client/env.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"net/url"
+	"strconv"
 	"time"
 
 	"nhooyr.io/websocket"
@@ -23,7 +24,17 @@ func (c Client) Envs(user *User, org Org) ([]Environment, error) {
 	return envs, err
 }
 
-func (c Client) Wush(env Environment, cmd string, args ...string) (*websocket.Conn, error) {
+type WushOptions struct {
+	TTY   bool
+	Stdin bool
+}
+
+var defaultWushOptions = WushOptions{
+	TTY:   false,
+	Stdin: true,
+}
+
+func (c Client) DialWush(env Environment, opts *WushOptions, cmd string, args ...string) (*websocket.Conn, error) {
 	u := c.copyURL()
 	if c.BaseURL.Scheme == "https" {
 		u.Scheme = "wss"
@@ -34,8 +45,11 @@ func (c Client) Wush(env Environment, cmd string, args ...string) (*websocket.Co
 	query := make(url.Values)
 	query.Set("command", cmd)
 	query["args[]"] = args
-	query.Set("tty", "false")
-	query.Set("stdin", "true")
+	if opts == nil {
+		opts = &defaultWushOptions
+	}
+	query.Set("tty", strconv.FormatBool(opts.TTY))
+	query.Set("stdin", strconv.FormatBool(opts.Stdin))
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
 	defer cancel()

Diff for: internal/stty/doc.go

@@ -0,0 +1,36 @@
+// Package stty provides facilities for configuring the calling tty.
+package stty
+
+import (
+	"os/exec"
+
+	"golang.org/x/xerrors"
+)
+
+func EnableCBreak() error {
+	out, err := exec.Command("stty", "cbreak").CombinedOutput()
+	if err != nil {
+		return xerrors.Errorf("stty: %w\n%s", err, out)
+	}
+	return nil
+}
+
+func DisableEcho() error {
+	out, err := exec.Command("stty", "-echo").CombinedOutput()
+	if err != nil {
+		return xerrors.Errorf("stty: %w\n%s", err, out)
+	}
+	return nil
+}
+
+func SubTermMode() error {
+	err := EnableCBreak()
+	if err != nil {
+		return err
+	}
+	err = DisableEcho()
+	if err != nil {
+		return err
+	}
+	return nil
+}

Diff for: internal/sync/sync.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"path/filepath"
 	"time"
 
 	"github.com/cheggaaa/pb/v3"
@@ -33,39 +32,26 @@ type Sync struct {
 	barWriter io.Writer
 }
 
-func (s Sync) pushFile(ctx context.Context, path string) error {
-	conn, err := s.Wush(s.Environment, "scp", "-qprt", s.RemoteDir)
+func (s Sync) pushDirectory(ctx context.Context, path string) error {
+	conn, err := s.DialWush(s.Environment, nil, "sh", "-c", "cd "+s.RemoteDir+"; tar xvzf -")
 	if err != nil {
 		return err
 	}
 	defer conn.Close(websocket.StatusNormalClosure, "")
 
-	wc := wush.Dial(ctx, conn)
+	wc := wush.NewClient(ctx, conn)
 
 	// This starts scp in local mode
-	cmd := exec.Command("scp", "-qprf", path)
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		defer stdin.Close()
+	cmd := exec.Command("tar", "-czf", "-", ".")
+	cmd.Dir = path
 
-		_, err = io.Copy(io.MultiWriter(stdin, &debugWriter{
-			Prefix: "s->c",
-			W:      os.Stderr,
-		}), wc.Stdout)
-		if err != nil {
-			flog.Error("s->c copy fail: %v", err)
-		}
-	}()
+	go io.Copy(os.Stderr, wc.Stdout)
+	go io.Copy(os.Stderr, wc.Stderr)
 
 	cmd.Stdout = io.MultiWriter(s.barWriter, wc.Stdin, &debugWriter{
 		Prefix: "c->s",
 		W:      os.Stderr,
 	})
-	go io.Copy(os.Stderr, wc.Stderr)
 	err = cmd.Run()
 	if err != nil {
 		return xerrors.Errorf("scp: %w", err)
@@ -81,7 +67,7 @@ func (s Sync) pushFileLog(ctx context.Context, path string) error {
 
 	start := time.Now()
 	fmt.Printf("transferring %v...\t", info.Name())
-	err = s.pushFile(ctx, path)
+	err = s.pushDirectory(ctx, path)
 	if err != nil {
 		fmt.Printf("failed\n")
 		return err
@@ -104,13 +90,7 @@ func (s Sync) initSync(ctx context.Context) error {
 	s.barWriter = bar.NewProxyWriter(ioutil.Discard)
 
 	start := time.Now()
-	err := filepath.Walk(s.LocalDir, func(path string, info os.FileInfo, err error) error {
-		if path == s.LocalDir {
-			// scp can't resolve the self directory
-			return nil
-		}
-		return s.pushFile(ctx, path)
-	})
+	err := s.pushDirectory(ctx, s.LocalDir)
 	if err == nil {
 		bar.Finish()
 		flog.Info("finished initial sync (%v)", time.Since(start).Truncate(time.Millisecond))

Diff for: wush/client.go

@@ -69,10 +69,10 @@ func (w *stdinWriter) Close() error {
 	})
 }
 
-// Dial begins multiplexing the Wush connection
+// NewClient begins multiplexing the Wush connection
 // into independent streams.
 // It will cancel all goroutines when the provided context cancels.
-func Dial(ctx context.Context, conn *websocket.Conn) *Client {
+func NewClient(ctx context.Context, conn *websocket.Conn) *Client {
 	var (
 		stdoutReader, stdoutWriter = io.Pipe()
 		stderrReader, stderrWriter = io.Pipe()