From ff5bd6045a460579627e80667f9ea631381718ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Mon, 4 Dec 2023 10:09:57 +0100 Subject: [PATCH] Bump reva to pull in the retry event changes --- go.mod | 2 +- go.sum | 4 ++-- .../reva/v2/pkg/events/postprocessing.go | 18 ++++++++++++++++++ .../github.com/studio-b12/gowebdav/client.go | 12 ------------ vendor/modules.txt | 2 +- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 37f5fd1a5e..f8dbc7a182 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.9.0 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 - github.com/cs3org/reva/v2 v2.16.1-0.20231208083424-41aa50b4a2e8 + github.com/cs3org/reva/v2 v2.16.1-0.20231212124908-ab6ed782de28 github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 github.com/disintegration/imaging v1.6.2 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e diff --git a/go.sum b/go.sum index 1827f589bb..8cc3aab1f4 100644 --- a/go.sum +++ b/go.sum @@ -1017,8 +1017,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-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY= github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva/v2 v2.16.1-0.20231208083424-41aa50b4a2e8 h1:Z1i5VmeHNc6n0jIl/Iljfs+gt7bhdcVT/5cNxn1XIs4= -github.com/cs3org/reva/v2 v2.16.1-0.20231208083424-41aa50b4a2e8/go.mod h1:zcrrYVsBv/DwhpyO2/W5hoSZ/k6az6Z2EYQok65uqZY= +github.com/cs3org/reva/v2 v2.16.1-0.20231212124908-ab6ed782de28 h1:IhBjtl4F/aAUdbpfjWOy1jwzrh1wLOH50UToPPOqJy8= +github.com/cs3org/reva/v2 v2.16.1-0.20231212124908-ab6ed782de28/go.mod h1:zcrrYVsBv/DwhpyO2/W5hoSZ/k6az6Z2EYQok65uqZY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/cs3org/reva/v2/pkg/events/postprocessing.go b/vendor/github.com/cs3org/reva/v2/pkg/events/postprocessing.go index c6ab698321..cd52a6356d 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/events/postprocessing.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/events/postprocessing.go @@ -49,6 +49,8 @@ var ( PPOutcomeAbort PostprocessingOutcome = "abort" // PPOutcomeContinue means that the upload is moved to its final destination (eventually being marked with pp results) PPOutcomeContinue PostprocessingOutcome = "continue" + // PPOutcomeRetry means that there was a temporary issue and the postprocessing should be retried at a later point in time + PPOutcomeRetry PostprocessingOutcome = "retry" ) // BytesReceived is emitted by the server when it received all bytes of an upload @@ -153,6 +155,22 @@ func (PostprocessingFinished) Unmarshal(v []byte) (interface{}, error) { return e, err } +// PostprocessingRetry is emitted by *some* service which can decide that +type PostprocessingRetry struct { + UploadID string + Filename string + ExecutingUser *user.User + Failures int + BackoffDuration time.Duration +} + +// Unmarshal to fulfill umarshaller interface +func (PostprocessingRetry) Unmarshal(v []byte) (interface{}, error) { + e := PostprocessingRetry{} + err := json.Unmarshal(v, &e) + return e, err +} + // UploadReady is emitted by the storage provider when postprocessing is finished type UploadReady struct { UploadID string diff --git a/vendor/github.com/studio-b12/gowebdav/client.go b/vendor/github.com/studio-b12/gowebdav/client.go index 7ea68d2447..a522dcd78c 100644 --- a/vendor/github.com/studio-b12/gowebdav/client.go +++ b/vendor/github.com/studio-b12/gowebdav/client.go @@ -174,12 +174,6 @@ func (c *Client) ReadDir(path string) ([]os.FileInfo, error) { err := c.propfind(path, false, ` - - - - - - `, &response{}, @@ -226,12 +220,6 @@ func (c *Client) Stat(path string) (os.FileInfo, error) { err := c.propfind(path, true, ` - - - - - - `, &response{}, diff --git a/vendor/modules.txt b/vendor/modules.txt index 64fb0a8e88..2bf5c48991 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -359,7 +359,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.16.1-0.20231208083424-41aa50b4a2e8 +# github.com/cs3org/reva/v2 v2.16.1-0.20231212124908-ab6ed782de28 ## explicit; go 1.20 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime