From 0a56c47fbbdc51ff0b44d8dcf2e9bd89f9709c6a Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Wed, 13 Mar 2024 10:31:53 +0300 Subject: [PATCH 1/2] chore: skip printing deprecation warning for now Deprecation warning doesn't make sense yet, since skip_output is a useful option. We can deprecate it later when we decide to move away from it --- internal/lefthook/run.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/lefthook/run.go b/internal/lefthook/run.go index 67555fe4..431c082f 100644 --- a/internal/lefthook/run.go +++ b/internal/lefthook/run.go @@ -85,7 +85,8 @@ func (l *Lefthook) Run(hookName string, args RunArgs, gitArgs []string) error { logSettings = log.NewSettings() logSettings.ApplySettings(outputLogTags, cfg.Output) } else { - log.Warn("skip_output is deprecated, please use output option") + // Deprecate skip_output in the future. Leaving as is to reduce noise in output. + // log.Warn("skip_output is deprecated, please use output option") logSettings = log.NewSkipSettings() //nolint:staticcheck //SA1019: for temporary backward compatibility logSettings.ApplySettings(outputSkipTags, cfg.SkipOutput) From 5efc75b2d684d00d96a6accd24e24a735c224562 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Wed, 13 Mar 2024 10:44:56 +0300 Subject: [PATCH 2/2] fix: correctly apply skip settings --- internal/log/skip_settings.go | 6 +++--- internal/log/skip_settings_test.go | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/internal/log/skip_settings.go b/internal/log/skip_settings.go index cc8c825e..04841a10 100644 --- a/internal/log/skip_settings.go +++ b/internal/log/skip_settings.go @@ -68,18 +68,18 @@ func (s *SkipSettings) applySetting(setting string) { func (s *SkipSettings) skipAll(val bool) { if val { - *s = skipAll &^ skipFailure + *s = skipAll &^ skipFailure &^ skipSummary } else { *s = 0 } } func (s SkipSettings) LogSuccess() bool { - return !s.doSkip(skipSuccess) + return !s.doSkip(skipSuccess) && !s.doSkip(skipSummary) } func (s SkipSettings) LogFailure() bool { - return !s.doSkip(skipFailure) + return !s.doSkip(skipFailure) && !s.doSkip(skipSummary) } func (s SkipSettings) LogSummary() bool { diff --git a/internal/log/skip_settings_test.go b/internal/log/skip_settings_test.go index c546b764..30f1b21c 100644 --- a/internal/log/skip_settings_test.go +++ b/internal/log/skip_settings_test.go @@ -61,8 +61,6 @@ func TestSkipSetting(t *testing.T) { settings: []interface{}{ "meta", "summary", - "success", - "failure", "skips", "execution", "execution_out", @@ -75,6 +73,7 @@ func TestSkipSetting(t *testing.T) { tags: "", settings: true, results: map[string]bool{ + "summary": true, "failure": true, }, }, @@ -82,6 +81,16 @@ func TestSkipSetting(t *testing.T) { tags: "meta,summary,success,skips,empty_summary", settings: nil, results: map[string]bool{ + "execution": true, + "execution_out": true, + "execution_info": true, + }, + }, + { + tags: "meta,success,skips,empty_summary", + settings: nil, + results: map[string]bool{ + "summary": true, "failure": true, "execution": true, "execution_out": true,