From 87b7a102baea065bf64933d7a1a6a6399cf1f8d3 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 11 May 2022 14:58:52 +0200 Subject: [PATCH] remove returns from the commands to prevent silent crash Signed-off-by: Christian Richter --- ocis/pkg/command/accounts.go | 1 - ocis/pkg/command/app-registry.go | 1 - ocis/pkg/command/appprovider.go | 1 - ocis/pkg/command/audit.go | 1 - ocis/pkg/command/auth-basic.go | 1 - ocis/pkg/command/auth-bearer.go | 1 - ocis/pkg/command/auth-machine.go | 1 - ocis/pkg/command/frontend.go | 1 - ocis/pkg/command/gateway.go | 1 - ocis/pkg/command/glauth.go | 1 - ocis/pkg/command/graph.go | 1 - ocis/pkg/command/graphexplorer.go | 1 - ocis/pkg/command/groups.go | 1 - ocis/pkg/command/idm.go | 1 - ocis/pkg/command/idp.go | 1 - ocis/pkg/command/natsserver.go | 1 - ocis/pkg/command/notifications.go | 1 - ocis/pkg/command/ocdav.go | 1 - ocis/pkg/command/ocs.go | 1 - ocis/pkg/command/proxy.go | 1 - ocis/pkg/command/settings.go | 1 - ocis/pkg/command/sharing.go | 1 - ocis/pkg/command/storage-metadata.go | 1 - ocis/pkg/command/storage-publiclink.go | 1 - ocis/pkg/command/storage-shares.go | 1 - ocis/pkg/command/storage-users.go | 1 - ocis/pkg/command/store.go | 1 - ocis/pkg/command/thumbnails.go | 1 - ocis/pkg/command/users.go | 1 - ocis/pkg/command/version.go | 1 - ocis/pkg/command/web.go | 1 - ocis/pkg/command/webdav.go | 1 - 32 files changed, 32 deletions(-) diff --git a/ocis/pkg/command/accounts.go b/ocis/pkg/command/accounts.go index 70d39e948c..1bc0bea564 100644 --- a/ocis/pkg/command/accounts.go +++ b/ocis/pkg/command/accounts.go @@ -19,7 +19,6 @@ func AccountsCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Accounts.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/app-registry.go b/ocis/pkg/command/app-registry.go index cdef223eb7..036b7c4c85 100644 --- a/ocis/pkg/command/app-registry.go +++ b/ocis/pkg/command/app-registry.go @@ -19,7 +19,6 @@ func AppRegistryCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.AppRegistry.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/appprovider.go b/ocis/pkg/command/appprovider.go index c4aa60a94b..15d4048dab 100644 --- a/ocis/pkg/command/appprovider.go +++ b/ocis/pkg/command/appprovider.go @@ -19,7 +19,6 @@ func AppProviderCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.AppProvider.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/audit.go b/ocis/pkg/command/audit.go index 2f8618096c..4a4521a517 100644 --- a/ocis/pkg/command/audit.go +++ b/ocis/pkg/command/audit.go @@ -19,7 +19,6 @@ func AuditCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Audit.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/auth-basic.go b/ocis/pkg/command/auth-basic.go index de542f4466..eee8da3761 100644 --- a/ocis/pkg/command/auth-basic.go +++ b/ocis/pkg/command/auth-basic.go @@ -19,7 +19,6 @@ func AuthBasicCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.AuthBasic.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/auth-bearer.go b/ocis/pkg/command/auth-bearer.go index 83d9673346..84dec29bb8 100644 --- a/ocis/pkg/command/auth-bearer.go +++ b/ocis/pkg/command/auth-bearer.go @@ -19,7 +19,6 @@ func AuthBearerCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.AuthBearer.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/auth-machine.go b/ocis/pkg/command/auth-machine.go index 733b6a0d0b..1d35b6d4fc 100644 --- a/ocis/pkg/command/auth-machine.go +++ b/ocis/pkg/command/auth-machine.go @@ -19,7 +19,6 @@ func AuthMachineCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.AuthMachine.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/frontend.go b/ocis/pkg/command/frontend.go index e0aa238fc9..16782899d1 100644 --- a/ocis/pkg/command/frontend.go +++ b/ocis/pkg/command/frontend.go @@ -19,7 +19,6 @@ func FrontendCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Frontend.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/gateway.go b/ocis/pkg/command/gateway.go index 068c892042..2344976f6b 100644 --- a/ocis/pkg/command/gateway.go +++ b/ocis/pkg/command/gateway.go @@ -19,7 +19,6 @@ func GatewayCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Gateway.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/glauth.go b/ocis/pkg/command/glauth.go index ddcff0b693..a81c870a49 100644 --- a/ocis/pkg/command/glauth.go +++ b/ocis/pkg/command/glauth.go @@ -19,7 +19,6 @@ func GLAuthCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.GLAuth.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/graph.go b/ocis/pkg/command/graph.go index 36c529ee44..41447fec03 100644 --- a/ocis/pkg/command/graph.go +++ b/ocis/pkg/command/graph.go @@ -19,7 +19,6 @@ func GraphCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Graph.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/graphexplorer.go b/ocis/pkg/command/graphexplorer.go index fcbb0fe0f8..cfc5ecb6c2 100644 --- a/ocis/pkg/command/graphexplorer.go +++ b/ocis/pkg/command/graphexplorer.go @@ -19,7 +19,6 @@ func GraphExplorerCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.GraphExplorer.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/groups.go b/ocis/pkg/command/groups.go index 37ddaaeaf0..3e2627d1d1 100644 --- a/ocis/pkg/command/groups.go +++ b/ocis/pkg/command/groups.go @@ -19,7 +19,6 @@ func GroupsCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Groups.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/idm.go b/ocis/pkg/command/idm.go index d711dd6c52..cea462af15 100644 --- a/ocis/pkg/command/idm.go +++ b/ocis/pkg/command/idm.go @@ -19,7 +19,6 @@ func IDMCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.IDM.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go index 0a25333086..88720c61c7 100644 --- a/ocis/pkg/command/idp.go +++ b/ocis/pkg/command/idp.go @@ -19,7 +19,6 @@ func IDPCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.IDP.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/natsserver.go b/ocis/pkg/command/natsserver.go index b021172064..40bf8651c1 100644 --- a/ocis/pkg/command/natsserver.go +++ b/ocis/pkg/command/natsserver.go @@ -19,7 +19,6 @@ func NatsCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Nats.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/notifications.go b/ocis/pkg/command/notifications.go index 0a004ef20d..7a019f77c8 100644 --- a/ocis/pkg/command/notifications.go +++ b/ocis/pkg/command/notifications.go @@ -19,7 +19,6 @@ func NotificationsCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Notifications.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/ocdav.go b/ocis/pkg/command/ocdav.go index 4e60e0bd1e..4c009ecce3 100644 --- a/ocis/pkg/command/ocdav.go +++ b/ocis/pkg/command/ocdav.go @@ -19,7 +19,6 @@ func OCDavCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.OCDav.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go index 90c3f446aa..91877f8e65 100644 --- a/ocis/pkg/command/ocs.go +++ b/ocis/pkg/command/ocs.go @@ -19,7 +19,6 @@ func OCSCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.OCS.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go index d25e06ec56..ab9dca8aed 100644 --- a/ocis/pkg/command/proxy.go +++ b/ocis/pkg/command/proxy.go @@ -19,7 +19,6 @@ func ProxyCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Proxy.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go index e107c206e0..7a42d3588a 100644 --- a/ocis/pkg/command/settings.go +++ b/ocis/pkg/command/settings.go @@ -19,7 +19,6 @@ func SettingsCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Settings.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/sharing.go b/ocis/pkg/command/sharing.go index dc2ffb1012..4bbda8f166 100644 --- a/ocis/pkg/command/sharing.go +++ b/ocis/pkg/command/sharing.go @@ -19,7 +19,6 @@ func SharingCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Sharing.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/storage-metadata.go b/ocis/pkg/command/storage-metadata.go index f829d3f37f..002a98b4b6 100644 --- a/ocis/pkg/command/storage-metadata.go +++ b/ocis/pkg/command/storage-metadata.go @@ -19,7 +19,6 @@ func StorageSystemCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.StorageSystem.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/storage-publiclink.go b/ocis/pkg/command/storage-publiclink.go index 5f03f64efb..12feaf0728 100644 --- a/ocis/pkg/command/storage-publiclink.go +++ b/ocis/pkg/command/storage-publiclink.go @@ -19,7 +19,6 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.StoragePublicLink.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/storage-shares.go b/ocis/pkg/command/storage-shares.go index ee993955ba..beec4cf332 100644 --- a/ocis/pkg/command/storage-shares.go +++ b/ocis/pkg/command/storage-shares.go @@ -19,7 +19,6 @@ func StorageSharesCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.StorageShares.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/storage-users.go b/ocis/pkg/command/storage-users.go index 9da811b506..f7092994e2 100644 --- a/ocis/pkg/command/storage-users.go +++ b/ocis/pkg/command/storage-users.go @@ -19,7 +19,6 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.StorageUsers.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go index 55fd40a761..8571cfdf00 100644 --- a/ocis/pkg/command/store.go +++ b/ocis/pkg/command/store.go @@ -20,7 +20,6 @@ func StoreCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Store.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go index 12fa79b334..4c6cf6db32 100644 --- a/ocis/pkg/command/thumbnails.go +++ b/ocis/pkg/command/thumbnails.go @@ -19,7 +19,6 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Thumbnails.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/users.go b/ocis/pkg/command/users.go index 3c8b15ee5c..68538952e8 100644 --- a/ocis/pkg/command/users.go +++ b/ocis/pkg/command/users.go @@ -19,7 +19,6 @@ func UsersCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Users.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/version.go b/ocis/pkg/command/version.go index c088ebd15d..e295a7be99 100644 --- a/ocis/pkg/command/version.go +++ b/ocis/pkg/command/version.go @@ -28,7 +28,6 @@ func VersionCommand(cfg *config.Config) *cli.Command { serviceList, err := reg.ListServices() if err != nil { fmt.Println(fmt.Errorf("could not list services: %v", err)) - return err } var services []*mreg.Service diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go index a9acaf06dc..e4cf353d48 100644 --- a/ocis/pkg/command/web.go +++ b/ocis/pkg/command/web.go @@ -19,7 +19,6 @@ func WebCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.Web.Commons = cfg.Commons return nil diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go index 157d85b996..544474c42e 100644 --- a/ocis/pkg/command/webdav.go +++ b/ocis/pkg/command/webdav.go @@ -20,7 +20,6 @@ func WebDAVCommand(cfg *config.Config) *cli.Command { Before: func(c *cli.Context) error { if err := parser.ParseConfig(cfg); err != nil { fmt.Printf("%v", err) - return err } cfg.WebDAV.Commons = cfg.Commons return nil