From d90d038b5cd75ba46f97b8290ea2e9e3c4ef1b51 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 17 Mar 2024 23:28:47 +0100 Subject: [PATCH 1/4] fix: disable temporarily httpresponse from govet --- pkg/golinters/govet.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go index 504ed8a7525b..92bec7d36377 100644 --- a/pkg/golinters/govet.go +++ b/pkg/golinters/govet.go @@ -184,6 +184,13 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers return false } + // TODO(ldez) remove httpresponse because of a panic. + // https://github.com/golangci/golangci-lint/issues/4482 + // https://github.com/golang/go/issues/66259 + if name == httpresponse.Analyzer.Name { + return false + } + // Keeping for backward compatibility. if cfg.CheckShadowing && name == shadow.Analyzer.Name { return true From 0fcb350ab3efae9e34f34e501468ba6569576af0 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 18 Mar 2024 14:50:28 +0100 Subject: [PATCH 2/4] review Co-authored-by: Oleksandr Redko --- pkg/golinters/govet.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go index 92bec7d36377..4f31ea73fd43 100644 --- a/pkg/golinters/govet.go +++ b/pkg/golinters/govet.go @@ -184,10 +184,9 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers return false } - // TODO(ldez) remove httpresponse because of a panic. - // https://github.com/golangci/golangci-lint/issues/4482 - // https://github.com/golang/go/issues/66259 + // TODO(ldez) enable httpresponse once https://github.com/golang/go/issues/66259 is fixed. if name == httpresponse.Analyzer.Name { + govetDebugf("httpresponse is disabled due to panic. See https://github.com/golangci/golangci-lint/issues/4482") return false } From 07363ac528e9e2447dd394816576f84a715ee9bf Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 18 Mar 2024 14:52:24 +0100 Subject: [PATCH 3/4] review: improve message --- pkg/golinters/govet.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go index 4f31ea73fd43..ecd406e3bf21 100644 --- a/pkg/golinters/govet.go +++ b/pkg/golinters/govet.go @@ -184,9 +184,9 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers return false } - // TODO(ldez) enable httpresponse once https://github.com/golang/go/issues/66259 is fixed. + // TODO(ldez) re-enable httpresponse once https://github.com/golangci/golangci-lint/issues/4482 is fixed. if name == httpresponse.Analyzer.Name { - govetDebugf("httpresponse is disabled due to panic. See https://github.com/golangci/golangci-lint/issues/4482") + govetDebugf("httpresponse is disabled due to panic. See https://github.com/golang/go/issues/66259") return false } From 4f0746be8b1543a5d4453d7bf19284f03e376bde Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Tue, 19 Mar 2024 22:31:00 +0100 Subject: [PATCH 4/4] fix: flaky --- .golangci.yml | 10 +++++++--- pkg/golinters/godot.go | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index d820c3703e22..9b2d786f7a05 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -152,6 +152,10 @@ issues: - gomnd - lll + - path: pkg/golinters + linters: + - dupl + - path: pkg/golinters/errcheck.go linters: [staticcheck] text: "SA1019: errCfg.Exclude is deprecated: use ExcludeFunctions instead" @@ -166,9 +170,9 @@ issues: - path: pkg/commands/config.go text: "SA1019: cfg.Run.UseDefaultSkipDirs is deprecated: use Issues.UseDefaultExcludeDirs instead." - - path: pkg/golinters - linters: - - dupl + - path: pkg/golinters/godot.go + linters: [staticcheck] + text: "SA1019: settings.CheckAll is deprecated: use `Scope` instead" - path: pkg/golinters/gofumpt.go linters: [staticcheck] diff --git a/pkg/golinters/godot.go b/pkg/golinters/godot.go index b0ee64434936..06c160fec613 100644 --- a/pkg/golinters/godot.go +++ b/pkg/golinters/godot.go @@ -30,7 +30,7 @@ func NewGodot(settings *config.GodotSettings) *goanalysis.Linter { // Convert deprecated setting // todo(butuzov): remove on v2 release - if settings.CheckAll { //nolint:staticcheck // Keep for retro-compatibility. + if settings.CheckAll { dotSettings.Scope = godot.AllScope } }