demposedfs: Fix ReadNode call in NodeFromSpaceID()

Pass the correct ID (the spaced id) to ReadNode(). Also fix the
signature of the NodeFromSpaceID method to make it more obvious that
just needs a Resource ID.

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

@@ -141,7 +141,7 @@ func (lu *Lookup) NodeFromID(ctx context.Context, id *provider.ResourceId) (n *n
 	}
 	if id.OpaqueId == "" {
 		// The Resource references the root of a space
-		return lu.NodeFromSpaceID(ctx, id)
+		return lu.NodeFromSpaceID(ctx, id.SpaceId)
 	}
 	return node.ReadNode(ctx, lu, id.SpaceId, id.OpaqueId, false, nil, false)
 }
@@ -162,9 +162,9 @@ func Pathify(id string, depth, width int) string {
 	return b.String()
 }
 
-// NodeFromSpaceID converts a resource id without an opaque id into a Node
-func (lu *Lookup) NodeFromSpaceID(ctx context.Context, id *provider.ResourceId) (n *node.Node, err error) {
-	node, err := node.ReadNode(ctx, lu, id.SpaceId, id.OpaqueId, false, nil, false)
+// NodeFromSpaceID converts a resource id into a Node
+func (lu *Lookup) NodeFromSpaceID(ctx context.Context, spaceID string) (n *node.Node, err error) {
+	node, err := node.ReadNode(ctx, lu, spaceID, spaceID, false, nil, false)
 	if err != nil {
 		return nil, err
 	}

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

@@ -231,15 +231,15 @@ var _ = Describe("Node", func() {
 	})
 	Describe("Permissions", func() {
 		It("Checks the owner permissions on a personal space", func() {
-			node1, err := env.Lookup.NodeFromSpaceID(env.Ctx, env.SpaceRootRes)
+			node1, err := env.Lookup.NodeFromSpaceID(env.Ctx, env.SpaceRootRes.SpaceId)
 			Expect(err).ToNot(HaveOccurred())
 			perms, _ := node1.PermissionSet(env.Ctx)
 			Expect(perms).To(Equal(node.OwnerPermissions()))
 		})
 		It("Checks the manager permissions on a project space", func() {
 			pSpace, err := env.CreateTestStorageSpace("project", &provider.Quota{QuotaMaxBytes: 2000})
 			Expect(err).ToNot(HaveOccurred())
-			nodePSpace, err := env.Lookup.NodeFromSpaceID(env.Ctx, pSpace)
+			nodePSpace, err := env.Lookup.NodeFromSpaceID(env.Ctx, pSpace.SpaceId)
 			Expect(err).ToNot(HaveOccurred())
 			u := ctxpkg.ContextMustGetUser(env.Ctx)
 			env.Permissions.On("AssemblePermissions", mock.Anything, mock.Anything, mock.Anything).Return(provider.ResourcePermissions{
@@ -288,7 +288,7 @@ var _ = Describe("Node", func() {
 				Permissions: ocsconv.NewEditorRole(false).CS3ResourcePermissions(),
 			})
 			Expect(err).ToNot(HaveOccurred())
-			spaceRoot, err := env.Lookup.NodeFromSpaceID(env.Ctx, storageSpace)
+			spaceRoot, err := env.Lookup.NodeFromSpaceID(env.Ctx, storageSpace.SpaceId)
 			Expect(err).ToNot(HaveOccurred())
 			permissionsActual, _ := spaceRoot.PermissionSet(env.Ctx)
 			permissionsExpected := ocsconv.NewEditorRole(false).CS3ResourcePermissions()

pkg/storage/utils/decomposedfs/recycle.go

@@ -58,7 +58,7 @@ func (fs *Decomposedfs) ListRecycle(ctx context.Context, ref *provider.Reference
 	sublog := appctx.GetLogger(ctx).With().Str("space", spaceID).Str("key", key).Str("relative_path", relativePath).Logger()
 
 	// check permissions
-	trashnode, err := fs.lu.NodeFromSpaceID(ctx, ref.ResourceId)
+	trashnode, err := fs.lu.NodeFromSpaceID(ctx, spaceID)
 	if err != nil {
 		return nil, err
 	}

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

@@ -70,10 +70,7 @@ func New(ctx context.Context, info tusd.FileInfo, lu *lookup.Lookup, tp Tree, p
 		return nil, errors.New("Decomposedfs: missing dir in metadata")
 	}
 
-	n, err := lu.NodeFromSpaceID(ctx, &provider.ResourceId{
-		SpaceId:  info.Storage["SpaceRoot"],
-		OpaqueId: info.Storage["SpaceRoot"],
-	})
+	n, err := lu.NodeFromSpaceID(ctx, info.Storage["SpaceRoot"])
 	if err != nil {
 		return nil, errors.Wrap(err, "Decomposedfs: error getting space root node")
 	}