From b52b42419142f6b955013483c87287dc1e2cf9fe Mon Sep 17 00:00:00 2001 From: jkoberg Date: Thu, 25 Jul 2024 11:50:30 +0200 Subject: [PATCH] feat(reva): bump reva Signed-off-by: jkoberg --- changelog/unreleased/bump-reva.md | 1 + go.mod | 2 +- go.sum | 4 ++-- .../reva/v2/pkg/storage/utils/decomposedfs/upload/upload.go | 2 +- vendor/modules.txt | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changelog/unreleased/bump-reva.md b/changelog/unreleased/bump-reva.md index 177a875099..c72b812b38 100644 --- a/changelog/unreleased/bump-reva.md +++ b/changelog/unreleased/bump-reva.md @@ -1,5 +1,6 @@ Enhancement: Bump reva +https://github.com/owncloud/ocis/pull/9690 https://github.com/owncloud/ocis/pull/9662 https://github.com/owncloud/ocis/pull/9621 https://github.com/owncloud/ocis/pull/9677 diff --git a/go.mod b/go.mod index d85d51cd1e..b60acd7b85 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.10.0 github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb - github.com/cs3org/reva/v2 v2.21.1-0.20240725083514-19e4d645016b + github.com/cs3org/reva/v2 v2.21.1-0.20240725094850-569a027d5cc6 github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e github.com/egirna/icap-client v0.1.1 diff --git a/go.sum b/go.sum index f215cfd37d..2309f36abd 100644 --- a/go.sum +++ b/go.sum @@ -1025,8 +1025,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c= github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME= github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb h1:KmYZDReplv/yfwc1LNYpDcVhVujC3Pasv6WjXx1haSU= github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb/go.mod h1:yyP8PRo0EZou3nSH7H4qjlzQwaydPeIRNgX50npQHpE= -github.com/cs3org/reva/v2 v2.21.1-0.20240725083514-19e4d645016b h1:3pq7bPCy7NUtlIWytzB4+MP8I6V8bgIdHxsrmyKbHzU= -github.com/cs3org/reva/v2 v2.21.1-0.20240725083514-19e4d645016b/go.mod h1:vz5FHfuRaLvSO6bscoWWx+29RtyJm0wIWLZciCLN3L0= +github.com/cs3org/reva/v2 v2.21.1-0.20240725094850-569a027d5cc6 h1:kGRQf90rhI4L2vU+RxPIP8LHmCkGhESV3VpML3Owkh0= +github.com/cs3org/reva/v2 v2.21.1-0.20240725094850-569a027d5cc6/go.mod h1:vz5FHfuRaLvSO6bscoWWx+29RtyJm0wIWLZciCLN3L0= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= diff --git a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload/upload.go b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload/upload.go index d540dbf142..92c9438f7e 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload/upload.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload/upload.go @@ -171,7 +171,7 @@ func (session *OcisSession) FinishUpload(ctx context.Context) error { metrics.UploadProcessing.Inc() metrics.UploadSessionsBytesReceived.Inc() - if session.store.pub != nil { + if session.store.pub != nil && session.info.Size > 0 { u, _ := ctxpkg.ContextGetUser(ctx) s, err := session.URL(ctx) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 29c8285e91..047f7b61b2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -366,7 +366,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.21.1-0.20240725083514-19e4d645016b +# github.com/cs3org/reva/v2 v2.21.1-0.20240725094850-569a027d5cc6 ## explicit; go 1.21 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime