From 4a09d8a9480dede4535c5aaf2a03808c73921f5b Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 5 Jul 2022 10:53:36 +0200 Subject: [PATCH] Remove redundant setting of cli.HelpFlag The help flag is configured automatically by default already. We don't need to redo that for every single service. This also addresses one of the finding of "go race" (#4088) --- ocis/pkg/command/root.go | 5 ----- services/app-provider/pkg/command/root.go | 5 ----- services/app-registry/pkg/command/root.go | 5 ----- services/audit/pkg/command/root.go | 5 ----- services/auth-basic/pkg/command/root.go | 5 ----- services/auth-bearer/pkg/command/root.go | 5 ----- services/auth-machine/pkg/command/root.go | 5 ----- services/frontend/pkg/command/root.go | 5 ----- services/gateway/pkg/command/root.go | 5 ----- services/graph-explorer/pkg/command/root.go | 5 ----- services/graph/pkg/command/root.go | 5 ----- services/groups/pkg/command/root.go | 5 ----- services/idm/pkg/command/root.go | 5 ----- services/idp/pkg/command/root.go | 5 ----- services/nats/pkg/command/root.go | 5 ----- services/notifications/pkg/command/root.go | 5 ----- services/ocdav/pkg/command/root.go | 5 ----- services/ocs/pkg/command/root.go | 5 ----- services/proxy/pkg/command/root.go | 5 ----- services/search/pkg/command/root.go | 5 ----- services/settings/pkg/command/root.go | 5 ----- services/sharing/pkg/command/root.go | 5 ----- services/storage-publiclink/pkg/command/root.go | 5 ----- services/storage-shares/pkg/command/root.go | 5 ----- services/storage-system/pkg/command/root.go | 5 ----- services/storage-users/pkg/command/root.go | 5 ----- services/store/pkg/command/root.go | 5 ----- services/thumbnails/pkg/command/root.go | 5 ----- services/users/pkg/command/root.go | 5 ----- services/web/pkg/command/root.go | 5 ----- services/webdav/pkg/command/root.go | 5 ----- 31 files changed, 155 deletions(-) diff --git a/ocis/pkg/command/root.go b/ocis/pkg/command/root.go index 806e917421..2edf4a750f 100644 --- a/ocis/pkg/command/root.go +++ b/ocis/pkg/command/root.go @@ -25,10 +25,5 @@ func Execute() error { ) } - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/app-provider/pkg/command/root.go b/services/app-provider/pkg/command/root.go index 3db69a21ad..b981f0d823 100644 --- a/services/app-provider/pkg/command/root.go +++ b/services/app-provider/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/app-registry/pkg/command/root.go b/services/app-registry/pkg/command/root.go index 5f8362165a..3d20b9fd49 100644 --- a/services/app-registry/pkg/command/root.go +++ b/services/app-registry/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/audit/pkg/command/root.go b/services/audit/pkg/command/root.go index ec1ef4d72b..025dc925d6 100644 --- a/services/audit/pkg/command/root.go +++ b/services/audit/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/auth-basic/pkg/command/root.go b/services/auth-basic/pkg/command/root.go index d62b0d9e37..d7ba172deb 100644 --- a/services/auth-basic/pkg/command/root.go +++ b/services/auth-basic/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/auth-bearer/pkg/command/root.go b/services/auth-bearer/pkg/command/root.go index 694500d4d6..c923e706fb 100644 --- a/services/auth-bearer/pkg/command/root.go +++ b/services/auth-bearer/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/auth-machine/pkg/command/root.go b/services/auth-machine/pkg/command/root.go index 29d9cdc8e3..fb01026af9 100644 --- a/services/auth-machine/pkg/command/root.go +++ b/services/auth-machine/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/frontend/pkg/command/root.go b/services/frontend/pkg/command/root.go index 313a134969..4feac04e0b 100644 --- a/services/frontend/pkg/command/root.go +++ b/services/frontend/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/gateway/pkg/command/root.go b/services/gateway/pkg/command/root.go index 41cddd994c..fe058b9179 100644 --- a/services/gateway/pkg/command/root.go +++ b/services/gateway/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/graph-explorer/pkg/command/root.go b/services/graph-explorer/pkg/command/root.go index ad9e1be393..1649def983 100644 --- a/services/graph-explorer/pkg/command/root.go +++ b/services/graph-explorer/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/graph/pkg/command/root.go b/services/graph/pkg/command/root.go index 0e563e60e0..73b42c6d1a 100644 --- a/services/graph/pkg/command/root.go +++ b/services/graph/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Usage: "Serve Graph API for oCIS", Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/groups/pkg/command/root.go b/services/groups/pkg/command/root.go index c0de62dfd0..4a7578fc59 100644 --- a/services/groups/pkg/command/root.go +++ b/services/groups/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/idm/pkg/command/root.go b/services/idm/pkg/command/root.go index 4db8342e21..84208cba84 100644 --- a/services/idm/pkg/command/root.go +++ b/services/idm/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/idp/pkg/command/root.go b/services/idp/pkg/command/root.go index 409c036f06..9b39605796 100644 --- a/services/idp/pkg/command/root.go +++ b/services/idp/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/nats/pkg/command/root.go b/services/nats/pkg/command/root.go index b516746284..583d2658db 100644 --- a/services/nats/pkg/command/root.go +++ b/services/nats/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/notifications/pkg/command/root.go b/services/notifications/pkg/command/root.go index 17d52afe63..72c7dfda26 100644 --- a/services/notifications/pkg/command/root.go +++ b/services/notifications/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/ocdav/pkg/command/root.go b/services/ocdav/pkg/command/root.go index b96cc01813..95de57e247 100644 --- a/services/ocdav/pkg/command/root.go +++ b/services/ocdav/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/ocs/pkg/command/root.go b/services/ocs/pkg/command/root.go index 9e3436e079..6d87fb6f20 100644 --- a/services/ocs/pkg/command/root.go +++ b/services/ocs/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/proxy/pkg/command/root.go b/services/proxy/pkg/command/root.go index 1f809d049f..4c310fc672 100644 --- a/services/proxy/pkg/command/root.go +++ b/services/proxy/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/search/pkg/command/root.go b/services/search/pkg/command/root.go index 204aab9f84..9bed2b3158 100644 --- a/services/search/pkg/command/root.go +++ b/services/search/pkg/command/root.go @@ -34,11 +34,6 @@ func Execute(cfg *config.Config) error { Usage: "Serve search API for oCIS", Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/settings/pkg/command/root.go b/services/settings/pkg/command/root.go index dd53b3cae1..29812fe058 100644 --- a/services/settings/pkg/command/root.go +++ b/services/settings/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/sharing/pkg/command/root.go b/services/sharing/pkg/command/root.go index fae443c937..406e09b6fd 100644 --- a/services/sharing/pkg/command/root.go +++ b/services/sharing/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/storage-publiclink/pkg/command/root.go b/services/storage-publiclink/pkg/command/root.go index 831cb046ec..141d7ac6da 100644 --- a/services/storage-publiclink/pkg/command/root.go +++ b/services/storage-publiclink/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/storage-shares/pkg/command/root.go b/services/storage-shares/pkg/command/root.go index 5d8db7f5ec..faf2066e6b 100644 --- a/services/storage-shares/pkg/command/root.go +++ b/services/storage-shares/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/storage-system/pkg/command/root.go b/services/storage-system/pkg/command/root.go index 8e9847e606..0f1cde0b65 100644 --- a/services/storage-system/pkg/command/root.go +++ b/services/storage-system/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/storage-users/pkg/command/root.go b/services/storage-users/pkg/command/root.go index ae9dd94c0e..5ae9e6e86f 100644 --- a/services/storage-users/pkg/command/root.go +++ b/services/storage-users/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/store/pkg/command/root.go b/services/store/pkg/command/root.go index 5396b1103e..795a66a74c 100644 --- a/services/store/pkg/command/root.go +++ b/services/store/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/thumbnails/pkg/command/root.go b/services/thumbnails/pkg/command/root.go index efa87a675e..28588a261f 100644 --- a/services/thumbnails/pkg/command/root.go +++ b/services/thumbnails/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/users/pkg/command/root.go b/services/users/pkg/command/root.go index 7ce50ddf07..c84c93603b 100644 --- a/services/users/pkg/command/root.go +++ b/services/users/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/web/pkg/command/root.go b/services/web/pkg/command/root.go index ef57b49566..7dfe694e2c 100644 --- a/services/web/pkg/command/root.go +++ b/services/web/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) } diff --git a/services/webdav/pkg/command/root.go b/services/webdav/pkg/command/root.go index c8f857ca2c..fd12559119 100644 --- a/services/webdav/pkg/command/root.go +++ b/services/webdav/pkg/command/root.go @@ -33,11 +33,6 @@ func Execute(cfg *config.Config) error { Commands: GetCommands(cfg), }) - cli.HelpFlag = &cli.BoolFlag{ - Name: "help,h", - Usage: "Show the help", - } - return app.Run(os.Args) }