From 623a7d5952b77a76f4bf122f3e057fd2249bc99d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 22:47:59 +0000 Subject: deps(actions): Bump golangci/golangci-lint-action from 6 to 7 (#2357) * deps(actions): Bump golangci/golangci-lint-action from 6 to 7 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6 to 7. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v6...v7) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * fix(lint): Fixing new lint errors Signed-off-by: Dave Henderson --------- Signed-off-by: dependabot[bot] Signed-off-by: Dave Henderson Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dave Henderson --- coll/coll_test.go | 72 +++++++++++++++++++++++++-------------------------- coll/jq_test.go | 4 +-- coll/jsonpath_test.go | 4 +-- 3 files changed, 40 insertions(+), 40 deletions(-) (limited to 'coll') diff --git a/coll/coll_test.go b/coll/coll_test.go index ab2241ee..d39dc511 100644 --- a/coll/coll_test.go +++ b/coll/coll_test.go @@ -76,7 +76,7 @@ func TestKeys(t *testing.T) { expected := []string{"bar", "foo"} keys, err := Keys(in) require.NoError(t, err) - assert.EqualValues(t, expected, keys) + assert.Equal(t, expected, keys) in2 := map[string]any{ "baz": 3, @@ -85,7 +85,7 @@ func TestKeys(t *testing.T) { expected = []string{"bar", "foo", "baz", "qux"} keys, err = Keys(in, in2) require.NoError(t, err) - assert.EqualValues(t, expected, keys) + assert.Equal(t, expected, keys) in3 := map[string]any{ "Foo": 5, @@ -96,7 +96,7 @@ func TestKeys(t *testing.T) { expected = []string{"bar", "foo", "baz", "qux", "Bar", "Foo", "bar", "foo"} keys, err = Keys(in, in2, in3) require.NoError(t, err) - assert.EqualValues(t, expected, keys) + assert.Equal(t, expected, keys) } func TestValues(t *testing.T) { @@ -110,7 +110,7 @@ func TestValues(t *testing.T) { expected := []any{2, 1} values, err := Values(in) require.NoError(t, err) - assert.EqualValues(t, expected, values) + assert.Equal(t, expected, values) in2 := map[string]any{ "baz": 3, @@ -119,7 +119,7 @@ func TestValues(t *testing.T) { expected = []any{2, 1, 3, 4} values, err = Values(in, in2) require.NoError(t, err) - assert.EqualValues(t, expected, values) + assert.Equal(t, expected, values) in3 := map[string]any{ "Foo": 5, @@ -130,73 +130,73 @@ func TestValues(t *testing.T) { expected = []any{2, 1, 3, 4, 6, 5, 8, 7} values, err = Values(in, in2, in3) require.NoError(t, err) - assert.EqualValues(t, expected, values) + assert.Equal(t, expected, values) } func TestAppend(t *testing.T) { out, err := Append(42, []any{}) require.NoError(t, err) - assert.EqualValues(t, []any{42}, out) + assert.Equal(t, []any{42}, out) out, err = Append(42, []any{4.9, false, "foo"}) require.NoError(t, err) - assert.EqualValues(t, []any{4.9, false, "foo", 42}, out) + assert.Equal(t, []any{4.9, false, "foo", 42}, out) // a strange but valid use-cases, since we're converting to an []any out, err = Append(42, []string{"foo"}) require.NoError(t, err) - assert.EqualValues(t, []any{"foo", 42}, out) + assert.Equal(t, []any{"foo", 42}, out) out, err = Append("baz", []string{"foo", "bar"}) require.NoError(t, err) - assert.EqualValues(t, []any{"foo", "bar", "baz"}, out) + assert.Equal(t, []any{"foo", "bar", "baz"}, out) } func TestPrepend(t *testing.T) { out, err := Prepend(42, []any{}) require.NoError(t, err) - assert.EqualValues(t, []any{42}, out) + assert.Equal(t, []any{42}, out) out, err = Prepend(42, []any{4.9, false, "foo"}) require.NoError(t, err) - assert.EqualValues(t, []any{42, 4.9, false, "foo"}, out) + assert.Equal(t, []any{42, 4.9, false, "foo"}, out) // a strange but valid use-cases, since we're converting to an []any out, err = Prepend(42, []string{"foo"}) require.NoError(t, err) - assert.EqualValues(t, []any{42, "foo"}, out) + assert.Equal(t, []any{42, "foo"}, out) out, err = Prepend("foo", []string{"bar", "baz"}) require.NoError(t, err) - assert.EqualValues(t, []any{"foo", "bar", "baz"}, out) + assert.Equal(t, []any{"foo", "bar", "baz"}, out) } func TestUniq(t *testing.T) { out, err := Uniq([]any{1, 2, 3, 1, true, false, true, "1", 2}) require.NoError(t, err) - assert.EqualValues(t, []any{1, 2, 3, true, false, "1"}, out) + assert.Equal(t, []any{1, 2, 3, true, false, "1"}, out) out, err = Uniq([]string{"one", "two", "one", "three"}) require.NoError(t, err) - assert.EqualValues(t, []any{"one", "two", "three"}, out) + assert.Equal(t, []any{"one", "two", "three"}, out) } func TestReverse(t *testing.T) { out, err := Reverse([]any{}) require.NoError(t, err) - assert.EqualValues(t, []any{}, out) + assert.Equal(t, []any{}, out) out, err = Reverse([]any{8}) require.NoError(t, err) - assert.EqualValues(t, []any{8}, out) + assert.Equal(t, []any{8}, out) out, err = Reverse([]any{1, 2, 3, 4}) require.NoError(t, err) - assert.EqualValues(t, []any{4, 3, 2, 1}, out) + assert.Equal(t, []any{4, 3, 2, 1}, out) out, err = Reverse([]int{1, 2, 3, 4}) require.NoError(t, err) - assert.EqualValues(t, []any{4, 3, 2, 1}, out) + assert.Equal(t, []any{4, 3, 2, 1}, out) } func TestMerge(t *testing.T) { @@ -206,7 +206,7 @@ func TestMerge(t *testing.T) { out, err := Merge(dst, src) require.NoError(t, err) - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) dst = map[string]any{"a": 4, "c": 5} src = map[string]any{"a": 1, "b": 2, "c": 3} @@ -216,7 +216,7 @@ func TestMerge(t *testing.T) { out, err = Merge(dst, src) require.NoError(t, err) - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) dst = map[string]any{"a": 4, "c": 5} src = map[string]any{"a": 1, "b": 2, "c": 3} @@ -227,7 +227,7 @@ func TestMerge(t *testing.T) { out, err = Merge(dst, src, src2) require.NoError(t, err) - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) dst = map[string]any{"a": false, "c": 5} src = map[string]any{"a": true, "b": 2, "c": 3} @@ -238,7 +238,7 @@ func TestMerge(t *testing.T) { out, err = Merge(dst, src, src2) require.NoError(t, err) - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) dst = map[string]any{"a": true, "c": 5} src = map[string]any{ @@ -254,7 +254,7 @@ func TestMerge(t *testing.T) { out, err = Merge(dst, src, src2) require.NoError(t, err) - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) dst = map[string]any{ "a": true, @@ -279,7 +279,7 @@ func TestMerge(t *testing.T) { out, err = Merge(dst, src) require.NoError(t, err) - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) } type coords struct { @@ -464,7 +464,7 @@ func TestSort(t *testing.T) { t.Run(fmt.Sprintf(`Sort("%s",<%T>)==%#v`, d.key, d.in, d.out), func(t *testing.T) { out, err := Sort(d.key, d.in) require.NoError(t, err) - assert.EqualValues(t, d.out, out) + assert.Equal(t, d.out, out) }) } } @@ -541,7 +541,7 @@ func TestFlatten(t *testing.T) { for _, d := range data { out, err := Flatten(d.in, d.depth) require.NoError(t, err) - assert.EqualValues(t, d.expected, out) + assert.Equal(t, d.expected, out) } _, err := Flatten(42, -1) @@ -583,20 +583,20 @@ func TestOmit(t *testing.T) { "bar": true, "": "baz", } - assert.EqualValues(t, in, Omit(in, "baz")) + assert.Equal(t, in, Omit(in, "baz")) expected := map[string]any{ "foo": "bar", "bar": true, } - assert.EqualValues(t, expected, Omit(in, "")) + assert.Equal(t, expected, Omit(in, "")) expected = map[string]any{ "": "baz", } - assert.EqualValues(t, expected, Omit(in, "foo", "bar")) + assert.Equal(t, expected, Omit(in, "foo", "bar")) - assert.EqualValues(t, map[string]any{}, Omit(in, "foo", "bar", "")) + assert.Equal(t, map[string]any{}, Omit(in, "foo", "bar", "")) } func TestPick(t *testing.T) { @@ -606,18 +606,18 @@ func TestPick(t *testing.T) { "": "baz", } expected := map[string]any{} - assert.EqualValues(t, expected, Pick(in, "baz")) + assert.Equal(t, expected, Pick(in, "baz")) expected = map[string]any{ "": "baz", } - assert.EqualValues(t, expected, Pick(in, "")) + assert.Equal(t, expected, Pick(in, "")) expected = map[string]any{ "foo": "bar", "bar": true, } - assert.EqualValues(t, expected, Pick(in, "foo", "bar")) + assert.Equal(t, expected, Pick(in, "foo", "bar")) - assert.EqualValues(t, in, Pick(in, "foo", "bar", "")) + assert.Equal(t, in, Pick(in, "foo", "bar", "")) } diff --git a/coll/jq_test.go b/coll/jq_test.go index 0d45fdfb..2928293c 100644 --- a/coll/jq_test.go +++ b/coll/jq_test.go @@ -64,7 +64,7 @@ func TestJQ(t *testing.T) { out, err = JQ(ctx, ".store", in) require.NoError(t, err) - assert.EqualValues(t, in["store"], out) + assert.Equal(t, in["store"], out) out, err = JQ(ctx, ".store.book[].author", in) require.NoError(t, err) @@ -91,7 +91,7 @@ func TestJQ(t *testing.T) { "price": 8.99, }, } - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) in = map[string]any{ "a": map[string]any{ diff --git a/coll/jsonpath_test.go b/coll/jsonpath_test.go index 147fc2ea..c7bacc20 100644 --- a/coll/jsonpath_test.go +++ b/coll/jsonpath_test.go @@ -65,7 +65,7 @@ func TestJSONPath(t *testing.T) { out, err = JSONPath(".store", in) require.NoError(t, err) - assert.EqualValues(t, in["store"], out) + assert.Equal(t, in["store"], out) out, err = JSONPath("$.store.book[*].author", in) require.NoError(t, err) @@ -92,7 +92,7 @@ func TestJSONPath(t *testing.T) { "price": 8.99, }, } - assert.EqualValues(t, expected, out) + assert.Equal(t, expected, out) in = m{ "a": m{ -- cgit v1.2.3