From 1195f447e11838a23d2d338a9bdbe406cd2afd88 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Fri, 22 Apr 2022 16:31:40 +0200 Subject: [PATCH] clean up the new commands --- extensions/auth-basic/pkg/command/command.go | 3 --- extensions/auth-bearer/pkg/command/command.go | 3 --- extensions/auth-machine/pkg/command/command.go | 3 --- extensions/frontend/pkg/command/command.go | 1 - extensions/gateway/pkg/command/command.go | 4 ---- extensions/group/pkg/command/command.go | 3 --- extensions/ocdav/pkg/command/ocdav.go | 1 - .../storage-publiclink/pkg/command/storagepubliclink.go | 7 ++----- extensions/storage-shares/pkg/command/command.go | 3 --- extensions/storage-users/pkg/command/command.go | 3 --- 10 files changed, 2 insertions(+), 29 deletions(-) diff --git a/extensions/auth-basic/pkg/command/command.go b/extensions/auth-basic/pkg/command/command.go index 71b962be421..7f42e7cc91b 100644 --- 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 index 6fc42b616b5..93b4ef3430d 100644 --- 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 index 671cb1eb7af..6248955489e 100644 --- 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 index 7e7f2c32c1e..2fb237f67fa 100644 --- 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 index 5858cbe0569..5b731605d55 100644 --- 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 index 9e5d6d3d10d..ab71caef114 100644 --- 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 index e29cfad59f6..e73f5d1b1ee 100644 --- 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 index e128aadb61b..5991885449a 100644 --- 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 index 97ab89fa943..b6804326f31 100644 --- 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 index b6b3c5cb966..564dd4e558d 100644 --- 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(