coder sync fails if all dirs leading to sync remoteDir don't already exist

Russtopia · Russtopia · commit 92f3c77e0868 · 2020-06-19T12:45:36.000-07:00
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -71,38 +71,7 @@ func (s Sync) syncPaths(delete bool, local, remote string) error {
 	return nil
 }
 
-func (s Sync) remoteMkDir() error {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-
-	conn, err := s.Client.DialWsep(ctx, s.Environment)
-	if err != nil {
-		return err
-	}
-	defer conn.Close(websocket.CloseNormalClosure, "")
-
-	execer := wsep.RemoteExecer(conn)
-	process, err := execer.Start(ctx, wsep.Command{
-		Command: "mkdir",
-		Args:    []string{"-p", s.RemoteDir},
-	})
-	if err != nil {
-		return err
-	}
-	go io.Copy(os.Stdout, process.Stderr())
-	go io.Copy(os.Stderr, process.Stdout())
-
-	err = process.Wait()
-	if code, ok := err.(wsep.ExitError); ok {
-		return fmt.Errorf("mkdir exit status: %v", code)
-	}
-	if err != nil {
-		return xerrors.Errorf("execution failure: %w", err)
-	}
-	return nil
-}
-
-func (s Sync) remoteRm(ctx context.Context, remote string) error {
+func (s Sync) remoteCmd(ctx context.Context, prog string, args ...string) error {
 	conn, err := s.Client.DialWsep(ctx, s.Env)
 	if err != nil {
 		return err
@@ -111,8 +80,8 @@ func (s Sync) remoteRm(ctx context.Context, remote string) error {
 
 	execer := wsep.RemoteExecer(conn)
 	process, err := execer.Start(ctx, wsep.Command{
-		Command: "rm",
-		Args:    []string{"-rf", remote},
+		Command: prog,
+		Args:    args,
 	})
 	if err != nil {
 		return err
@@ -122,7 +91,7 @@ func (s Sync) remoteRm(ctx context.Context, remote string) error {
 
 	err = process.Wait()
 	if code, ok := err.(wsep.ExitError); ok {
-		return fmt.Errorf("rm exit status: %v", code)
+		return fmt.Errorf("%s exit status: %v", prog, code)
 	}
 	if err != nil {
 		return xerrors.Errorf("execution failure: %w", err)
@@ -175,7 +144,7 @@ func (s Sync) handleDelete(localPath string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
-	return s.remoteRm(ctx, s.convertPath(localPath))
+	return s.remoteCmd(ctx, "rm", "-rf", s.convertPath(localPath))
 }
 
 func (s Sync) handleRename(localPath string) error {
@@ -291,7 +260,10 @@ func (s Sync) Run() error {
 	}
 	defer notify.Stop(events)
 
-	s.remoteMkDir()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+
+	s.remoteCmd(ctx, "mkdir", "-p", s.RemoteDir)
 
 	ap := activity.NewPusher(s.Client, s.Env.ID, activityName)
 	ap.Push()
