anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-08 05:47:07 +09:00
Code Activity

GO-3905: rename error to anyerror

Browse source 
Signed-off-by: AnastasiaShemyakinskaya <shem98a@mail.ru>
This commit is contained in:
AnastasiaShemyakinskaya 2024-08-13 12:12:19 +02:00
parent 41016014e2
commit 500e7edf1b
No known key found for this signature in database
GPG key ID: CCD60ED83B103281
24 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/application/account_create_from_export.go
View file

@ -23,9 +23,9 @@ import (
"github.com/anyproto/anytype-heart/pkg/lib/core"
"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
"github.com/anyproto/anytype-heart/space"
"github.com/anyproto/anytype-heart/util/anyerror"
"github.com/anyproto/anytype-heart/util/builtinobjects"
"github.com/anyproto/anytype-heart/util/constant"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/pbtypes"
)
@ -70,7 +70,7 @@ func (s *Service) RecoverFromLegacy(req *pb.RpcAccountRecoverFromLegacyExportReq
profile, err := getUserProfile(req)
if err != nil {
return RecoverFromLegacyResponse{}, errUtils.TransformError(err)
return RecoverFromLegacyResponse{}, anyerror.CleanupError(err)
}
err = s.stop()
@ -89,7 +89,7 @@ func (s *Service) RecoverFromLegacy(req *pb.RpcAccountRecoverFromLegacyExportReq
s.rootPath = req.RootPath
err = os.MkdirAll(s.rootPath, 0700)
if err != nil {
return RecoverFromLegacyResponse{}, errUtils.TransformError(err)
return RecoverFromLegacyResponse{}, anyerror.CleanupError(err)
}
if _, statErr := os.Stat(filepath.Join(s.rootPath, address)); os.IsNotExist(statErr) {
if walletErr := core.WalletInitRepo(s.rootPath, res.Identity); walletErr != nil {

10
core/application/account_move.go
View file

@ -11,7 +11,7 @@ import (
"github.com/anyproto/anytype-heart/core/anytype/config"
"github.com/anyproto/anytype-heart/core/filestorage"
"github.com/anyproto/anytype-heart/pb"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
var (
@ -49,13 +49,13 @@ func (s *Service) AccountMove(req *pb.RpcAccountMoveRequest) error {
if _, err := os.Stat(destination); !os.IsNotExist(err) { // if already exist (in case of the previous fail moving)
if err := removeDirsRelativeToPath(destination, dirs); err != nil {
return errors.Join(ErrFailedToRemoveAccountData, errUtils.TransformError(err))
return errors.Join(ErrFailedToRemoveAccountData, anyerror.CleanupError(err))
}
}
err := os.MkdirAll(destination, 0700)
if err != nil {
return errors.Join(ErrFailedToCreateLocalRepo, errUtils.TransformError(err))
return errors.Join(ErrFailedToCreateLocalRepo, anyerror.CleanupError(err))
}
err = s.stop()
@ -77,12 +77,12 @@ func (s *Service) AccountMove(req *pb.RpcAccountMoveRequest) error {
}
if err := removeDirsRelativeToPath(srcPath, dirs); err != nil {
return errors.Join(ErrFailedToRemoveAccountData, errUtils.TransformError(err))
return errors.Join(ErrFailedToRemoveAccountData, anyerror.CleanupError(err))
}
if srcPath != conf.RepoPath { // remove root account dir, if move not from anytype source dir
if err := os.RemoveAll(srcPath); err != nil {
return errors.Join(ErrFailedToRemoveAccountData, errUtils.TransformError(err))
return errors.Join(ErrFailedToRemoveAccountData, anyerror.CleanupError(err))
}
}
return nil

4
core/application/account_stop.go
View file

@ -12,7 +12,7 @@ import (
"github.com/anyproto/anytype-heart/core/anytype/config"
walletComp "github.com/anyproto/anytype-heart/core/wallet"
"github.com/anyproto/anytype-heart/pb"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
var (
@ -42,7 +42,7 @@ func (s *Service) AccountStop(req *pb.RpcAccountStopRequest) error {
if req.RemoveData {
err := s.accountRemoveLocalData()
if err != nil {
return errors.Join(ErrFailedToRemoveAccountData, errUtils.TransformError(err))
return errors.Join(ErrFailedToRemoveAccountData, anyerror.CleanupError(err))
}
} else {
err := s.stop()

4
core/block/editor/file/file.go
View file

@ -26,7 +26,7 @@ import (
"github.com/anyproto/anytype-heart/pkg/lib/bundle"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
"github.com/anyproto/anytype-heart/util/pbtypes"
)
@ -396,7 +396,7 @@ func (dp *dropFilesProcess) Init(paths []string) (err error) {
entry := &dropFileEntry{path: path, name: filepath.Base(path)}
ok, e := dp.readdir(entry, true)
if e != nil {
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
if ok {
dp.root.child = append(dp.root.child, entry)

6
core/block/export/export.go
View file

@ -46,8 +46,8 @@ import (
"github.com/anyproto/anytype-heart/space"
"github.com/anyproto/anytype-heart/space/clientspace"
"github.com/anyproto/anytype-heart/space/spacecore/typeprovider"
"github.com/anyproto/anytype-heart/util/anyerror"
"github.com/anyproto/anytype-heart/util/constant"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/pbtypes"
"github.com/anyproto/anytype-heart/util/text"
)
@ -121,12 +121,12 @@ func (e *export) Export(ctx context.Context, req pb.RpcObjectListExportRequest)
var wr writer
if req.Zip {
if wr, err = newZipWriter(req.Path, tempFileName); err != nil {
err = errUtils.TransformError(err)
err = anyerror.CleanupError(err)
return
}
} else {
if wr, err = newDirWriter(req.Path, req.IncludeFiles); err != nil {
err = errUtils.TransformError(err)
err = anyerror.CleanupError(err)
return
}
}

4
core/block/export/writer.go
View file

@ -10,7 +10,7 @@ import (
"sync"
"time"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
type writer interface {
@ -73,7 +73,7 @@ func (d *dirWriter) WriteFile(filename string, r io.Reader, lastModifiedDate int
lastModifiedDateUnix := time.Unix(lastModifiedDate, 0)
err = os.Chtimes(filename, time.Now(), lastModifiedDateUnix)
if err != nil {
return fmt.Errorf("failed to set date modified of export file: %w", errUtils.TransformError(err))
return fmt.Errorf("failed to set date modified of export file: %w", anyerror.CleanupError(err))
}
return
}

4
core/block/files.go
View file

@ -11,7 +11,7 @@ import (
"github.com/anyproto/anytype-heart/core/block/process"
"github.com/anyproto/anytype-heart/core/files"
"github.com/anyproto/anytype-heart/pb"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
// TODO Move residual file methods here
@ -24,7 +24,7 @@ func (s *Service) DownloadFile(ctx context.Context, req *pb.RpcFileDownloadReque
err := os.MkdirAll(req.Path, 0755)
if err != nil {
return "", fmt.Errorf("mkdir -p: %w", errUtils.TransformError(err))
return "", fmt.Errorf("mkdir -p: %w", anyerror.CleanupError(err))
}
progress := process.NewProgress(pb.ModelProcess_SaveFile)
defer progress.Finish(nil)

6
core/block/import/common/filenameprovider.go
View file

@ -9,7 +9,7 @@ import (
"github.com/anyproto/anytype-heart/core/block/import/common/source"
"github.com/anyproto/anytype-heart/pkg/lib/core"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
func ProvideFileName(fileName string, filesSource source.Source, path string, tempDirProvider core.TempDirProvider) (string, bool, error) {
@ -47,7 +47,7 @@ func extractFileFromArchiveToTempDirectory(fileName string, rc io.ReadCloser, te
if directoryWithFile != "" {
directoryWithFile = filepath.Join(tempDir, directoryWithFile)
if err := os.MkdirAll(directoryWithFile, 0777); err != nil && !os.IsExist(err) {
return "", errUtils.TransformError(err)
return "", anyerror.CleanupError(err)
}
}
pathToTmpFile := filepath.Join(tempDir, fileName)
@ -56,7 +56,7 @@ func extractFileFromArchiveToTempDirectory(fileName string, rc io.ReadCloser, te
return pathToTmpFile, nil
}
if err != nil {
return "", errUtils.TransformError(err)
return "", anyerror.CleanupError(err)
}
defer tmpFile.Close()
w := bufio.NewWriter(tmpFile)

4
core/block/import/common/filetime/darwin.go
View file

@ -8,7 +8,7 @@ import (
"time"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
var log = logging.Logger("import")
@ -16,7 +16,7 @@ var log = logging.Logger("import")
func ExtractFileTimes(fileName string) (int64, int64) {
fileInfo, err := os.Stat(fileName)
if err != nil {
log.Warnf("failed to get file info from path: %s", errUtils.TransformError(err))
log.Warnf("failed to get file info from path: %s", anyerror.CleanupError(err))
return 0, 0
}

4
core/block/import/common/filetime/linux.go
View file

@ -8,7 +8,7 @@ import (
"time"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
var log = logging.Logger("import")
@ -16,7 +16,7 @@ var log = logging.Logger("import")
func ExtractFileTimes(fileName string) (int64, int64) {
fileInfo, err := os.Stat(fileName)
if err != nil {
log.Warnf("failed to get file info from path: %s", errUtils.TransformError(err))
log.Warnf("failed to get file info from path: %s", anyerror.CleanupError(err))
return 0, 0
}

4
core/block/import/common/filetime/windows.go
View file

@ -8,7 +8,7 @@ import (
"time"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
var log = logging.Logger("import")
@ -16,7 +16,7 @@ var log = logging.Logger("import")
func ExtractFileTimes(fileName string) (int64, int64) {
fileInfo, err := os.Stat(fileName)
if err != nil {
log.Warnf("failed to get file info from path: %s", errUtils.TransformError(err))
log.Warnf("failed to get file info from path: %s", anyerror.CleanupError(err))
return 0, 0
}

6
core/block/import/common/source/directory.go
View file

@ -7,7 +7,7 @@ import (
"github.com/samber/lo"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
type Directory struct {
@ -39,7 +39,7 @@ func (d *Directory) Iterate(callback func(fileName string, fileReader io.ReadClo
for file := range d.fileReaders {
fileReader, err := os.Open(file)
if err != nil {
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
isContinue := callback(file, fileReader)
fileReader.Close()
@ -57,7 +57,7 @@ func (d *Directory) ProcessFile(fileName string, callback func(fileReader io.Rea
if os.IsNotExist(err) {
return nil
}
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
defer fileReader.Close()
if err = callback(fileReader); err != nil {

6
core/block/import/common/source/file.go
View file

@ -7,7 +7,7 @@ import (
"github.com/samber/lo"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
type File struct {
@ -26,7 +26,7 @@ func (f *File) Initialize(importPath string) error {
func (f *File) Iterate(callback func(fileName string, fileReader io.ReadCloser) bool) error {
fileReader, err := os.Open(f.fileName)
if err != nil {
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
defer fileReader.Close()
callback(f.fileName, fileReader)
@ -39,7 +39,7 @@ func (f *File) ProcessFile(fileName string, callback func(fileReader io.ReadClos
if os.IsNotExist(err) {
return nil
}
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
defer fileReader.Close()
return callback(fileReader)

6
core/block/import/common/source/zip.go
View file

@ -9,7 +9,7 @@ import (
"github.com/samber/lo"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
type Zip struct {
@ -50,7 +50,7 @@ func (z *Zip) Iterate(callback func(fileName string, fileReader io.ReadCloser) b
for name, file := range z.fileReaders {
fileReader, err := file.Open()
if err != nil {
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
isContinue := callback(name, fileReader)
fileReader.Close()
@ -65,7 +65,7 @@ func (z *Zip) ProcessFile(fileName string, callback func(fileReader io.ReadClose
if file, ok := z.fileReaders[fileName]; ok {
fileReader, err := file.Open()
if err != nil {
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
defer fileReader.Close()
if err = callback(fileReader); err != nil {

6
core/block/import/common/syncer/file.go
View file

@ -16,7 +16,7 @@ import (
"github.com/anyproto/anytype-heart/core/files/fileobject"
"github.com/anyproto/anytype-heart/pb"
"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
type FileSyncer struct {
@ -72,10 +72,10 @@ func (s *FileSyncer) Sync(id domain.FullID, newIdsSet map[string]struct{}, b sim
}
_, err := s.service.UploadFileBlock(id.ObjectID, dto)
if os.IsNotExist(err) {
return errUtils.TransformError(err)
return anyerror.CleanupError(err)
}
if err != nil {
return fmt.Errorf("%w: %s", common.ErrFileLoad, errUtils.TransformError(err).Error())
return fmt.Errorf("%w: %s", common.ErrFileLoad, anyerror.CleanupError(err).Error())
}
return nil
}

4
core/block/import/common/syncer/icon.go
View file

@ -19,7 +19,7 @@ import (
"github.com/anyproto/anytype-heart/pb"
"github.com/anyproto/anytype-heart/pkg/lib/localstore/addr"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
var log = logging.Logger("import")
@ -98,7 +98,7 @@ func (s *IconSyncer) handleIconImage(spaceId string, newIdsSet map[string]struct
}
fileObjectId, _, err := s.service.UploadFile(context.Background(), spaceId, dto)
if err != nil {
return "", errUtils.TransformError(err)
return "", anyerror.CleanupError(err)
}
return fileObjectId, nil
}

6
core/block/import/html/converter.go
View file

@ -18,7 +18,7 @@ import (
"github.com/anyproto/anytype-heart/pkg/lib/core/smartblock"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
const numberOfStages = 2 // 1 cycle to get snapshots and 1 cycle to create objects
@ -166,7 +166,7 @@ func (h *HTML) getBlocksForSnapshot(rc io.ReadCloser, filesSource source.Source,
if newFileName, _, err := common.ProvideFileName(block.GetFile().GetName(), filesSource, path, h.tempDirProvider); err == nil {
block.GetFile().Name = newFileName
} else {
log.Errorf("failed to update file block with new file name: %v", errUtils.TransformError(err))
log.Errorf("failed to update file block with new file name: %v", anyerror.CleanupError(err))
}
}
if block.GetText() != nil && block.GetText().Marks != nil && len(block.GetText().Marks.Marks) > 0 {
@ -193,7 +193,7 @@ func (h *HTML) updateFilesInLinks(block *model.Block, filesSource source.Source,
}
continue
}
log.Errorf("failed to update link block with new file name: %v", errUtils.TransformError(err))
log.Errorf("failed to update link block with new file name: %v", anyerror.CleanupError(err))
}
}
}

4
core/files/fileuploader/uploader.go
View file

@ -30,7 +30,7 @@ import (
"github.com/anyproto/anytype-heart/pkg/lib/logging"
"github.com/anyproto/anytype-heart/pkg/lib/mill"
"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
"github.com/anyproto/anytype-heart/util/uri"
)
@ -327,7 +327,7 @@ func (u *uploader) SetFile(path string) Uploader {
u.getReader = func(ctx context.Context) (*fileReader, error) {
f, err := os.Open(path)
if err != nil {
return nil, errUtils.TransformError(err)
return nil, anyerror.CleanupError(err)
}
buf := bufio.NewReaderSize(f, bufSize)

4
core/util.go
View file

@ -7,7 +7,7 @@ import (
"github.com/anyproto/anytype-heart/core/session"
"github.com/anyproto/anytype-heart/pb"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
func (mw *Middleware) getResponseEvent(ctx session.Context) *pb.ResponseEvent {
@ -45,7 +45,7 @@ func getErrorDescription(err error) string {
if err == nil {
return ""
}
return errUtils.TransformError(err).Error()
return anyerror.CleanupError(err).Error()
}
func init() {

8
pkg/lib/datastore/clientds/clientds.go
View file

@ -18,7 +18,7 @@ import (
"github.com/anyproto/anytype-heart/pkg/lib/datastore"
"github.com/anyproto/anytype-heart/pkg/lib/logging"
"github.com/anyproto/anytype-heart/space/spacecore/storage"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/anyerror"
)
const (
@ -168,7 +168,7 @@ func (r *clientds) Init(a *app.App) (err error) {
opts.ValueDir = opts.Dir
r.localstoreDS, err = openBadgerWithRecover(opts)
err = errUtils.TransformError(err)
err = anyerror.CleanupError(err)
if err != nil && isBadgerCorrupted(err) {
// because localstore contains mostly recoverable info (with th only exception of objects' lastOpenedDate)
// we can just remove and recreate it
@ -176,7 +176,7 @@ func (r *clientds) Init(a *app.App) (err error) {
log.Errorf("failed to rename corrupted localstore: %s", err2)
var errAfterRemove error
r.localstoreDS, errAfterRemove = openBadgerWithRecover(opts)
errAfterRemove = errUtils.TransformError(errAfterRemove)
errAfterRemove = anyerror.CleanupError(errAfterRemove)
log.With("db", "localstore").With("reset", true).With("err_remove", errAfterRemove).With("err", err.Error()).Errorf("failed to open db")
if errAfterRemove != nil {
// should not happen, but just in case
@ -193,7 +193,7 @@ func (r *clientds) Init(a *app.App) (err error) {
opts.ValueDir = opts.Dir
r.spaceDS, err = openBadgerWithRecover(opts)
if err != nil {
err = errUtils.TransformError(err)
err = anyerror.CleanupError(err)
log.With("db", "spacestore").With("reset", false).With("err", err.Error()).Errorf("failed to open db")
return err
}

4
pkg/lib/logging/sugared_wrapper.go
View file

@ -3,7 +3,7 @@ package logging
import (
"go.uber.org/zap"
errCleanup "github.com/anyproto/anytype-heart/util/error"
errCleanup "github.com/anyproto/anytype-heart/util/anyerror"
)
type Sugared struct {
@ -63,7 +63,7 @@ func (s *Sugared) Infow(msg string, keysAndValues ...interface{}) {
func cleanupArgs(args []interface{}) {
for i, arg := range args {
if err, ok := arg.(error); ok {
err = errCleanup.TransformError(err)
err = errCleanup.CleanupError(err)
args[i] = err
}
}

4
util/error/error.go → util/anyerror/anyerror.go
View file

@ -1,4 +1,4 @@
package error
package anyerror
import (
"errors"
@ -26,7 +26,7 @@ func anonymizeBadgerError(err string, changed bool) (string, bool) {
return err, changed
}
func TransformError(err error) error {
func CleanupError(err error) error {
if err == nil {
return nil
}

18
util/error/error_test.go → util/anyerror/anyerror_test.go
View file

@ -1,4 +1,4 @@
package error
package anyerror
import (
"errors"
@ -23,8 +23,8 @@ func TestTransformError(t *testing.T) {
}
resultErrorMessage := "read <masked file path>: test"
assert.NotNil(t, TransformError(pathError))
assert.Equal(t, resultErrorMessage, TransformError(pathError).Error())
assert.NotNil(t, CleanupError(pathError))
assert.Equal(t, resultErrorMessage, CleanupError(pathError).Error())
})
t.Run("relative path", func(t *testing.T) {
@ -35,22 +35,22 @@ func TestTransformError(t *testing.T) {
}
resultErrorMessage := "read <masked file path>: test"
assert.NotNil(t, TransformError(pathError))
assert.Equal(t, resultErrorMessage, TransformError(pathError).Error())
assert.NotNil(t, CleanupError(pathError))
assert.Equal(t, resultErrorMessage, CleanupError(pathError).Error())
})
t.Run("not os path error", func(t *testing.T) {
err := fmt.Errorf("test")
resultErrorMessage := "test"
assert.NotNil(t, TransformError(err))
assert.Equal(t, resultErrorMessage, TransformError(err).Error())
assert.NotNil(t, CleanupError(err))
assert.Equal(t, resultErrorMessage, CleanupError(err).Error())
})
t.Run("url error", func(t *testing.T) {
err := &url.Error{URL: "http://test.test", Op: "Test", Err: fmt.Errorf("test")}
resultErrorMessage := "Test \"<masked url>\": test"
assert.NotNil(t, TransformError(err))
assert.Equal(t, resultErrorMessage, TransformError(err).Error())
assert.NotNil(t, CleanupError(err))
assert.Equal(t, resultErrorMessage, CleanupError(err).Error())
})
}

8
util/builtinobjects/builtinobjects.go
View file

@ -38,8 +38,8 @@ import (
"github.com/anyproto/anytype-heart/pkg/lib/pb/model"
"github.com/anyproto/anytype-heart/space"
"github.com/anyproto/anytype-heart/space/clientspace"
"github.com/anyproto/anytype-heart/util/anyerror"
"github.com/anyproto/anytype-heart/util/constant"
errUtils "github.com/anyproto/anytype-heart/util/error"
"github.com/anyproto/anytype-heart/util/pbtypes"
"github.com/anyproto/anytype-heart/util/uri"
)
@ -251,7 +251,7 @@ func (b *builtinObjects) CreateObjectsForExperience(ctx context.Context, spaceID
}
removeFunc = func() {
if rmErr := os.Remove(path); rmErr != nil {
log.Errorf("failed to remove temporary file: %v", errUtils.TransformError(rmErr))
log.Errorf("failed to remove temporary file: %v", anyerror.CleanupError(rmErr))
}
}
}
@ -286,7 +286,7 @@ func (b *builtinObjects) inject(ctx session.Context, spaceID string, useCase pb.
// TODO: GO-2627 Home page handling should be moved to importer
b.handleHomePage(path, spaceID, func() {
if rmErr := os.Remove(path); rmErr != nil {
log.Errorf("failed to remove temporary file: %v", errUtils.TransformError(rmErr))
log.Errorf("failed to remove temporary file: %v", anyerror.CleanupError(rmErr))
}
}, useCase == migrationUseCase)
@ -523,7 +523,7 @@ func (b *builtinObjects) downloadZipToFile(url string, progress process.Progress
var out *os.File
out, err = os.Create(path)
if err != nil {
return "", errUtils.TransformError(err)
return "", anyerror.CleanupError(err)
}
defer out.Close()