From 7458598e09af35a87d52cf9d2ea41f9d51e02714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Mon, 27 Apr 2026 15:46:38 +0200 Subject: [PATCH] Bump reva --- go.mod | 2 +- go.sum | 4 ++-- .../grpc/services/storageprovider/storageprovider.go | 10 ---------- .../opencloud-eu/reva/v2/pkg/appctx/appctx.go | 10 ---------- .../reva/v2/pkg/storage/fs/posix/idcache/idcache.go | 2 +- .../reva/v2/pkg/storage/fs/posix/tree/tree.go | 6 ------ .../reva/v2/pkg/storage/pkg/decomposedfs/tree/tree.go | 5 ----- .../v2/pkg/storage/utils/decomposedfs/tree/tree.go | 5 ----- vendor/modules.txt | 2 +- 9 files changed, 5 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 0fbcbeaa52..7610eef3c5 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/open-policy-agent/opa v1.15.2 github.com/opencloud-eu/icap-client v0.0.0-20250930132611-28a2afe62d89 github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20260310090739-853d972b282d - github.com/opencloud-eu/reva/v2 v2.43.1-0.20260424123852-c254710aa2af + github.com/opencloud-eu/reva/v2 v2.43.1-0.20260427134526-f55e0775a1a4 github.com/opensearch-project/opensearch-go/v4 v4.6.0 github.com/orcaman/concurrent-map v1.0.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index ae6170906e..c90f9b09c4 100644 --- a/go.sum +++ b/go.sum @@ -952,8 +952,8 @@ github.com/opencloud-eu/inotifywaitgo v0.0.0-20251111171128-a390bae3c5e9 h1:dIft github.com/opencloud-eu/inotifywaitgo v0.0.0-20251111171128-a390bae3c5e9/go.mod h1:JWyDC6H+5oZRdUJUgKuaye+8Ph5hEs6HVzVoPKzWSGI= github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20260310090739-853d972b282d h1:JcqGDiyrcaQwVyV861TUyQgO7uEmsjkhfm7aQd84dOw= github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20260310090739-853d972b282d/go.mod h1:pzatilMEHZFT3qV7C/X3MqOa3NlRQuYhlRhZTL+hN6Q= -github.com/opencloud-eu/reva/v2 v2.43.1-0.20260424123852-c254710aa2af h1:o8zanHwKy+hmHj/4CUZNAH6o05lPR5lyDLIs4E5y9Ng= -github.com/opencloud-eu/reva/v2 v2.43.1-0.20260424123852-c254710aa2af/go.mod h1:msu4TkFw7Jxog0QRbGPxyQOJG9sago5nc+f//y+bbpI= +github.com/opencloud-eu/reva/v2 v2.43.1-0.20260427134526-f55e0775a1a4 h1:ZMpTq6CWNuO1zkNys8MXMzihhWdH/TKq2aQIfa1kz0c= +github.com/opencloud-eu/reva/v2 v2.43.1-0.20260427134526-f55e0775a1a4/go.mod h1:msu4TkFw7Jxog0QRbGPxyQOJG9sago5nc+f//y+bbpI= github.com/opencloud-eu/secure v0.0.0-20260312082735-b6f5cb2244e4 h1:l2oB/RctH+t8r7QBj5p8thfEHCM/jF35aAY3WQ3hADI= github.com/opencloud-eu/secure v0.0.0-20260312082735-b6f5cb2244e4/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= diff --git a/vendor/github.com/opencloud-eu/reva/v2/internal/grpc/services/storageprovider/storageprovider.go b/vendor/github.com/opencloud-eu/reva/v2/internal/grpc/services/storageprovider/storageprovider.go index e14907025f..8a50c9c43f 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/internal/grpc/services/storageprovider/storageprovider.go +++ b/vendor/github.com/opencloud-eu/reva/v2/internal/grpc/services/storageprovider/storageprovider.go @@ -744,16 +744,6 @@ func (s *Service) Delete(ctx context.Context, req *provider.DeleteRequest) (*pro } ctx = ctxpkg.ContextSetLockID(ctx, req.LockId) - - // check DeleteRequest for any known opaque properties. - // FIXME these should be part of the DeleteRequest object - if req.Opaque != nil { - if _, ok := req.Opaque.Map["deleting_shared_resource"]; ok { - // it is a binary key; its existence signals true. Although, do not assume. - ctx = appctx.WithDeletingSharedResource(ctx) - } - } - md, err := s.Storage.GetMD(ctx, req.Ref, []string{}, []string{"id", "status"}) if err != nil { return &provider.DeleteResponse{ diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/appctx/appctx.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/appctx/appctx.go index 049ac9df46..336c5618d1 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/appctx/appctx.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/appctx/appctx.go @@ -27,16 +27,6 @@ import ( "go.opentelemetry.io/otel/trace" ) -// deletingSharedResource flags to a storage a shared resource is being deleted not by the owner. -type deletingSharedResource struct{} - -func WithDeletingSharedResource(ctx context.Context) context.Context { - return context.WithValue(ctx, deletingSharedResource{}, struct{}{}) -} -func DeletingSharedResourceFromContext(ctx context.Context) bool { - return ctx.Value(deletingSharedResource{}) != nil -} - // WithLogger returns a context with an associated logger. func WithLogger(ctx context.Context, l *zerolog.Logger) context.Context { return l.WithContext(ctx) diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/idcache/idcache.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/idcache/idcache.go index 861e19180c..bff9f0e5d8 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/idcache/idcache.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/idcache/idcache.go @@ -74,7 +74,7 @@ func (c *IDCache) DeleteByPath(ctx context.Context, path string) error { } } - watcher, err := c.kv.Watch(ctx, baseKey+".*") + watcher, err := c.kv.Watch(ctx, baseKey+".>") if err != nil { return err } diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go index f3f8fb9c15..39124887f0 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go @@ -40,7 +40,6 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/opencloud-eu/reva/v2/pkg/appctx" "github.com/opencloud-eu/reva/v2/pkg/errtypes" "github.com/opencloud-eu/reva/v2/pkg/events" "github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/blobstore" @@ -590,11 +589,6 @@ func (t *Tree) Delete(ctx context.Context, n *node.Node) error { } }() - if appctx.DeletingSharedResourceFromContext(ctx) { - src := filepath.Join(n.ParentPath(), n.Name) - return os.RemoveAll(src) - } - var sizeDiff int64 if n.IsDir(ctx) { treesize, err := n.GetTreeSize(ctx) diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/tree/tree.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/tree/tree.go index 47d6ab0586..c718b3f163 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/tree/tree.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/tree/tree.go @@ -429,11 +429,6 @@ func (t *Tree) Delete(ctx context.Context, n *node.Node) (err error) { // remove entry from cache immediately to avoid inconsistencies defer func() { _ = t.idCache.Delete(path) }() - if appctx.DeletingSharedResourceFromContext(ctx) { - src := filepath.Join(n.ParentPath(), n.Name) - return os.Remove(src) - } - // get the original path origin, err := t.lookup.Path(ctx, n, node.NoCheck) if err != nil { diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/utils/decomposedfs/tree/tree.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/utils/decomposedfs/tree/tree.go index 1162836ea6..6fdf2df3c5 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/utils/decomposedfs/tree/tree.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/utils/decomposedfs/tree/tree.go @@ -445,11 +445,6 @@ func (t *Tree) Delete(ctx context.Context, n *node.Node) (err error) { // remove entry from cache immediately to avoid inconsistencies defer func() { _ = t.idCache.Delete(path) }() - if appctx.DeletingSharedResourceFromContext(ctx) { - src := filepath.Join(n.ParentPath(), n.Name) - return os.Remove(src) - } - // get the original path origin, err := t.lookup.Path(ctx, n, node.NoCheck) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 26d641173e..7cba8a563b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1371,7 +1371,7 @@ github.com/opencloud-eu/icap-client # github.com/opencloud-eu/libre-graph-api-go v1.0.8-0.20260310090739-853d972b282d ## explicit; go 1.18 github.com/opencloud-eu/libre-graph-api-go -# github.com/opencloud-eu/reva/v2 v2.43.1-0.20260424123852-c254710aa2af +# github.com/opencloud-eu/reva/v2 v2.43.1-0.20260427134526-f55e0775a1a4 ## explicit; go 1.25.0 github.com/opencloud-eu/reva/v2/cmd/revad/internal/grace github.com/opencloud-eu/reva/v2/cmd/revad/runtime