Oct 22, 2020 · Oct 22, 2020 · Oct 22, 2020
diff --git a/internal/cmd/sync.go b/internal/cmd/sync.go
 func makeRunSync(init *bool) func(cmd *cobra.Command, args []string) error {
 return func(cmd *cobra.Command, args []string) error {
 var (
 ctx    = cmd.Context()
 local  = args[0]
 remote = args[1]
 )
 return err
 }

 info, err := os.Stat(local)
 if err != nil {
 return err
 }
 if !info.IsDir() {
 return xerrors.Errorf("%s must be a directory", local)
 }

 remoteTokens := strings.SplitN(remote, ":", 2)
 if len(remoteTokens) != 2 {
 return xerrors.New("remotemisformatted")
 return xerrors.New("remotemalformatted")
 }
 var (
 envName   = remoteTokens[0]
 return err
 }

 info, err := os.Stat(local)
 if err != nil {
 return err
 }
 if info.Mode().IsRegular() {
 return sync.SingleFile(ctx, local, remoteDir, env, client)
 }
 if !info.IsDir() {
 return xerrors.Errorf("local path must lead to a regular file or directory: %w", err)
 }

 absLocal, err := filepath.Abs(local)
 if err != nil {
 return xerrors.Errorf("make abs path out of %s, %s: %w", local, absLocal, err)
diff --git a/internal/sync/singlefile.go b/internal/sync/singlefile.go
 package sync

 import (
 "context"
 "fmt"
 "io"
 "io/ioutil"
 "os"
 "path/filepath"
 "strings"

 "cdr.dev/coder-cli/coder-sdk"
 "cdr.dev/wsep"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 )

 // SingleFile copies the given file into the remote dir or remote path of the given coder.Environment.
 func SingleFile(ctx context.Context, local, remoteDir string, env *coder.Environment, client *coder.Client) error {
 conn, err := client.DialWsep(ctx, env)
 if err != nil {
 return xerrors.Errorf("dial remote execer: %w", err)
 }
 defer func() { _ = conn.Close(websocket.StatusNormalClosure, "normal closure") }()

 if strings.HasSuffix(remoteDir, string(filepath.Separator)) {
 remoteDir += filepath.Base(local)
 }

 execer := wsep.RemoteExecer(conn)
 cmd := fmt.Sprintf(`[ -d %s ] && cat > %s/%s || cat > %s`, remoteDir, remoteDir, filepath.Base(local), remoteDir)
 process, err := execer.Start(ctx, wsep.Command{
 Command: "sh",
 Args:    []string{"-c", cmd},
 Stdin:   true,
 })
 if err != nil {
 return xerrors.Errorf("start sync command: %w", err)
 }

 sourceFile, err := os.Open(local)
 if err != nil {
 return xerrors.Errorf("open source file: %w", err)
 }

 go func() { _, _ = io.Copy(ioutil.Discard, process.Stdout()) }()
 go func() { _, _ = io.Copy(ioutil.Discard, process.Stderr()) }()
 go func() {
 stdin := process.Stdin()
 defer stdin.Close()
 _, _ = io.Copy(stdin, sourceFile)
 }()

 if err := process.Wait(); err != nil {
 return xerrors.Errorf("copy process: %w", err)
 }
 return nil
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,6 +47,7 @@ func rsyncVersion() string {
		func makeRunSync(init bool) func(cmd cobra.Command, args []string) error {
		return func(cmd *cobra.Command, args []string) error {
		var (
		ctx = cmd.Context()
		local = args[0]
		remote = args[1]
		)
Expand All		@@ -56,17 +57,9 @@ func makeRunSync(init bool) func(cmd cobra.Command, args []string) error {
		return err
		}

		info, err := os.Stat(local)
		if err != nil {
		return err
		}
		if !info.IsDir() {
		return xerrors.Errorf("%s must be a directory", local)
		}

		remoteTokens := strings.SplitN(remote, ":", 2)
		if len(remoteTokens) != 2 {
		return xerrors.New("remotemisformatted")
		return xerrors.New("remotemalformatted")
		}
		var (
		envName = remoteTokens[0]
Expand All		@@ -78,6 +71,17 @@ func makeRunSync(init bool) func(cmd cobra.Command, args []string) error {
		return err
		}

		info, err := os.Stat(local)
		if err != nil {
		return err
		}
		if info.Mode().IsRegular() {
		return sync.SingleFile(ctx, local, remoteDir, env, client)
		}
		if !info.IsDir() {
		return xerrors.Errorf("local path must lead to a regular file or directory: %w", err)
		}

		absLocal, err := filepath.Abs(local)
		if err != nil {
		return xerrors.Errorf("make abs path out of %s, %s: %w", local, absLocal, err)
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,58 @@
		package sync

		import (
		"context"
		"fmt"
		"io"
		"io/ioutil"
		"os"
		"path/filepath"
		"strings"

		"cdr.dev/coder-cli/coder-sdk"
		"cdr.dev/wsep"
		"golang.org/x/xerrors"
		"nhooyr.io/websocket"
		)

		// SingleFile copies the given file into the remote dir or remote path of the given coder.Environment.
		func SingleFile(ctx context.Context, local, remoteDir string, env coder.Environment, client coder.Client) error {
		conn, err := client.DialWsep(ctx, env)
		if err != nil {
		return xerrors.Errorf("dial remote execer: %w", err)
		}
		defer func() { _ = conn.Close(websocket.StatusNormalClosure, "normal closure") }()

		if strings.HasSuffix(remoteDir, string(filepath.Separator)) {
		remoteDir += filepath.Base(local)
		}

		execer := wsep.RemoteExecer(conn)
		cmd := fmt.Sprintf(`[ -d %s ] && cat > %s/%s \|\| cat > %s`, remoteDir, remoteDir, filepath.Base(local), remoteDir)
Copy link Member kylecarbsOct 22, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. shellmaster moog cmoog reacted with heart emoji
		process, err := execer.Start(ctx, wsep.Command{
		Command: "sh",
		Args: []string{"-c", cmd},
		Stdin: true,
		})
		if err != nil {
		return xerrors.Errorf("start sync command: %w", err)
		}

		sourceFile, err := os.Open(local)
		if err != nil {
		return xerrors.Errorf("open source file: %w", err)
		}

		go func() { _, _ = io.Copy(ioutil.Discard, process.Stdout()) }()
		go func() { _, _ = io.Copy(ioutil.Discard, process.Stderr()) }()
		go func() {
		stdin := process.Stdin()
		defer stdin.Close()
		_, _ = io.Copy(stdin, sourceFile)
		}()

		if err := process.Wait(); err != nil {
		return xerrors.Errorf("copy process: %w", err)
		}
		return nil
		}