From 20138a696e28990fe15d40ae1e53f72aafde2e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 30 Oct 2020 17:40:49 +0000 Subject: [PATCH] fix(backend): correctly handle sentry config errors --- cmd/karma/main.go | 3 ++- .../testscript/086_sentry_invalid_dsn.txt | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 cmd/karma/tests/testscript/086_sentry_invalid_dsn.txt diff --git a/cmd/karma/main.go b/cmd/karma/main.go index 31af1f5a5..dfc14737f 100644 --- a/cmd/karma/main.go +++ b/cmd/karma/main.go @@ -373,7 +373,8 @@ func mainSetup(errorHandling pflag.ErrorHandling) (*chi.Mux, error) { Dsn: config.Config.Sentry.Public, Release: version, }); err != nil { - log.Error().Err(err).Msg("Sentry initialization failed") + log.Error().Err(err).Str("dsn", config.Config.Sentry.Public).Msg("Sentry initialization failed") + return nil, fmt.Errorf("sentry configuration is invalid") } } diff --git a/cmd/karma/tests/testscript/086_sentry_invalid_dsn.txt b/cmd/karma/tests/testscript/086_sentry_invalid_dsn.txt new file mode 100644 index 000000000..f2288ac16 --- /dev/null +++ b/cmd/karma/tests/testscript/086_sentry_invalid_dsn.txt @@ -0,0 +1,19 @@ +# Invalid sentry DSN raises an error + +karma.bin-should-fail --config.file=karma.yaml --check-config +! stdout . +cmp stderr stderr.txt + +-- stderr.txt -- +level=info msg="Reading configuration file" path=karma.yaml +level=info msg="Version: dev" +level=info msg="Configured Alertmanager source" name=default proxy=false readonly=false uri=http://127.0.0.1:9093 +level=error msg="Sentry initialization failed" error="[Sentry] DsnParseError: invalid scheme" dsn=abcd +level=error msg="Execution failed" error="sentry configuration is invalid" +-- karma.yaml -- +alertmanager: + servers: + - name: default + uri: http://127.0.0.1:9093 +sentry: + public: abcd