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

Russtopia · Russtopia · commit 72eff156a90d · 2020-06-19T12:47:36.000-07:00
diff --git a/cmd/coder/sync.go b/cmd/coder/sync.go
@@ -27,7 +27,7 @@ func (cmd *syncCmd) Spec() cli.CommandSpec {
 }
 
 func (cmd *syncCmd) RegisterFlags(fl *pflag.FlagSet) {
-	fl.BoolVarP(&cmd.init, "init", "i", false, "do inititial transfer and exit")
+	fl.BoolVarP(&cmd.init, "init", "i", false, "do initial transfer and exit")
 }
 
 // See https://lxadm.com/Rsync_exit_codes#List_of_standard_rsync_exit_codes.
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -71,7 +71,7 @@ func (s Sync) syncPaths(delete bool, local, remote string) error {
 	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
@@ -80,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
@@ -91,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)
@@ -144,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 {
@@ -260,6 +260,11 @@ func (s Sync) Run() error {
 	}
 	defer notify.Stop(events)
 
+	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()
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func (cmd *syncCmd) Spec() cli.CommandSpec {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func (cmd syncCmd) RegisterFlags(fl pflag.FlagSet) {`
`30`		`- fl.BoolVarP(&cmd.init, "init", "i", false, "do inititial transfer and exit")`
	`30`	`+ fl.BoolVarP(&cmd.init, "init", "i", false, "do initial transfer and exit")`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// See https://lxadm.com/Rsync_exit_codes#List_of_standard_rsync_exit_codes.`