clean up the new commands

extensions/auth-basic/pkg/command/command.go

@@ -26,9 +26,6 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-basic",
 		Usage: "start authprovider for basic auth",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-auth-basic")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(

extensions/auth-bearer/pkg/command/command.go

@@ -24,9 +24,6 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-bearer",
 		Usage: "start authprovider for bearer auth",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-auth-bearer")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(

extensions/auth-machine/pkg/command/command.go

@@ -24,9 +24,6 @@ func AuthMachine(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-machine",
 		Usage: "start authprovider for machine auth",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-auth-machine")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(

extensions/frontend/pkg/command/command.go

@@ -32,7 +32,6 @@ func Frontend(cfg *config.Config) *cli.Command {
 			if err := loadUserAgent(c, cfg); err != nil {
 				return err
 			}
-			// return ParseConfig(c, cfg, "storage-frontend")
 			return nil
 		},
 		Action: func(c *cli.Context) error {

extensions/gateway/pkg/command/command.go

@@ -31,10 +31,6 @@ func Gateway(cfg *config.Config) *cli.Command {
 		Name:  "gateway",
 		Usage: "start gateway",
 		Before: func(c *cli.Context) error {
-			// if err := ParseConfig(c, cfg, "storage-gateway"); err != nil {
-			// 	return err
-			// }
-
 			if cfg.DataGatewayPublicURL == "" {
 				cfg.DataGatewayPublicURL = strings.TrimRight(cfg.FrontendPublicURL, "/") + "/data"
 			}

extensions/group/pkg/command/command.go

@@ -26,9 +26,6 @@ func Groups(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "groups",
 		Usage: "start groups service",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-groups")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(

extensions/ocdav/pkg/command/ocdav.go

@@ -29,7 +29,6 @@ func OCDav(cfg *config.Config) *cli.Command {
 			if err := loadUserAgent(c, cfg); err != nil {
 				return err
 			}
-			// return ParseConfig(c, cfg, "ocdav")
 			return nil
 		},
 		Action: func(c *cli.Context) error {

extensions/storage-publiclink/pkg/command/storagepubliclink.go

@@ -22,11 +22,8 @@ import (
 // StoragePublicLink is the entrypoint for the reva-storage-public-link command.
 func StoragePublicLink(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:  "storage-public-link",
-		Usage: "start storage-public-link service",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-public-link")
-		// },
+		Name:     "storage-public-link",
+		Usage:    "start storage-public-link service",
 		Category: "extensions",
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging

extensions/storage-shares/pkg/command/command.go

@@ -25,9 +25,6 @@ func StorageShares(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-shares",
 		Usage: "start storage-shares service",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-shares")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(

extensions/storage-users/pkg/command/command.go

@@ -24,9 +24,6 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-users",
 		Usage: "start storage-users service",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-userprovider")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(

extensions/storage/pkg/command/health.go

@@ -14,9 +14,9 @@ func Health(cfg *config.Config) *cli.Command {
 		Name:     "health",
 		Usage:    "check health status",
 		Category: "info",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage")
-		},
+		// Before: func(c *cli.Context) error {
+		// 	return ParseConfig(c, cfg, "storage")
+		// },
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

extensions/storage/pkg/command/root.go

@@ -35,9 +35,9 @@ func Execute(cfg *config.Config) error {
 		Name:  "storage",
 		Usage: "Storage service for oCIS",
 
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage")
-		},
+		// Before: func(c *cli.Context) error {
+		// 	return ParseConfig(c, cfg, "storage")
+		// },
 
 		Commands: GetCommands(cfg),
 	})

extensions/storage/pkg/command/sharing.go

@@ -1,240 +0,0 @@
-package command
-
-import (
-	"context"
-	"flag"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
-
-	"github.com/owncloud/ocis/ocis-pkg/sync"
-
-	"github.com/cs3org/reva/v2/cmd/revad/runtime"
-	"github.com/gofrs/uuid"
-	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/thejerf/suture/v4"
-	"github.com/urfave/cli/v2"
-)
-
-// Sharing is the entrypoint for the sharing command.
-func Sharing(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:  "sharing",
-		Usage: "start sharing service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-sharing")
-		},
-		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
-
-			gr := run.Group{}
-			ctx, cancel := context.WithCancel(context.Background())
-
-			defer cancel()
-
-			// precreate folders
-			if cfg.Reva.Sharing.UserDriver == "json" && cfg.Reva.Sharing.UserJSONFile != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.Sharing.UserJSONFile), os.FileMode(0700)); err != nil {
-					return err
-				}
-			}
-			if cfg.Reva.Sharing.PublicDriver == "json" && cfg.Reva.Sharing.PublicJSONFile != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.Sharing.PublicJSONFile), os.FileMode(0700)); err != nil {
-					return err
-				}
-			}
-
-			uuid := uuid.Must(uuid.NewV4())
-			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
-
-			rcfg := sharingConfigFromStruct(c, cfg)
-
-			gr.Add(func() error {
-				runtime.RunWithOptions(
-					rcfg,
-					pidFile,
-					runtime.WithLogger(&logger.Logger),
-				)
-				return nil
-			}, func(_ error) {
-				logger.Info().
-					Str("server", c.Command.Name).
-					Msg("Shutting down server")
-
-				cancel()
-			})
-
-			debug, err := debug.Server(
-				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.Sharing.DebugAddr),
-				debug.Logger(logger),
-				debug.Context(ctx),
-				debug.Config(cfg),
-			)
-
-			if err != nil {
-				logger.Info().Err(err).Str("server", c.Command.Name+"-debug").Msg("Failed to initialize server")
-				return err
-			}
-
-			gr.Add(debug.ListenAndServe, func(_ error) {
-				cancel()
-			})
-
-			if !cfg.Reva.Sharing.Supervised {
-				sync.Trap(&gr, cancel)
-			}
-
-			return gr.Run()
-		},
-	}
-}
-
-// sharingConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
-func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
-	rcfg := map[string]interface{}{
-		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.Sharing.MaxCPUs,
-			"tracing_enabled":      cfg.Tracing.Enabled,
-			"tracing_endpoint":     cfg.Tracing.Endpoint,
-			"tracing_collector":    cfg.Tracing.Collector,
-			"tracing_service_name": c.Command.Name,
-		},
-		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
-		},
-		"grpc": map[string]interface{}{
-			"network": cfg.Reva.Sharing.GRPCNetwork,
-			"address": cfg.Reva.Sharing.GRPCAddr,
-			// TODO build services dynamically
-			"services": map[string]interface{}{
-				"usershareprovider": map[string]interface{}{
-					"driver": cfg.Reva.Sharing.UserDriver,
-					"drivers": map[string]interface{}{
-						"json": map[string]interface{}{
-							"file":         cfg.Reva.Sharing.UserJSONFile,
-							"gateway_addr": cfg.Reva.Gateway.Endpoint,
-						},
-						"sql": map[string]interface{}{ // cernbox sql
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-						"owncloudsql": map[string]interface{}{
-							"gateway_addr":     cfg.Reva.Gateway.Endpoint,
-							"storage_mount_id": cfg.Reva.Sharing.UserStorageMountID,
-							"db_username":      cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":      cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":          cfg.Reva.Sharing.UserSQLHost,
-							"db_port":          cfg.Reva.Sharing.UserSQLPort,
-							"db_name":          cfg.Reva.Sharing.UserSQLName,
-						},
-						"cs3": map[string]interface{}{
-							"gateway_addr":        cfg.Reva.Gateway.Endpoint,
-							"provider_addr":       cfg.Reva.Sharing.CS3ProviderAddr,
-							"service_user_id":     cfg.Reva.Sharing.CS3ServiceUser,
-							"service_user_idp":    cfg.Reva.Sharing.CS3ServiceUserIdp,
-							"machine_auth_apikey": cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
-						},
-					},
-				},
-				"publicshareprovider": map[string]interface{}{
-					"driver": cfg.Reva.Sharing.PublicDriver,
-					"drivers": map[string]interface{}{
-						"json": map[string]interface{}{
-							"file":         cfg.Reva.Sharing.PublicJSONFile,
-							"gateway_addr": cfg.Reva.Gateway.Endpoint,
-						},
-						"sql": map[string]interface{}{
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-						"owncloudsql": map[string]interface{}{
-							"gateway_addr":                  cfg.Reva.Gateway.Endpoint,
-							"storage_mount_id":              cfg.Reva.Sharing.UserStorageMountID,
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-						"cs3": map[string]interface{}{
-							"gateway_addr":        cfg.Reva.Gateway.Endpoint,
-							"provider_addr":       cfg.Reva.Sharing.CS3ProviderAddr,
-							"service_user_id":     cfg.Reva.Sharing.CS3ServiceUser,
-							"service_user_idp":    cfg.Reva.Sharing.CS3ServiceUserIdp,
-							"machine_auth_apikey": cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
-						},
-					},
-				},
-			},
-			"interceptors": map[string]interface{}{
-				"eventsmiddleware": map[string]interface{}{
-					"group":     "sharing",
-					"type":      "nats",
-					"address":   cfg.Reva.Sharing.Events.Address,
-					"clusterID": cfg.Reva.Sharing.Events.ClusterID,
-				},
-			},
-		},
-	}
-	return rcfg
-}
-
-// SharingSutureService allows for the storage-sharing command to be embedded and supervised by a suture supervisor tree.
-type SharingSutureService struct {
-	cfg *config.Config
-}
-
-// NewSharingSutureService creates a new store.SharingSutureService
-func NewSharing(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
-	return SharingSutureService{
-		cfg: cfg.Storage,
-	}
-}
-
-func (s SharingSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Sharing.Context = ctx
-	f := &flag.FlagSet{}
-	cmdFlags := Sharing(s.cfg).Flags
-	for k := range cmdFlags {
-		if err := cmdFlags[k].Apply(f); err != nil {
-			return err
-		}
-	}
-	cliCtx := cli.NewContext(nil, f, nil)
-	if Sharing(s.cfg).Before != nil {
-		if err := Sharing(s.cfg).Before(cliCtx); err != nil {
-			return err
-		}
-	}
-	if err := Sharing(s.cfg).Action(cliCtx); err != nil {
-		return err
-	}
-
-	return nil
-}