From e6789a8cfb3e44b498a79cee51cca0647df7882d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 12 Mar 2021 15:29:11 +0100 Subject: [PATCH] Fix linter issues --- pkg/storage/utils/decomposedfs/tree/tree_test.go | 3 +++ pkg/storage/utils/localfs/localfs.go | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/storage/utils/decomposedfs/tree/tree_test.go b/pkg/storage/utils/decomposedfs/tree/tree_test.go index 8015527396a..422b15e67d7 100644 --- a/pkg/storage/utils/decomposedfs/tree/tree_test.go +++ b/pkg/storage/utils/decomposedfs/tree/tree_test.go @@ -145,6 +145,7 @@ var _ = Describe("Tree", func() { Expect(restoreFunc()).To(Succeed()) originalNode, err := env.Lookup.NodeFromPath(env.Ctx, originalPath) + Expect(err).ToNot(HaveOccurred()) Expect(originalNode.Exists).To(BeTrue()) }) @@ -155,9 +156,11 @@ var _ = Describe("Tree", func() { Expect(restoreFunc()).To(Succeed()) newNode, err := env.Lookup.NodeFromPath(env.Ctx, "dir1/newLocation") + Expect(err).ToNot(HaveOccurred()) Expect(newNode.Exists).To(BeTrue()) originalNode, err := env.Lookup.NodeFromPath(env.Ctx, originalPath) + Expect(err).ToNot(HaveOccurred()) Expect(originalNode.Exists).To(BeFalse()) }) diff --git a/pkg/storage/utils/localfs/localfs.go b/pkg/storage/utils/localfs/localfs.go index 835df73602f..1e17c469614 100644 --- a/pkg/storage/utils/localfs/localfs.go +++ b/pkg/storage/utils/localfs/localfs.go @@ -1191,11 +1191,12 @@ func (fs *localfs) RestoreRecycleItem(ctx context.Context, restoreKey, restorePa } var localRestorePath string - if restorePath != "" { + switch { + case restorePath != "": localRestorePath = fs.wrap(ctx, restorePath) - } else if fs.isShareFolder(ctx, filePath) { + case fs.isShareFolder(ctx, filePath): localRestorePath = fs.wrapReferences(ctx, filePath) - } else { + default: localRestorePath = fs.wrap(ctx, filePath) }