Merge pull request #3724 from wkloucek/ocdav-version-namespace

set version and namespace for ocdav service
owncloud · May 6, 2022 · 0dd12ca · 0dd12ca
2 parents 1912fd6 + 276ee4b
commit 0dd12ca
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go
@@ -11,6 +11,7 @@ import (
 	"github.com/owncloud/ocis/v2/extensions/ocdav/pkg/logging"
 	"github.com/owncloud/ocis/v2/extensions/ocdav/pkg/server/debug"
 	"github.com/owncloud/ocis/v2/extensions/ocdav/pkg/tracing"
+	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 	"github.com/urfave/cli/v2"
 )
 
@@ -40,6 +41,8 @@ func Server(cfg *config.Config) *cli.Command {
 
 			gr.Add(func() error {
 				s, err := ocdav.Service(
+					ocdav.Name(cfg.HTTP.Namespace+"."+cfg.Service.Name),
+					ocdav.Version(version.String),
 					ocdav.Context(ctx),
 					ocdav.Logger(logger.Logger),
 					ocdav.Address(cfg.HTTP.Addr),

diff --git a/extensions/ocdav/pkg/config/defaults/defaultconfig.go b/extensions/ocdav/pkg/config/defaults/defaultconfig.go
@@ -21,7 +21,7 @@ func DefaultConfig() *config.Config {
 		},
 		HTTP: config.HTTPConfig{
 			Addr:      "127.0.0.1:0", // :0 to pick any free local port
-			Namespace: "",            //TODO: make this configurable for the reva micro service
+			Namespace: "com.owncloud.web",
 			Protocol:  "tcp",
 			Prefix:    "",
 		},

diff --git a/extensions/proxy/pkg/config/defaults/defaultconfig.go b/extensions/proxy/pkg/config/defaults/defaultconfig.go
@@ -118,27 +118,27 @@ func DefaultPolicies() []config.Policy {
 				},
 				{
 					Endpoint: "/remote.php/",
-					Service:  "ocdav",
+					Service:  "com.owncloud.web.ocdav",
 				},
 				{
 					Endpoint: "/dav/",
-					Service:  "ocdav",
+					Service:  "com.owncloud.web.ocdav",
 				},
 				{
 					Endpoint: "/webdav/",
-					Service:  "ocdav",
+					Service:  "com.owncloud.web.ocdav",
 				},
 				{
 					Endpoint: "/status.php",
-					Service:  "ocdav",
+					Service:  "com.owncloud.web.ocdav",
 				},
 				{
 					Endpoint: "/index.php/",
-					Service:  "ocdav",
+					Service:  "com.owncloud.web.ocdav",
 				},
 				{
 					Endpoint: "/apps/",
-					Service:  "ocdav",
+					Service:  "com.owncloud.web.ocdav",
 				},
 				{
 					Endpoint: "/data",

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/blevesearch/bleve_index_api v1.0.1
 	github.com/coreos/go-oidc/v3 v3.1.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde
-	github.com/cs3org/reva/v2 v2.3.0
+	github.com/cs3org/reva/v2 v2.3.1-0.20220506133959-1ad146903c6f
 	github.com/disintegration/imaging v1.6.2
 	github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
 	github.com/go-chi/chi/v5 v5.0.7

diff --git a/go.sum b/go.sum
@@ -320,6 +320,8 @@ github.com/cs3org/reva v1.18.0 h1:MbPS5ZAa8RzKcTxAVeSDdISB3XXqLIxqB03BTN5ReBY=
 github.com/cs3org/reva v1.18.0/go.mod h1:e5VDUDu4vVWIeVkZcW//n6UZzhGGMa+Tz/whCiX3N6o=
 github.com/cs3org/reva/v2 v2.3.0 h1:AwDwqqzAKTrkBz1ifOy3U92C12zk92uBw6LyhLAjCBc=
 github.com/cs3org/reva/v2 v2.3.0/go.mod h1:2e/4HcIy54Mic3V7Ow0bz4n5dkZU0dHIZSWomFe5vng=
+github.com/cs3org/reva/v2 v2.3.1-0.20220506133959-1ad146903c6f h1:1vv8pODAoBgFGCP7UGoQCxvY6hK3vb6KirlqUNRcRys=
+github.com/cs3org/reva/v2 v2.3.1-0.20220506133959-1ad146903c6f/go.mod h1:2e/4HcIy54Mic3V7Ow0bz4n5dkZU0dHIZSWomFe5vng=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=