updgrade the micro/cli dependency

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/go-log/log v0.2.0 // indirect
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
-	github.com/micro/cli v0.2.0
+	github.com/micro/cli/v2 v2.1.1
 	github.com/micro/go-micro v1.18.0 // indirect
 	github.com/oklog/run v1.0.0
 	github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596
@@ -21,7 +21,7 @@ require (
 	github.com/spf13/viper v1.6.1
 	github.com/uber/jaeger-client-go v2.20.1+incompatible // indirect
 	golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 // indirect
-	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
 	golang.org/x/sys v0.0.0-20200103143344-a1369afcdac7 // indirect
 	google.golang.org/api v0.14.0 // indirect
 	google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb // indirect

go.sum

@@ -162,6 +162,7 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/cs3org/go-cs3apis v0.0.0-20191128165347-19746c015c83 h1:9bcp1jc6+36XUfuOae/w0BVrbzeVKBp/OqhTfCal40U=
@@ -467,6 +468,8 @@ github.com/mholt/certmagic v0.7.5/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaR
 github.com/mholt/certmagic v0.8.3/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ=
 github.com/micro/cli v0.2.0 h1:ut3rV5JWqZjsXIa2MvGF+qMUP8DAUTvHX9Br5gO4afA=
 github.com/micro/cli v0.2.0/go.mod h1:jRT9gmfVKWSS6pkKcXQ8YhUyj6bzwxK8Fp5b0Y7qNnk=
+github.com/micro/cli/v2 v2.1.1 h1:uFw0SMIKmGuyHIm8lXns/NOn7V62bM5y7DnlxUM+BEQ=
+github.com/micro/cli/v2 v2.1.1/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg=
 github.com/micro/go-micro v1.16.0/go.mod h1:A0F58bHLh2m0LAI9QyhvmbN8c1cxhAZo3cM6s+iDsrM=
 github.com/micro/go-micro v1.17.1/go.mod h1:klwUJL1gkdY1MHFyz+fFJXn52dKcty4hoe95Mp571AA=
 github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E=
@@ -538,6 +541,7 @@ github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY=
 github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -641,6 +645,7 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.17.2 h1:RMRHFw2+wF7LO0QqtELQwo8hqSmqISyCJeFeAAuWcRo=
 github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -652,6 +657,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
@@ -941,6 +947,7 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

pkg/command/authbasic.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // AuthBasic is the entrypoint for the auth-basic command.
-func AuthBasic(cfg *config.Config) cli.Command {
-	return cli.Command{
+func AuthBasic(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "auth-basic",
 		Usage: "Start reva authprovider for basic auth",
 		Flags: flagset.AuthBasicWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.AuthBasic.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/authbearer.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // AuthBearer is the entrypoint for the auth-bearer command.
-func AuthBearer(cfg *config.Config) cli.Command {
-	return cli.Command{
+func AuthBearer(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "auth-bearer",
 		Usage: "Start reva authprovider for bearer auth",
 		Flags: flagset.AuthBearerWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.AuthBearer.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/frontend.go

@@ -10,19 +10,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // Frontend is the entrypoint for the frontend command.
-func Frontend(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Frontend(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "frontend",
 		Usage: "Start reva frontend service",
 		Flags: flagset.FrontendWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.Frontend.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/gateway.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // Gateway is the entrypoint for the gateway command.
-func Gateway(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Gateway(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "gateway",
 		Usage: "Start reva gateway",
 		Flags: flagset.GatewayWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.Gateway.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/health.go

@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 )
 
 // Health is the entrypoint for the health command.
-func Health(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Health(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "health",
 		Usage: "Check health status",
 		Flags: flagset.HealthWithConfig(cfg),

pkg/command/root.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-pkg/log"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -22,7 +22,7 @@ func Execute() error {
 		Usage:    "Example service for Reva/oCIS",
 		Compiled: version.Compiled(),
 
-		Authors: []cli.Author{
+		Authors: []*cli.Author{
 			{
 				Name:  "ownCloud GmbH",
 				Email: "[email protected]",
@@ -73,7 +73,7 @@ func Execute() error {
 			return nil
 		},
 
-		Commands: []cli.Command{
+		Commands: []*cli.Command{
 			Frontend(cfg),
 			Gateway(cfg),
 			Users(cfg),

pkg/command/sharing.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // Sharing is the entrypoint for the sharing command.
-func Sharing(cfg *config.Config) cli.Command {
-	return cli.Command{
+func Sharing(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "sharing",
 		Usage: "Start reva sharing service",
 		Flags: flagset.SharingWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.Sharing.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/storagehome.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // StorageHome is the entrypoint for the storage-home command.
-func StorageHome(cfg *config.Config) cli.Command {
-	return cli.Command{
+func StorageHome(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "storage-home",
 		Usage: "Start reva storage-home service",
 		Flags: flagset.StorageHomeWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.StorageHome.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/storagehomedata.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // StorageHomeData is the entrypoint for the storage-home-data command.
-func StorageHomeData(cfg *config.Config) cli.Command {
-	return cli.Command{
+func StorageHomeData(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "storage-home-data",
 		Usage: "Start reva storage-home-data service",
 		Flags: flagset.StorageHomeDataWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.StorageHomeData.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/storageoc.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // StorageOC is the entrypoint for the storage-oc command.
-func StorageOC(cfg *config.Config) cli.Command {
-	return cli.Command{
+func StorageOC(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "storage-oc",
 		Usage: "Start reva storage-oc service",
 		Flags: flagset.StorageOCWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.StorageOC.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/storageocdata.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // StorageOCData is the entrypoint for the storage-oc-data command.
-func StorageOCData(cfg *config.Config) cli.Command {
-	return cli.Command{
+func StorageOCData(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "storage-oc-data",
 		Usage: "Start reva storage-oc-data service",
 		Flags: flagset.StorageOCDataWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.StorageOCData.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

pkg/command/storageroot.go

@@ -9,19 +9,24 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-reva/pkg/config"
 	"github.com/owncloud/ocis-reva/pkg/flagset"
 	"github.com/owncloud/ocis-reva/pkg/server/debug"
 )
 
 // StorageRoot is the entrypoint for the storage-root command.
-func StorageRoot(cfg *config.Config) cli.Command {
-	return cli.Command{
+func StorageRoot(cfg *config.Config) *cli.Command {
+	return &cli.Command{
 		Name:  "storage-root",
 		Usage: "Start reva storage-root service",
 		Flags: flagset.StorageRootWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			cfg.Reva.StorageRoot.Services = c.StringSlice("service")
+
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)