From 93d0d38a0319fc2a70ab9565fd2f514719168b36 Mon Sep 17 00:00:00 2001 From: prog-supdex Date: Thu, 15 Feb 2024 08:37:29 +0100 Subject: [PATCH] fix: handle LEFTHOOK_QUIET when there is no skip_output in config --- internal/log/skip_settings.go | 9 +++++---- internal/log/skip_settings_test.go | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/internal/log/skip_settings.go b/internal/log/skip_settings.go index 47aa1fab..2e9cb551 100644 --- a/internal/log/skip_settings.go +++ b/internal/log/skip_settings.go @@ -27,10 +27,11 @@ func (s *SkipSettings) ApplySettings(tags string, skipOutput interface{}) { for _, skipOption := range typedSkipOutput { s.applySetting(skipOption.(string)) } - if tags != "" { - for _, skipOption := range strings.Split(tags, ",") { - s.applySetting(skipOption) - } + } + + if tags != "" { + for _, skipOption := range strings.Split(tags, ",") { + s.applySetting(skipOption) } } } diff --git a/internal/log/skip_settings_test.go b/internal/log/skip_settings_test.go index 15706964..97973cd1 100644 --- a/internal/log/skip_settings_test.go +++ b/internal/log/skip_settings_test.go @@ -106,4 +106,21 @@ func TestSkipSetting(t *testing.T) { } }) } + + t.Run("ApplySettings with non-empty tags and nil skipOutput", func(t *testing.T) { + var settings SkipSettings + (&settings).ApplySettings("meta,success", nil) + + if !settings.SkipMeta() { + t.Errorf("expected SkipMeta to be true") + } + + if !settings.SkipSuccess() { + t.Errorf("expected SkipSuccess to be true") + } + + if settings.SkipFailure() { + t.Errorf("expected SkipFailure to be false") + } + }) }