Use filer in sync command

libs/sync/sync.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/databricks/cli/libs/filer"
 	"github.com/databricks/cli/libs/git"
 	"github.com/databricks/cli/libs/log"
-	"github.com/databricks/cli/libs/sync/repofiles"
 	"github.com/databricks/databricks-sdk-go"
 )
 
@@ -29,9 +29,9 @@ type SyncOptions struct {
 type Sync struct {
 	*SyncOptions
 
-	fileSet   *git.FileSet
-	snapshot  *Snapshot
-	repoFiles *repofiles.RepoFiles
+	fileSet  *git.FileSet
+	snapshot *Snapshot
+	filer    filer.Filer
 
 	// Synchronization progress events are sent to this event notifier.
 	notifier EventNotifier
@@ -77,16 +77,19 @@ func New(ctx context.Context, opts SyncOptions) (*Sync, error) {
 		}
 	}
 
-	repoFiles := repofiles.Create(opts.RemotePath, opts.LocalPath, opts.WorkspaceClient)
+	filer, err := filer.NewWorkspaceFilesClient(opts.WorkspaceClient, opts.RemotePath)
+	if err != nil {
+		return nil, err
+	}
 
 	return &Sync{
 		SyncOptions: &opts,
 
-		fileSet:   fileSet,
-		snapshot:  snapshot,
-		repoFiles: repoFiles,
-		notifier:  &NopNotifier{},
-		seq:       0,
+		fileSet:  fileSet,
+		snapshot: snapshot,
+		filer:    filer,
+		notifier: &NopNotifier{},
+		seq:      0,
 	}, nil
 }
 

libs/sync/watchdog.go

@@ -2,7 +2,12 @@ package sync
 
 import (
 	"context"
+	"errors"
+	"io/fs"
+	"os"
+	"path/filepath"
 
+	"github.com/databricks/cli/libs/filer"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -21,8 +26,8 @@ func (s *Sync) applyDelete(ctx context.Context, group *errgroup.Group, remoteNam
 
 	group.Go(func() error {
 		s.notifyProgress(ctx, EventActionDelete, remoteName, 0.0)
-		err := s.repoFiles.DeleteFile(ctx, remoteName)
-		if err != nil {
+		err := s.filer.Delete(ctx, remoteName)
+		if err != nil && !errors.Is(err, fs.ErrNotExist) {
 			return err
 		}
 		s.notifyProgress(ctx, EventActionDelete, remoteName, 1.0)
@@ -41,8 +46,16 @@ func (s *Sync) applyPut(ctx context.Context, group *errgroup.Group, localName st
 	}
 
 	group.Go(func() error {
+		localFile, err := os.Open(filepath.Join(s.LocalPath, localName))
+		if err != nil {
+			return err
+		}
+
+		defer localFile.Close()
+
 		s.notifyProgress(ctx, EventActionPut, localName, 0.0)
-		err := s.repoFiles.PutFile(ctx, localName)
+		opts := []filer.WriteMode{filer.CreateParentDirectories, filer.OverwriteIfExists}
+		err = s.filer.Write(ctx, localName, localFile, opts...)
 		if err != nil {
 			return err
 		}