Fix creating new nodes

pkg/storage/utils/decomposedfs/lookup/lookup.go

@@ -21,11 +21,9 @@ package lookup
 import (
  "context"
  "fmt"
- "io/fs"
  "os"
  "path/filepath"
  "strings"
- "syscall"
 
  user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
  provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -99,22 +97,9 @@ func readChildNodeFromLink(path string) (string, error) {
  return nodeID, nil
 }
 
-// The os error is buried inside the fs.PathError error
-func isNotDir(err error) bool {
- if perr, ok := err.(*fs.PathError); ok {
- if serr, ok2 := perr.Err.(syscall.Errno); ok2 {
- return serr == syscall.ENOTDIR
- }
- }
- return false
-}
-
 func (lu *Lookup) NodeIDFromParentAndName(ctx context.Context, parent *node.Node, name string) (string, error) {
  nodeID, err := readChildNodeFromLink(filepath.Join(parent.InternalPath(), name))
  if err != nil {
- if errors.Is(err, fs.ErrNotExist) || isNotDir(err) {
- return nodeID, nil // if the file does not exist we return a node that has Exists = false
- }
  return "", errors.Wrap(err, "decomposedfs: Wrap: readlink error")
  }
  return nodeID, nil

pkg/storage/utils/decomposedfs/metadata/errors.go

@@ -19,6 +19,7 @@
 package metadata
 
 import (
+ "io/fs"
  "os"
  "syscall"
 
@@ -50,3 +51,13 @@ func IsAttrUnset(err error) bool {
  }
  return false
 }
+
+// The os error is buried inside the fs.PathError error
+func IsNotDir(err error) bool {
+ if perr, ok := errors.Cause(err).(*fs.PathError); ok {
+ if serr, ok2 := perr.Err.(syscall.Errno); ok2 {
+ return serr == syscall.ENOTDIR
+ }
+ }
+ return false
+}

pkg/storage/utils/decomposedfs/node/node.go

@@ -395,12 +395,10 @@ func (n *Node) Child(ctx context.Context, name string) (*Node, error) {
  }
 
  nodeID, err := n.lu.NodeIDFromParentAndName(ctx, n, name)
- switch err.(type) {
- case nil:
- // ok
- case errtypes.IsNotFound:
+ switch {
+ case metadata.IsNotExist(err) || metadata.IsNotDir(err):
  return c, nil // if the file does not exist we return a node that has Exists = false
- default:
+ case err != nil:
  return nil, err
  }
 

pkg/storage/utils/decomposedfs/node/node_test.go

@@ -161,7 +161,7 @@ var _ = Describe("Node", func() {
  Expect(child.Blobsize).To(Equal(int64(1234)))
  })
 
- It("handles (broken) links including file segments by returning an non-existent node", func() {
+ It("handles broken links including file segments by returning an non-existent node", func() {
  child, err := parent.Child(env.Ctx, "file1/broken")
  Expect(err).ToNot(HaveOccurred())
  Expect(child).ToNot(BeNil())

pkg/storage/utils/decomposedfs/options/options_test.go

@@ -43,7 +43,7 @@ var _ = Describe("Options", func() {
  })
 
  It("sets defaults", func() {
- Expect(len(o.UserLayout) > 0).To(BeTrue())
+ Expect(o.MetadataBackend).ToNot(BeEmpty())
  })
 
  Context("with unclean root path configuration", func() {

pkg/storage/utils/decomposedfs/upload/store.go

@@ -63,15 +63,15 @@ type OcisStore struct {
 }
 
 // NewSessionStore returns a new OcisStore
-func NewSessionStore(lu node.PathLookup, tp Tree, root string, pub events.Publisher, async bool, tknopts options.TokenOptions, DisableVersioning bool) *OcisStore {
+func NewSessionStore(lu node.PathLookup, tp Tree, root string, pub events.Publisher, async bool, tknopts options.TokenOptions, disableVersioning bool) *OcisStore {
  return &OcisStore{
  lu: lu,
  tp: tp,
  root: root,
  pub: pub,
  async: async,
  tknopts: tknopts,
- disableVersioning: DisableVersioning,
+ disableVersioning: disableVersioning,
  }
 }
 

pkg/storage/utils/decomposedfs/upload/store_test.go

@@ -38,7 +38,9 @@ func TestInitNewNode(t *testing.T) {
  if err != nil {
  t.Fatalf(err.Error())
  }
- defer unlock()
+ defer func() {
+ _ = unlock()
+ }()
 
  // try initializing the same new node again in case a concurrent requests tries to create a file with the same name
  n = node.New("e48c4e7a-beac-4b82-b991-a5cff7b8c39c", "a6ede986-cfcd-41c5-a820-6eee955a1c2b", "e48c4e7a-beac-4b82-b991-a5cff7b8c39c", "newchild", 10, "26493c53-2634-45f8-949f-dc07b88df9b0", providerv1beta1.ResourceType_RESOURCE_TYPE_FILE, &userv1beta1.UserId{}, lookup)
@@ -47,5 +49,5 @@ func TestInitNewNode(t *testing.T) {
  if _, ok := err.(errtypes.IsAlreadyExists); !ok {
  t.Fatalf(`initNewNode(with same 'newchild' name), %v, want %v`, err, errtypes.AlreadyExists("newchild"))
  }
- unlock2()
+ _ = unlock2()
 }