diff --git a/go.mod b/go.mod index 70431fe53..27aec7e1c 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega v1.37.0 github.com/open-policy-agent/opa v1.3.0 - github.com/opencloud-eu/reva/v2 v2.30.1-0.20250407124041-555278af14dd + github.com/opencloud-eu/reva/v2 v2.31.0 github.com/orcaman/concurrent-map v1.0.0 github.com/owncloud/libre-graph-api-go v1.0.5-0.20240829135935-80dc00d6f5ea github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index b105b595e..5fbeeb156 100644 --- a/go.sum +++ b/go.sum @@ -865,8 +865,8 @@ github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y= github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= github.com/open-policy-agent/opa v1.3.0 h1:zVvQvQg+9+FuSRBt4LgKNzJwsWl/c85kD5jPozJTydY= github.com/open-policy-agent/opa v1.3.0/go.mod h1:t9iPNhaplD2qpiBqeudzJtEX3fKHK8zdA29oFvofAHo= -github.com/opencloud-eu/reva/v2 v2.30.1-0.20250407124041-555278af14dd h1:xyShDegTidAv844jpUsWLur5S9PDX5RCUpvIZbsJboQ= -github.com/opencloud-eu/reva/v2 v2.30.1-0.20250407124041-555278af14dd/go.mod h1:8MT1a/WJASZZhlSMC0oeE3ECQdjqFw3BUiiAIZ/JR8I= +github.com/opencloud-eu/reva/v2 v2.31.0 h1:UVgeb0hSPoaDdqcKSJ7XZAhXCtHaVK9qm/JtFtJM/7U= +github.com/opencloud-eu/reva/v2 v2.31.0/go.mod h1:8MT1a/WJASZZhlSMC0oeE3ECQdjqFw3BUiiAIZ/JR8I= 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/internal/http/services/owncloud/ocdav/config/config.go b/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/config/config.go index fbdd6918d..4d6de02c5 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/config/config.go +++ b/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/config/config.go @@ -27,6 +27,7 @@ type Config struct { FavoriteStorageDrivers map[string]map[string]interface{} `mapstructure:"favorite_storage_drivers"` Version string `mapstructure:"version"` VersionString string `mapstructure:"version_string"` + Edition string `mapstructure:"edition"` Product string `mapstructure:"product"` ProductName string `mapstructure:"product_name"` ProductVersion string `mapstructure:"product_version"` diff --git a/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/status.go b/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/status.go index 8f3fadae1..c14afc3e4 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/status.go +++ b/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocdav/status.go @@ -34,6 +34,7 @@ func (s *svc) doStatus(w http.ResponseWriter, r *http.Request) { NeedsDBUpgrade: false, Version: s.c.Version, VersionString: s.c.VersionString, + Edition: s.c.Edition, ProductName: s.c.ProductName, ProductVersion: s.c.ProductVersion, Product: s.c.Product, diff --git a/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go b/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go index 054bf074e..d8b4fcf33 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go +++ b/vendor/github.com/opencloud-eu/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go @@ -69,6 +69,9 @@ func (h *Handler) Init(c *config.Config) { if h.c.Capabilities.Core.Status.VersionString == "" { h.c.Capabilities.Core.Status.VersionString = "10.0.11" // TODO make build determined } + if h.c.Capabilities.Core.Status.Edition == "" { + h.c.Capabilities.Core.Status.Edition = "" // TODO make build determined + } if h.c.Capabilities.Core.Status.ProductName == "" { h.c.Capabilities.Core.Status.ProductName = "reva" // TODO make build determined } @@ -217,6 +220,7 @@ func (h *Handler) Init(c *config.Config) { Minor: 0, Micro: 11, String: "10.0.11", + Edition: "", Product: "reva", ProductVersion: "", } diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/micro/ocdav/option.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/micro/ocdav/option.go index ea99267a7..72ed1c9b7 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/micro/ocdav/option.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/micro/ocdav/option.go @@ -297,6 +297,13 @@ func VersionString(val string) Option { } } +// Edition provides a function to set the Edition config option. +func Edition(val string) Option { + return func(o *Options) { + o.config.Edition = val + } +} + // Product provides a function to set the Product config option. func Product(val string) Option { return func(o *Options) { diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/owncloud/ocs/capabilities.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/owncloud/ocs/capabilities.go index 3dd9ab93b..8d754cd75 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/owncloud/ocs/capabilities.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/owncloud/ocs/capabilities.go @@ -142,6 +142,7 @@ type Status struct { NeedsDBUpgrade ocsBool `json:"needsDbUpgrade" xml:"needsDbUpgrade"` Version string `json:"version" xml:"version"` VersionString string `json:"versionstring" xml:"versionstring"` + Edition string `json:"edition" xml:"edition"` ProductName string `json:"productname" xml:"productname"` Product string `json:"product" xml:"product"` ProductVersion string `json:"productversion" xml:"productversion"` @@ -308,6 +309,7 @@ type Version struct { Minor int `json:"minor" xml:"minor"` Micro int `json:"micro" xml:"micro"` // = patch level String string `json:"string" xml:"string"` + Edition string `json:"edition" xml:"edition"` Product string `json:"product" xml:"product"` ProductVersion string `json:"productversion" xml:"productversion"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0f47c9776..249100bff 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1198,7 +1198,7 @@ github.com/open-policy-agent/opa/v1/types github.com/open-policy-agent/opa/v1/util github.com/open-policy-agent/opa/v1/util/decoding github.com/open-policy-agent/opa/v1/version -# github.com/opencloud-eu/reva/v2 v2.30.1-0.20250407124041-555278af14dd +# github.com/opencloud-eu/reva/v2 v2.31.0 ## explicit; go 1.24.1 github.com/opencloud-eu/reva/v2/cmd/revad/internal/grace github.com/opencloud-eu/reva/v2/cmd/revad/runtime