From a44dd40a5397d31e5d4fc756031def00444d93e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:49:36 +0000 Subject: [PATCH 1/3] build(deps): bump github.com/nunnatsa/ginkgolinter from 0.16.2 to 0.17.0 Bumps [github.com/nunnatsa/ginkgolinter](https://github.com/nunnatsa/ginkgolinter) from 0.16.2 to 0.17.0. - [Release notes](https://github.com/nunnatsa/ginkgolinter/releases) - [Commits](https://github.com/nunnatsa/ginkgolinter/compare/v0.16.2...v0.17.0) --- updated-dependencies: - dependency-name: github.com/nunnatsa/ginkgolinter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 42b4913c2af1..657dcf2de5aa 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/nakabonne/nestif v0.3.1 github.com/nishanths/exhaustive v0.12.0 github.com/nishanths/predeclared v0.2.2 - github.com/nunnatsa/ginkgolinter v0.16.2 + github.com/nunnatsa/ginkgolinter v0.17.0 github.com/pelletier/go-toml/v2 v2.2.3 github.com/polyfloyd/go-errorlint v1.6.0 github.com/quasilyte/go-ruleguard/dsl v0.3.22 @@ -190,7 +190,7 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect + golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0 // indirect golang.org/x/mod v0.21.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect diff --git a/go.sum b/go.sum index 9871b3e7dbeb..ae8f7acecaf6 100644 --- a/go.sum +++ b/go.sum @@ -395,8 +395,8 @@ github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhK github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/nunnatsa/ginkgolinter v0.16.2 h1:8iLqHIZvN4fTLDC0Ke9tbSZVcyVHoBs0HIbnVSxfHJk= -github.com/nunnatsa/ginkgolinter v0.16.2/go.mod h1:4tWRinDN1FeJgU+iJANW/kz7xKN5nYRAOfJDQUS9dOQ= +github.com/nunnatsa/ginkgolinter v0.17.0 h1:9cvAxodbajOdYkszkj/qZTBgWB3/BUyV/PpPoVzwXnE= +github.com/nunnatsa/ginkgolinter v0.17.0/go.mod h1:vPrWafSULmjMGCMsfGA908if95VnHQNAahvSBOjTuWs= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= @@ -629,8 +629,8 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f h1:phY1HzDcf18Aq9A8KkmRtY9WvOFIxN8wgfvy6Zm1DV8= -golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0 h1:bVwtbF629Xlyxk6xLQq2TDYmqP0uiWaet5LwRebuY0k= +golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= From 8db6715facdf5d60f273b83f3dce74c69f0556fc Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Tue, 29 Oct 2024 15:55:08 +0100 Subject: [PATCH 2/3] fix: options --- pkg/golinters/ginkgolinter/ginkgolinter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/golinters/ginkgolinter/ginkgolinter.go b/pkg/golinters/ginkgolinter/ginkgolinter.go index 54d20725701f..ff8d306e01ef 100644 --- a/pkg/golinters/ginkgolinter/ginkgolinter.go +++ b/pkg/golinters/ginkgolinter/ginkgolinter.go @@ -23,8 +23,8 @@ func New(settings *config.GinkgoLinterSettings) *goanalysis.Linter { SuppressTypeCompare: types.Boolean(settings.SuppressTypeCompareWarning), AllowHaveLen0: types.Boolean(settings.AllowHaveLenZero), ForceExpectTo: types.Boolean(settings.ForceExpectTo), - ValidateAsyncIntervals: types.Boolean(settings.ForbidSpecPollution), - ForbidSpecPollution: types.Boolean(settings.ValidateAsyncIntervals), + ValidateAsyncIntervals: types.Boolean(settings.ValidateAsyncIntervals), + ForbidSpecPollution: types.Boolean(settings.ForbidSpecPollution), } } From b6164b8cdfa56d3cc6997b8d7ad84547b73ddcaf Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Tue, 29 Oct 2024 16:03:56 +0100 Subject: [PATCH 3/3] chore: update tests --- .../ginkgolinter/testdata/ginkgolinter_suppress_compare.go | 4 ++-- .../ginkgolinter/testdata/ginkgolinter_suppress_err.go | 6 +++--- .../ginkgolinter/testdata/ginkgolinter_suppress_nil.go | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_compare.go b/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_compare.go index fdb02c782b37..0e9688de9c0b 100644 --- a/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_compare.go +++ b/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_compare.go @@ -64,10 +64,10 @@ func WrongComparisonUsecase_compare() { x := 8 Expect(x == 8).To(BeTrue()) Expect(x < 9).To(BeTrue()) - Expect(x < 7).To(Equal(false)) + Expect(x < 7).To(Equal(false)) // want "ginkgo-linter: wrong boolean assertion. Consider using `Expect\\(x < 7\\)\\.To\\(BeFalse\\(\\)\\)`" p1, p2 := &x, &x - Expect(p1 == p2).To(Equal(true)) + Expect(p1 == p2).To(Equal(true)) // want "ginkgo-linter: wrong boolean assertion. Consider using `Expect\\(p1 == p2\\)\\.To\\(BeTrue\\(\\)\\)`" } func slowInt_compare() int { diff --git a/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_err.go b/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_err.go index b24f20b83cb7..ea80afbc2e94 100644 --- a/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_err.go +++ b/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_err.go @@ -49,9 +49,9 @@ func ErrorUsecase_err() { funcReturnsErr := func() error { return err } Expect(err).To(BeNil()) - Expect(err == nil).To(Equal(true)) - Expect(err == nil).To(BeFalse()) - Expect(err != nil).To(BeTrue()) + Expect(err == nil).To(Equal(true)) // want "ginkgo-linter: wrong nil assertion. Consider using `Expect\\(err\\).To\\(BeNil\\(\\)\\)`" + Expect(err == nil).To(BeFalse()) // want "ginkgo-linter: wrong nil assertion. Consider using `Expect\\(err\\).ToNot\\(BeNil\\(\\)\\)`" + Expect(err != nil).To(BeTrue()) // want "ginkgo-linter: wrong nil assertion. Consider using `Expect\\(err\\).ToNot\\(BeNil\\(\\)\\)`" Expect(funcReturnsErr()).To(BeNil()) } diff --git a/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_nil.go b/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_nil.go index 44b59f301ff8..fd13d7ed05fa 100644 --- a/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_nil.go +++ b/pkg/golinters/ginkgolinter/testdata/ginkgolinter_suppress_nil.go @@ -31,9 +31,9 @@ func LenUsecase_nil() { func NilUsecase_nil() { y := 5 x := &y - Expect(x == nil).To(Equal(true)) - Expect(nil == x).To(Equal(true)) - Expect(x != nil).To(Equal(true)) + Expect(x == nil).To(Equal(true)) // want "ginkgo-linter: wrong boolean assertion. Consider using `Expect\\(x == nil\\).To\\(BeTrue\\(\\)\\)`" + Expect(nil == x).To(Equal(true)) // want "ginkgo-linter: wrong boolean assertion. Consider using `Expect\\(nil == x\\).To\\(BeTrue\\(\\)\\)`" + Expect(x != nil).To(Equal(true)) // want "ginkgo-linter: wrong boolean assertion. Consider using `Expect\\(x != nil\\).To\\(BeTrue\\(\\)\\)`" Expect(x == nil).To(BeTrue()) Expect(x == nil).To(BeFalse()) }