Merge pull request cs3org#4774 from butonic/fix-micro-ocdav-register

fix micro ocdav service

changelog/unreleased/bump-ocis.md

@@ -1,4 +1,4 @@
-Change: Ocis bumped.
+Change: Ocis bumped
 
 Ocis bumped. The expected failures removed.
 

changelog/unreleased/fix-micro-ocdav-registry.md

@@ -0,0 +1,5 @@
+Bugfix: Fix micro ocdav service init and registration
+
+We no longer call Init to configure default options because it was replacing the existing options.
+
+https://github.com/cs3org/reva/pull/4774

pkg/micro/ocdav/option.go

@@ -21,6 +21,7 @@ package ocdav
 import (
 	"context"
 	"crypto/tls"
+	"time"
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
 	"github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav"
@@ -70,6 +71,9 @@ type Options struct {
 	AllowedHeaders     []string
 	AllowedMethods     []string
 	AllowDepthInfinity bool
+
+	RegisterTTL      time.Duration
+	RegisterInterval time.Duration
 }
 
 // newOptions initializes the available default options.
@@ -383,3 +387,17 @@ func ItemNameMaxLength(i int) Option {
 		o.config.NameValidation.MaxLength = i
 	}
 }
+
+// RegisterTTL provides a function to set the RegisterTTL option.
+func RegisterTTL(ttl time.Duration) Option {
+	return func(o *Options) {
+		o.RegisterTTL = ttl
+	}
+}
+
+// RegisterInterval provides a function to set the RegisterInterval option.
+func RegisterInterval(interval time.Duration) Option {
+	return func(o *Options) {
+		o.RegisterInterval = interval
+	}
+}

pkg/micro/ocdav/service.go

@@ -78,6 +78,8 @@ func Service(opts ...Option) (micro.Service, error) {
 		server.Name(sopts.Name),
 		server.Address(sopts.Address), // Address defaults to ":0" and will pick any free port
 		server.Version(sopts.config.VersionString),
+		server.RegisterTTL(sopts.RegisterTTL),
+		server.RegisterInterval(sopts.RegisterInterval),
 	)
 
 	revaService, err := ocdav.NewWith(&sopts.config, sopts.FavoriteManager, sopts.lockSystem, &sopts.Logger, sopts.GatewaySelector)
@@ -125,9 +127,6 @@ func Service(opts ...Option) (micro.Service, error) {
 		micro.Registry(registry.GetRegistry()),
 	)
 
-	// Init the service? make that optional?
-	service.Init()
-
 	// finally, return the service so it can be Run() by the caller himself
 	return service, nil
 }