From 07a29133f405ef4218e89204781bbd258167a1f7 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 23 Feb 2022 14:15:36 +0545 Subject: [PATCH] set status values to match what is currently in oCIS frontend.go --- changelog/unreleased/change-status-values.md | 5 +++++ internal/http/services/owncloud/ocdav/status.go | 6 +++--- .../ocs/handlers/cloud/capabilities/capabilities.go | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 changelog/unreleased/change-status-values.md diff --git a/changelog/unreleased/change-status-values.md b/changelog/unreleased/change-status-values.md new file mode 100644 index 00000000000..8effa04b859 --- /dev/null +++ b/changelog/unreleased/change-status-values.md @@ -0,0 +1,5 @@ +Change: Update hard-coded status values + +The hard-coded version and product values have been updated to match the values currently used for capabilities in oCIS. + +https://github.com/cs3org/reva/pull/2581 diff --git a/internal/http/services/owncloud/ocdav/status.go b/internal/http/services/owncloud/ocdav/status.go index 4b857fed050..d7257acf063 100644 --- a/internal/http/services/owncloud/ocdav/status.go +++ b/internal/http/services/owncloud/ocdav/status.go @@ -32,10 +32,10 @@ func (s *svc) doStatus(w http.ResponseWriter, r *http.Request) { Installed: true, Maintenance: false, NeedsDBUpgrade: false, - Version: "10.0.9.5", // TODO(jfd) make build/config determined - VersionString: "10.0.9", + Version: "10.0.11.5", // TODO(jfd) make build/config determined + VersionString: "10.0.11", Edition: "community", - ProductName: "ownCloud", + ProductName: "reva", } statusJSON, err := json.MarshalIndent(status, "", " ") diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go index 29996a50d71..9c977ca5bf7 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go @@ -64,10 +64,10 @@ func (h *Handler) Init(c *config.Config) { // h.c.Capabilities.Core.Status.Maintenance is boolean // h.c.Capabilities.Core.Status.NeedsDBUpgrade is boolean if h.c.Capabilities.Core.Status.Version == "" { - h.c.Capabilities.Core.Status.Version = "10.0.9.5" // TODO make build determined + h.c.Capabilities.Core.Status.Version = "10.0.11.5" // TODO make build determined } if h.c.Capabilities.Core.Status.VersionString == "" { - h.c.Capabilities.Core.Status.VersionString = "10.0.9" // TODO make build determined + 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 = "community" // TODO make build determined @@ -213,8 +213,8 @@ func (h *Handler) Init(c *config.Config) { // TODO get from build env Major: 10, Minor: 0, - Micro: 9, - String: "10.0.9", + Micro: 11, + String: "10.0.11", Edition: "community", } }