diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml index 266ecbf5a9a4..bfc20df37c51 100644 --- a/.golangci.next.reference.yml +++ b/.golangci.next.reference.yml @@ -3269,7 +3269,9 @@ linters-settings: - blank-import - bool-compare - compares + - contains - empty + - encoded-compare - error-is-as - error-nil - expected-actual @@ -3279,6 +3281,7 @@ linters-settings: - len - negative-positive - nil-compare + - regexp - require-error - suite-broken-parallel - suite-dont-use-pkg @@ -3292,15 +3295,17 @@ linters-settings: disable-all: true # Enable checkers by name # (in addition to default - # blank-import, bool-compare, compares, empty, error-is-as, error-nil, expected-actual, go-require, float-compare, - # formatter, len, negative-positive, nil-compare, require-error, suite-broken-parallel, suite-dont-use-pkg, - # suite-extra-assert-call, suite-subtest-run, useless-assert + # blank-import, bool-compare, compares, contains, empty, encoded-compare, error-is-as, error-nil, expected-actual, + # go-require, float-compare, formatter, len, negative-positive, nil-compare, regexp, require-error, + # suite-broken-parallel, suite-dont-use-pkg, suite-extra-assert-call, suite-subtest-run, useless-assert # ). enable: - blank-import - bool-compare - compares + - contains - empty + - encoded-compare - error-is-as - error-nil - expected-actual @@ -3310,6 +3315,7 @@ linters-settings: - len - negative-positive - nil-compare + - regexp - require-error - suite-broken-parallel - suite-dont-use-pkg diff --git a/go.mod b/go.mod index 32e3ff894098..ec3f00915d1f 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/Abirdcfly/dupword v0.1.1 github.com/Antonboom/errname v0.1.13 github.com/Antonboom/nilnil v0.1.9 - github.com/Antonboom/testifylint v1.4.3 + github.com/Antonboom/testifylint v1.5.0 github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c github.com/Crocmagnon/fatcontext v0.5.2 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 diff --git a/go.sum b/go.sum index f0d3fce5f5e9..5cabeb76b4b9 100644 --- a/go.sum +++ b/go.sum @@ -45,6 +45,8 @@ github.com/Antonboom/nilnil v0.1.9 h1:eKFMejSxPSA9eLSensFmjW2XTgTwJMjZ8hUHtV4s/S github.com/Antonboom/nilnil v0.1.9/go.mod h1:iGe2rYwCq5/Me1khrysB4nwI7swQvjclR8/YRPl5ihQ= github.com/Antonboom/testifylint v1.4.3 h1:ohMt6AHuHgttaQ1xb6SSnxCeK4/rnK7KKzbvs7DmEck= github.com/Antonboom/testifylint v1.4.3/go.mod h1:+8Q9+AOLsz5ZiQiiYujJKs9mNz398+M6UgslP4qgJLA= +github.com/Antonboom/testifylint v1.5.0 h1:dlUIsDMtCrZWUnvkaCz3quJCoIjaGi41GzjPBGkkJ8A= +github.com/Antonboom/testifylint v1.5.0/go.mod h1:wqaJbu0Blb5Wag2wv7Z5xt+CIV+eVLxtGZrlK13z3AE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json index 511eadedfecd..24f26ba4cd68 100644 --- a/jsonschema/golangci.next.jsonschema.json +++ b/jsonschema/golangci.next.jsonschema.json @@ -2905,7 +2905,9 @@ "blank-import", "bool-compare", "compares", + "contains", "empty", + "encoded-compare", "error-is-as", "error-nil", "expected-actual", @@ -2915,6 +2917,7 @@ "len", "negative-positive", "nil-compare", + "regexp", "require-error", "suite-broken-parallel", "suite-dont-use-pkg", @@ -2928,16 +2931,19 @@ "blank-import", "bool-compare", "compares", + "contains", "empty", + "encoded-compare", "error-is-as", "error-nil", "expected-actual", "float-compare", - "float-compare", + "formatter", "go-require", "len", "negative-positive", "nil-compare", + "regexp", "require-error", "suite-broken-parallel", "suite-dont-use-pkg", @@ -2954,7 +2960,9 @@ "blank-import", "bool-compare", "compares", + "contains", "empty", + "encoded-compare", "error-is-as", "error-nil", "expected-actual", @@ -2964,6 +2972,7 @@ "len", "negative-positive", "nil-compare", + "regexp", "require-error", "suite-broken-parallel", "suite-dont-use-pkg", diff --git a/pkg/printers/printer_test.go b/pkg/printers/printer_test.go index 56d0c6f92980..ef2e0bb02b50 100644 --- a/pkg/printers/printer_test.go +++ b/pkg/printers/printer_test.go @@ -225,5 +225,5 @@ func TestPrinter_Print_multiple(t *testing.T) { goldenJSON, err := os.ReadFile(filepath.Join("testdata", "golden-json.json")) require.NoError(t, err) - assert.Equal(t, string(goldenJSON), stdOutBuffer.String()) + assert.JSONEq(t, string(goldenJSON), stdOutBuffer.String()) }