clean up the new commands

owncloud · Apr 22, 2022 · 2cf008f · 2cf008f
1 parent ab143c7
commit 2cf008f
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 275 deletions.
diff --git a/extensions/auth-basic/pkg/command/command.go b/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(

diff --git a/extensions/auth-bearer/pkg/command/command.go b/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(

diff --git a/extensions/auth-machine/pkg/command/command.go b/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(

diff --git a/extensions/frontend/pkg/command/command.go b/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 {

diff --git a/extensions/gateway/pkg/command/command.go b/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"
 			}

diff --git a/extensions/group/pkg/command/command.go b/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(

diff --git a/extensions/ocdav/pkg/command/ocdav.go b/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 {

diff --git a/extensions/storage-publiclink/pkg/command/storagepubliclink.go b/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

diff --git a/extensions/storage-shares/pkg/command/command.go b/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(

diff --git a/extensions/storage-users/pkg/command/command.go b/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(

diff --git a/extensions/storage/pkg/command/health.go b/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)
 

diff --git a/extensions/storage/pkg/command/root.go b/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),
 	})

diff --git a/extensions/storage/pkg/command/sharing.go b/extensions/storage/pkg/command/sharing.go