From f6e2f46ebbcc18a7986edf1127352ea4430e24f0 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 9 May 2022 11:47:06 +0200 Subject: [PATCH] Exit when encountering config parsing errors --- changelog/unreleased/change-ocis-init.md | 1 + extensions/accounts/pkg/command/server.go | 2 ++ extensions/app-provider/pkg/command/server.go | 1 + extensions/app-registry/pkg/command/server.go | 1 + extensions/audit/pkg/command/server.go | 2 ++ extensions/auth-basic/pkg/command/server.go | 1 + extensions/auth-bearer/pkg/command/server.go | 1 + extensions/auth-machine/pkg/command/server.go | 1 + extensions/frontend/pkg/command/server.go | 1 + extensions/gateway/pkg/command/server.go | 1 + extensions/glauth/pkg/command/server.go | 2 ++ extensions/graph-explorer/pkg/command/server.go | 2 ++ extensions/graph/pkg/command/server.go | 2 ++ extensions/groups/pkg/command/server.go | 1 + extensions/idm/pkg/command/server.go | 1 + extensions/idp/pkg/command/server.go | 2 ++ extensions/nats/pkg/command/server.go | 2 ++ extensions/notifications/pkg/command/server.go | 2 ++ extensions/ocdav/pkg/command/server.go | 2 ++ extensions/ocs/pkg/command/server.go | 2 ++ extensions/proxy/pkg/command/server.go | 2 ++ extensions/search/pkg/command/server.go | 2 ++ extensions/settings/pkg/command/server.go | 2 ++ extensions/sharing/pkg/command/server.go | 1 + extensions/storage-publiclink/pkg/command/server.go | 1 + extensions/storage-shares/pkg/command/server.go | 1 + extensions/storage-system/pkg/command/server.go | 1 + extensions/storage-users/pkg/command/server.go | 1 + extensions/store/pkg/command/server.go | 2 ++ extensions/thumbnails/pkg/command/server.go | 2 ++ extensions/users/pkg/command/server.go | 1 + extensions/web/pkg/command/server.go | 2 ++ extensions/webdav/pkg/command/server.go | 2 ++ ocis-pkg/shared/errors.go | 8 ++++---- 34 files changed, 54 insertions(+), 4 deletions(-) diff --git a/changelog/unreleased/change-ocis-init.md b/changelog/unreleased/change-ocis-init.md index 9c029b1f6..ab5cd99ca 100644 --- a/changelog/unreleased/change-ocis-init.md +++ b/changelog/unreleased/change-ocis-init.md @@ -10,3 +10,4 @@ bootstrap you a configuration file for a secure oCIS instance. https://github.com/owncloud/ocis/pull/3551 https://github.com/owncloud/ocis/issues/3524 +https://github.com/owncloud/ocis/pull/3743 diff --git a/extensions/accounts/pkg/command/server.go b/extensions/accounts/pkg/command/server.go index bbed07f84..dcf52f5af 100644 --- a/extensions/accounts/pkg/command/server.go +++ b/extensions/accounts/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" @@ -28,6 +29,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/app-provider/pkg/command/server.go b/extensions/app-provider/pkg/command/server.go index 05d905c5d..4b167f9da 100644 --- a/extensions/app-provider/pkg/command/server.go +++ b/extensions/app-provider/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/app-registry/pkg/command/server.go b/extensions/app-registry/pkg/command/server.go index ebcc55634..cba8e1835 100644 --- a/extensions/app-registry/pkg/command/server.go +++ b/extensions/app-registry/pkg/command/server.go @@ -30,6 +30,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/audit/pkg/command/server.go b/extensions/audit/pkg/command/server.go index f3d18cac4..24ea141b4 100644 --- a/extensions/audit/pkg/command/server.go +++ b/extensions/audit/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/server" @@ -25,6 +26,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/auth-basic/pkg/command/server.go b/extensions/auth-basic/pkg/command/server.go index a14cdc4ba..e18c0fcf6 100644 --- a/extensions/auth-basic/pkg/command/server.go +++ b/extensions/auth-basic/pkg/command/server.go @@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/auth-bearer/pkg/command/server.go b/extensions/auth-bearer/pkg/command/server.go index 3beb36c67..886e98fb8 100644 --- a/extensions/auth-bearer/pkg/command/server.go +++ b/extensions/auth-bearer/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/auth-machine/pkg/command/server.go b/extensions/auth-machine/pkg/command/server.go index 03848cba5..e98ee7fbf 100644 --- a/extensions/auth-machine/pkg/command/server.go +++ b/extensions/auth-machine/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/frontend/pkg/command/server.go b/extensions/frontend/pkg/command/server.go index 47de6bc3e..cfc8e0c70 100644 --- a/extensions/frontend/pkg/command/server.go +++ b/extensions/frontend/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/gateway/pkg/command/server.go b/extensions/gateway/pkg/command/server.go index 3a0bb4be3..9132db089 100644 --- a/extensions/gateway/pkg/command/server.go +++ b/extensions/gateway/pkg/command/server.go @@ -30,6 +30,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/glauth/pkg/command/server.go b/extensions/glauth/pkg/command/server.go index 5a83a87d4..7aab9e7b5 100644 --- a/extensions/glauth/pkg/command/server.go +++ b/extensions/glauth/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" @@ -31,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/graph-explorer/pkg/command/server.go b/extensions/graph-explorer/pkg/command/server.go index 41d3710de..9143eff23 100644 --- a/extensions/graph-explorer/pkg/command/server.go +++ b/extensions/graph-explorer/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" @@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/graph/pkg/command/server.go b/extensions/graph/pkg/command/server.go index 13eae7398..4a17be53f 100644 --- a/extensions/graph/pkg/command/server.go +++ b/extensions/graph/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" @@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/groups/pkg/command/server.go b/extensions/groups/pkg/command/server.go index 1a9b86836..fd664d644 100644 --- a/extensions/groups/pkg/command/server.go +++ b/extensions/groups/pkg/command/server.go @@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/idm/pkg/command/server.go b/extensions/idm/pkg/command/server.go index 6e852d9ac..9bd47046c 100644 --- a/extensions/idm/pkg/command/server.go +++ b/extensions/idm/pkg/command/server.go @@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/idp/pkg/command/server.go b/extensions/idp/pkg/command/server.go index 4b9896708..de5ca8d39 100644 --- a/extensions/idp/pkg/command/server.go +++ b/extensions/idp/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" @@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/nats/pkg/command/server.go b/extensions/nats/pkg/command/server.go index f8f0eb610..9c029815c 100644 --- a/extensions/nats/pkg/command/server.go +++ b/extensions/nats/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" @@ -23,6 +24,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/notifications/pkg/command/server.go b/extensions/notifications/pkg/command/server.go index 463ad68d2..1b9a68f10 100644 --- a/extensions/notifications/pkg/command/server.go +++ b/extensions/notifications/pkg/command/server.go @@ -2,6 +2,7 @@ package command import ( "fmt" + "os" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/server" @@ -24,6 +25,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go index b9a109d27..75fa0a471 100644 --- a/extensions/ocdav/pkg/command/server.go +++ b/extensions/ocdav/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/cs3org/reva/v2/pkg/micro/ocdav" "github.com/oklog/run" @@ -25,6 +26,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/ocs/pkg/command/server.go b/extensions/ocs/pkg/command/server.go index 75bcc19fd..beadcd576 100644 --- a/extensions/ocs/pkg/command/server.go +++ b/extensions/ocs/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/parser" "github.com/owncloud/ocis/v2/extensions/ocs/pkg/logging" @@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/proxy/pkg/command/server.go b/extensions/proxy/pkg/command/server.go index eca459e58..ad63472db 100644 --- a/extensions/proxy/pkg/command/server.go +++ b/extensions/proxy/pkg/command/server.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "fmt" "net/http" + "os" "time" accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" @@ -46,6 +47,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/search/pkg/command/server.go b/extensions/search/pkg/command/server.go index d2aed55a4..19bfe9a92 100644 --- a/extensions/search/pkg/command/server.go +++ b/extensions/search/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/search/pkg/config" @@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/settings/pkg/command/server.go b/extensions/settings/pkg/command/server.go index f508235ce..518a13e53 100644 --- a/extensions/settings/pkg/command/server.go +++ b/extensions/settings/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" @@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/sharing/pkg/command/server.go b/extensions/sharing/pkg/command/server.go index 699fb3bbb..9f104fec5 100644 --- a/extensions/sharing/pkg/command/server.go +++ b/extensions/sharing/pkg/command/server.go @@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/storage-publiclink/pkg/command/server.go b/extensions/storage-publiclink/pkg/command/server.go index 3c5976aad..a892fd656 100644 --- a/extensions/storage-publiclink/pkg/command/server.go +++ b/extensions/storage-publiclink/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/storage-shares/pkg/command/server.go b/extensions/storage-shares/pkg/command/server.go index 6a42690bc..fb9f19897 100644 --- a/extensions/storage-shares/pkg/command/server.go +++ b/extensions/storage-shares/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/storage-system/pkg/command/server.go b/extensions/storage-system/pkg/command/server.go index a616f85ba..2c418e360 100644 --- a/extensions/storage-system/pkg/command/server.go +++ b/extensions/storage-system/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/storage-users/pkg/command/server.go b/extensions/storage-users/pkg/command/server.go index 0c2011a12..8fbc04d4d 100644 --- a/extensions/storage-users/pkg/command/server.go +++ b/extensions/storage-users/pkg/command/server.go @@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/store/pkg/command/server.go b/extensions/store/pkg/command/server.go index 51dfe971a..5556d7ac4 100644 --- a/extensions/store/pkg/command/server.go +++ b/extensions/store/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" @@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/thumbnails/pkg/command/server.go b/extensions/thumbnails/pkg/command/server.go index 8144937f5..a2dcffe63 100644 --- a/extensions/thumbnails/pkg/command/server.go +++ b/extensions/thumbnails/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" @@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/users/pkg/command/server.go b/extensions/users/pkg/command/server.go index 30fba2c4e..a68ff97fd 100644 --- a/extensions/users/pkg/command/server.go +++ b/extensions/users/pkg/command/server.go @@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/web/pkg/command/server.go b/extensions/web/pkg/command/server.go index c29302234..40d2e0c91 100644 --- a/extensions/web/pkg/command/server.go +++ b/extensions/web/pkg/command/server.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "io/ioutil" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/web/pkg/config" @@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/extensions/webdav/pkg/command/server.go b/extensions/webdav/pkg/command/server.go index 7da344136..cffbd1d37 100644 --- a/extensions/webdav/pkg/command/server.go +++ b/extensions/webdav/pkg/command/server.go @@ -3,6 +3,7 @@ package command import ( "context" "fmt" + "os" "github.com/oklog/run" "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config" @@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command { err := parser.ParseConfig(cfg) if err != nil { fmt.Printf("%v", err) + os.Exit(1) } return err }, diff --git a/ocis-pkg/shared/errors.go b/ocis-pkg/shared/errors.go index d7f174d38..da5660b61 100644 --- a/ocis-pkg/shared/errors.go +++ b/ocis-pkg/shared/errors.go @@ -23,7 +23,7 @@ func MissingSystemUserApiKeyError(service string) error { } func MissingJWTTokenError(service string) error { - return fmt.Errorf("jwt_secret has not been set properly in your config for %s. "+ + return fmt.Errorf("The jwt_secret has not been set properly in your config for %s. "+ "Make sure your %s config contains the proper values "+ "(e.g. by running ocis init or setting it manually in "+ "the config/corresponding environment variable).", @@ -31,7 +31,7 @@ func MissingJWTTokenError(service string) error { } func MissingRevaTransferSecretError(service string) error { - return fmt.Errorf("transfer_secret has not been set properly in your config for %s. "+ + return fmt.Errorf("The transfer_secret has not been set properly in your config for %s. "+ "Make sure your %s config contains the proper values "+ "(e.g. by running ocis init or setting it manually in "+ "the config/corresponding environment variable).", @@ -39,7 +39,7 @@ func MissingRevaTransferSecretError(service string) error { } func MissingLDAPBindPassword(service string) error { - return fmt.Errorf("bind_password has not been set properly in your config for %s. "+ + return fmt.Errorf("The ldap bind_password has not been set properly in your config for %s. "+ "Make sure your %s config contains the proper values "+ "(e.g. by running ocis init or setting it manually in "+ "the config/corresponding environment variable).", @@ -47,7 +47,7 @@ func MissingLDAPBindPassword(service string) error { } func MissingServiceUserPassword(service, serviceUser string) error { - return fmt.Errorf("password of service user %s has not been set properly in your config for %s. "+ + return fmt.Errorf("The password of service user %s has not been set properly in your config for %s. "+ "Make sure your %s config contains the proper values "+ "(e.g. by running ocis init or setting it manually in "+ "the config/corresponding environment variable).",