diff --git a/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go b/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go index fd3c2e32810..7299e5ad62b 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go @@ -138,7 +138,7 @@ var _ = Describe("Decomposed", func() { It("handle already existing directories", func() { for i := 0; i < 10; i++ { go func() { - err := fs.CreateDir(ctx, "fightforit") + err := fs.CreateDir(ctx, &provider.Reference{Path: "."}, "fightforit") if err != nil { rinfo, err := fs.GetMD(ctx, &provider.Reference{Path: "fightforit"}, nil) Expect(err).ToNot(HaveOccurred()) diff --git a/pkg/storage/utils/decomposedfs/lookup.go b/pkg/storage/utils/decomposedfs/lookup.go index e20a2427125..655aff9fe33 100644 --- a/pkg/storage/utils/decomposedfs/lookup.go +++ b/pkg/storage/utils/decomposedfs/lookup.go @@ -63,7 +63,7 @@ func (lu *Lookup) NodeFromResource(ctx context.Context, ref *provider.Reference) } if ref.Path != "" { - return lu.NodeFromPath(ctx, ref.GetPath()) + return lu.NodeFromPath(ctx, ref.Path) } // reference is invalid diff --git a/pkg/storage/utils/decomposedfs/testhelpers/helpers.go b/pkg/storage/utils/decomposedfs/testhelpers/helpers.go index 73015d9251e..eda270b0f42 100644 --- a/pkg/storage/utils/decomposedfs/testhelpers/helpers.go +++ b/pkg/storage/utils/decomposedfs/testhelpers/helpers.go @@ -21,12 +21,14 @@ package helpers import ( "context" "os" + "path" "path/filepath" "github.com/google/uuid" "github.com/stretchr/testify/mock" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" + providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/cs3org/reva/pkg/storage" "github.com/cs3org/reva/pkg/storage/utils/decomposedfs" "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/mocks" @@ -123,13 +125,13 @@ func NewTestEnv() (*TestEnv, error) { } // Create subdir1 in dir1 - err = fs.CreateDir(ctx, "dir1/subdir1") + err = fs.CreateDir(ctx, &providerv1beta1.Reference{Path: "dir1"}, "subdir1") if err != nil { return nil, err } // Create emptydir - err = fs.CreateDir(ctx, "emptydir") + err = fs.CreateDir(ctx, &providerv1beta1.Reference{Path: "."}, "emptydir") if err != nil { return nil, err } @@ -144,7 +146,7 @@ func (t *TestEnv) Cleanup() { // CreateTestDir create a directory and returns a corresponding Node func (t *TestEnv) CreateTestDir(name string) (*node.Node, error) { - err := t.Fs.CreateDir(t.Ctx, name) + err := t.Fs.CreateDir(t.Ctx, &providerv1beta1.Reference{Path: path.Dir(name)}, path.Base(name)) if err != nil { return nil, err }