From 55739ee9824da643143402794a393c8ab62738b8 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 26 Jul 2022 11:48:57 +0200 Subject: [PATCH] internal: add additional error handling in config loader Signed-off-by: Jens Langhammer --- internal/config/config.go | 5 ++++- internal/config/config_test.go | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index b1ccd6a8b..6e3ebf1fc 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -49,7 +49,10 @@ func (c *Config) Setup(paths ...string) { log.WithError(err).Info("failed to load config, skipping") } } - c.fromEnv() + err := c.fromEnv() + if err != nil { + log.WithError(err).Info("failed to load env vars") + } c.configureLogger() } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 012bf3917..0687e84a2 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -12,7 +12,9 @@ import ( func TestConfigEnv(t *testing.T) { os.Setenv("AUTHENTIK_SECRET_KEY", "bar") cfg = nil - Get().fromEnv() + if err := Get().fromEnv(); err != nil { + panic(err) + } assert.Equal(t, "bar", Get().SecretKey) } @@ -20,7 +22,9 @@ func TestConfigEnv_Scheme(t *testing.T) { os.Setenv("foo", "bar") os.Setenv("AUTHENTIK_SECRET_KEY", "env://foo") cfg = nil - Get().fromEnv() + if err := Get().fromEnv(); err != nil { + panic(err) + } assert.Equal(t, "bar", Get().SecretKey) } @@ -30,10 +34,15 @@ func TestConfigEnv_File(t *testing.T) { log.Fatal(err) } defer os.Remove(file.Name()) - file.Write([]byte("bar")) + _, err = file.Write([]byte("bar")) + if err != nil { + panic(err) + } os.Setenv("AUTHENTIK_SECRET_KEY", fmt.Sprintf("file://%s", file.Name())) cfg = nil - Get().fromEnv() + if err := Get().fromEnv(); err != nil { + panic(err) + } assert.Equal(t, "bar", Get().SecretKey) }