Merge branch 'master' into fix-simple

pkg/command/revastorageeos.go

@@ -0,0 +1,40 @@
+package command
+
+import (
+	"github.com/micro/cli/v2"
+	"github.com/owncloud/ocis-reva/pkg/command"
+	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/pkg/config"
+	"github.com/owncloud/ocis/pkg/register"
+)
+
+// RevaStorageEOSCommand is the entrypoint for the reva-storage-oc command.
+func RevaStorageEOSCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:     "reva-storage-eos",
+		Usage:    "Start reva eos storage",
+		Category: "Extensions",
+		Flags:    flagset.StorageEOSWithConfig(cfg.Reva),
+		Action: func(c *cli.Context) error {
+			scfg := configureRevaStorageEOS(cfg)
+
+			return cli.HandleAction(
+				command.StorageEOS(scfg).Action,
+				c,
+			)
+		},
+	}
+}
+
+func configureRevaStorageEOS(cfg *config.Config) *svcconfig.Config {
+	cfg.Reva.Log.Level = cfg.Log.Level
+	cfg.Reva.Log.Pretty = cfg.Log.Pretty
+	cfg.Reva.Log.Color = cfg.Log.Color
+
+	return cfg.Reva
+}
+
+func init() {
+	register.AddCommand(RevaStorageEOSCommand)
+}

pkg/command/revastorageeosdata.go

@@ -0,0 +1,40 @@
+package command
+
+import (
+	"github.com/micro/cli/v2"
+	"github.com/owncloud/ocis-reva/pkg/command"
+	svcconfig "github.com/owncloud/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/pkg/config"
+	"github.com/owncloud/ocis/pkg/register"
+)
+
+// RevaStorageEOSDataCommand is the entrypoint for the reva-storage-eos-data command.
+func RevaStorageEOSDataCommand(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:     "reva-storage-eos-data",
+		Usage:    "Start reva eos storage dataprovider",
+		Category: "Extensions",
+		Flags:    flagset.StorageEOSDataWithConfig(cfg.Reva),
+		Action: func(c *cli.Context) error {
+			scfg := configureRevaStorageEOSData(cfg)
+
+			return cli.HandleAction(
+				command.StorageEOSData(scfg).Action,
+				c,
+			)
+		},
+	}
+}
+
+func configureRevaStorageEOSData(cfg *config.Config) *svcconfig.Config {
+	cfg.Reva.Log.Level = cfg.Log.Level
+	cfg.Reva.Log.Pretty = cfg.Log.Pretty
+	cfg.Reva.Log.Color = cfg.Log.Color
+
+	return cfg.Reva
+}
+
+func init() {
+	register.AddCommand(RevaStorageEOSDataCommand)
+}

pkg/command/revastoragehome.go

@@ -32,8 +32,6 @@ func configureRevaStorageHome(cfg *config.Config) *svcconfig.Config {
 	cfg.Reva.Log.Pretty = cfg.Log.Pretty
 	cfg.Reva.Log.Color = cfg.Log.Color
 
-	cfg.Reva.Reva.StorageHome.ExposeDataServer = true
-
 	return cfg.Reva
 }
 

pkg/command/revastorageoc.go

@@ -32,8 +32,6 @@ func configureRevaStorageOC(cfg *config.Config) *svcconfig.Config {
 	cfg.Reva.Log.Pretty = cfg.Log.Pretty
 	cfg.Reva.Log.Color = cfg.Log.Color
 
-	cfg.Reva.Reva.StorageOC.ExposeDataServer = true
-
 	return cfg.Reva
 }
 

pkg/flagset/flagset.go

@@ -84,7 +84,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "tracing-service",
-			Value:       "hello",
+			Value:       "ocis",
 			Usage:       "Service name for tracing",
 			EnvVars:     []string{"OCIS_TRACING_SERVICE"},
 			Destination: &cfg.Tracing.Service,

pkg/micro/runtime/runtime.go

@@ -45,6 +45,8 @@ var (
 		//"reva-storage-root",
 		"reva-storage-home",
 		"reva-storage-home-data",
+		"reva-storage-eos",
+		"reva-storage-eos-data",
 		"reva-storage-oc",
 		"reva-storage-oc-data",
 		"glauth",