Merge pull request spf13#485 from ahkui/master

fix(gcsfs): update object not exist check logic

Author: sagikazarmark

gcsfs/errors.go

@@ -19,13 +19,15 @@ package gcsfs
 import (
 	"errors"
 	"syscall"
+
+	"cloud.google.com/go/storage"
 )
 
 var (
 	ErrNoBucketInName     = errors.New("no bucket name found in the name")
 	ErrFileClosed         = errors.New("file is closed")
 	ErrOutOfRange         = errors.New("out of range")
-	ErrObjectDoesNotExist = errors.New("storage: object doesn't exist")
+	ErrObjectDoesNotExist = storage.ErrObjectNotExist
 	ErrEmptyObjectName    = errors.New("storage: object name is empty")
 	ErrFileNotFound       = syscall.ENOENT
 )

gcsfs/file_info.go

@@ -17,6 +17,7 @@
 package gcsfs
 
 import (
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -58,7 +59,7 @@ func newFileInfo(name string, fs *Fs, fileMode os.FileMode) (*FileInfo, error) {
 			res.name = fs.ensureTrailingSeparator(res.name)
 			res.isDir = true
 			return res, nil
-		} else if err.Error() == ErrObjectDoesNotExist.Error() {
+		} else if errors.Is(err, ErrObjectDoesNotExist) {
 			// Folders do not actually "exist" in GCloud, so we have to check, if something exists with
 			// such a prefix
 			bucketName, bucketPath := fs.splitName(name)

gcsfs/gcs_mocks.go

@@ -137,7 +137,7 @@ func (o *objectMock) Attrs(_ context.Context) (*storage.ObjectAttrs, error) {
 
 	if info.IsDir() {
 		// we have to mock it here, because of FileInfo logic
-		return nil, ErrObjectDoesNotExist
+		return nil, storage.ErrObjectNotExist
 	}
 
 	return res, nil