From dc108d84eabe103c531e6b950a04d1f4964965ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Wed, 18 Jun 2025 10:37:09 +0200 Subject: [PATCH] Bump reva to pull in the latest fixes --- go.mod | 2 +- go.sum | 4 ++-- .../reva/v2/pkg/storage/pkg/decomposedfs/node/node.go | 9 +++++++-- vendor/modules.txt | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 771dfa7cbd..540d7638b5 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/onsi/gomega v1.37.0 github.com/open-policy-agent/opa v1.5.1 github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250603072916-fa601fb14450 - github.com/opencloud-eu/reva/v2 v2.33.2-0.20250617081629-b8210a01030e + github.com/opencloud-eu/reva/v2 v2.33.2-0.20250618070805-d37536f00264 github.com/orcaman/concurrent-map v1.0.0 github.com/pkg/errors v0.9.1 github.com/pkg/xattr v0.4.11 diff --git a/go.sum b/go.sum index 939d85703a..9e28da1cf3 100644 --- a/go.sum +++ b/go.sum @@ -869,8 +869,8 @@ github.com/opencloud-eu/go-micro-plugins/v4/store/nats-js-kv v0.0.0-202505121527 github.com/opencloud-eu/go-micro-plugins/v4/store/nats-js-kv v0.0.0-20250512152754-23325793059a/go.mod h1:pjcozWijkNPbEtX5SIQaxEW/h8VAVZYTLx+70bmB3LY= github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250603072916-fa601fb14450 h1:QWn9G2f1R/EbyZSbkjtd9jqNq9X0NIphmmD4KYLNZtA= github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250603072916-fa601fb14450/go.mod h1:pzatilMEHZFT3qV7C/X3MqOa3NlRQuYhlRhZTL+hN6Q= -github.com/opencloud-eu/reva/v2 v2.33.2-0.20250617081629-b8210a01030e h1:NGAlzzIwtWBBHON+jyXlLwAlIe2v9PVpT90qSu+qLeA= -github.com/opencloud-eu/reva/v2 v2.33.2-0.20250617081629-b8210a01030e/go.mod h1:ky99pvvufLA7wxDHo5RoImfm4H9QqSyvZAHPkcdFTi8= +github.com/opencloud-eu/reva/v2 v2.33.2-0.20250618070805-d37536f00264 h1:dDv/uy8m2L8TpqUis88zy6tILV56m4IVX5qX8CMXZcs= +github.com/opencloud-eu/reva/v2 v2.33.2-0.20250618070805-d37536f00264/go.mod h1:ky99pvvufLA7wxDHo5RoImfm4H9QqSyvZAHPkcdFTi8= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/node/node.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/node/node.go index aabeed2723..11e21a7d11 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/node/node.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/node/node.go @@ -505,12 +505,17 @@ func (n *Node) Child(ctx context.Context, name string) (*Node, error) { return nil, err } - c, err = ReadNode(ctx, n.lu, spaceID, nodeID, false, n.SpaceRoot, true) + readNode, err := ReadNode(ctx, n.lu, spaceID, nodeID, false, n.SpaceRoot, true) if err != nil { return nil, errors.Wrap(err, "could not read child node") } + if !readNode.Exists { + // if the node does not exist we return the manually crafted node instead which contains more + // information than the read node, e.g. the parent id and the name + return c, nil + } - return c, nil + return readNode, nil } // ParentWithReader returns the parent node diff --git a/vendor/modules.txt b/vendor/modules.txt index 6c5d96575f..e1ffddd842 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1210,7 +1210,7 @@ github.com/open-policy-agent/opa/v1/version # github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20250603072916-fa601fb14450 ## explicit; go 1.18 github.com/opencloud-eu/libre-graph-api-go -# github.com/opencloud-eu/reva/v2 v2.33.2-0.20250617081629-b8210a01030e +# github.com/opencloud-eu/reva/v2 v2.33.2-0.20250618070805-d37536f00264 ## explicit; go 1.24.1 github.com/opencloud-eu/reva/v2/cmd/revad/internal/grace github.com/opencloud-eu/reva/v2/cmd/revad/runtime