windows aware paths

pyramid/file.go

@@ -39,17 +39,22 @@ func (f *File) Close() error {
 	return f.fh.Close()
 }
 
+var (
+	errAlreadyPersisted = fmt.Errorf("file is already persisted")
+	errFileNotClosed    = fmt.Errorf("file isn't closed")
+)
+
 // Store copies the closed file to all tiers of the pyramid.
 func (f *File) Store(filename string) error {
 	if err := validateFilename(filename); err != nil {
 		return err
 	}
 
 	if f.persisted {
-		return fmt.Errorf("file is already persisted")
+		return errAlreadyPersisted
 	}
 	if !f.closed {
-		return fmt.Errorf("file isn't closed")
+		return errFileNotClosed
 	}
 
 	err := f.store(filename)

pyramid/file_test.go

@@ -72,7 +72,7 @@ func TestWriteValidate(t *testing.T) {
 	require.NoError(t, err)
 
 	require.NoError(t, sut.Close())
-	require.Error(t, sut.Store("workspace/"))
+	require.Error(t, sut.Store("workspace"+string(os.PathSeparator)))
 	require.Error(t, sut.Close())
 	require.NoError(t, sut.Store("validfilename"))
 	require.Error(t, sut.Store("validfilename"))

pyramid/tierFS.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/treeverse/lakefs/logging"
@@ -74,7 +75,7 @@ func NewFS(c *Config) (FS, error) {
 		return nil, fmt.Errorf("creating eviction control: %w", err)
 	}
 
-	if err := handleExistingFiles(c.logger, eviction, fsLocalBaseDir); err != nil {
+	if err := handleExistingFiles(eviction, fsLocalBaseDir); err != nil {
 		return nil, fmt.Errorf("handling existing files: %w", err)
 	}
 
@@ -87,7 +88,7 @@ func NewFS(c *Config) (FS, error) {
 // 1. Adds stored files to the eviction control
 // 2. Remove workspace directories and all its content if it
 //	  exist under the namespace dir.
-func handleExistingFiles(logger logging.Logger, eviction eviction, fsLocalBaseDir string) error {
+func handleExistingFiles(eviction eviction, fsLocalBaseDir string) error {
 	if err := filepath.Walk(fsLocalBaseDir, func(rPath string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -258,15 +259,18 @@ func validateArgs(namespace, filename string) error {
 	return validateFilename(filename)
 }
 
+var (
+	errSeparatorInFS   = errors.New("path contains separator")
+	errPathInWorkspace = errors.New("file cannot be located in the workspace")
+)
+
 func validateFilename(filename string) error {
-	if strings.HasPrefix(filename, workspaceDir+"/") {
-		return fmt.Errorf("file %s cannot be located in the workspace", filename)
+	if strings.HasPrefix(filename, workspaceDir+string(os.PathSeparator)) {
+		return errPathInWorkspace
 	}
 	return nil
 }
 
-var errSeparatorInFS = errors.New("path contains separator")
-
 func validateNamespace(ns string) error {
 	if strings.ContainsRune(ns, os.PathSeparator) {
 		return errSeparatorInFS
@@ -298,6 +302,10 @@ func (tfs *TierFS) newLocalFileRef(namespace, filename string) localFileRef {
 }
 
 func (tfs *TierFS) objPointer(namespace, filename string) block.ObjectPointer {
+	if runtime.GOOS == "windows" {
+		filename = strings.Replace(filename, `\\'`, "/", -1)
+	}
+
 	return block.ObjectPointer{
 		StorageNamespace: namespace,
 		Identifier:       tfs.blockStoragePath(filename),