From a13844c9c0a3d03e0fba4627a51445ca9ae8100b Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Sun, 10 Nov 2024 15:38:25 -0500 Subject: fix(lint): Address new lint warnings from golangci-lint 1.62 (#2256) Signed-off-by: Dave Henderson --- internal/datafs/reader_test.go | 4 ++-- internal/funcs/path_test.go | 2 +- internal/funcs/random.go | 24 ++++++++++++------------ internal/funcs/strings.go | 8 +++++--- internal/texttemplate/funcs.go | 2 ++ 5 files changed, 22 insertions(+), 18 deletions(-) (limited to 'internal') diff --git a/internal/datafs/reader_test.go b/internal/datafs/reader_test.go index 2ec7485c..588592fd 100644 --- a/internal/datafs/reader_test.go +++ b/internal/datafs/reader_test.go @@ -101,7 +101,7 @@ func TestReadFileContent(t *testing.T) { fc, err := sr.readFileContent(ctx, mustParseURL("file:///foo.json"), nil) require.NoError(t, err) - assert.Equal(t, []byte(`{"foo": "bar"}`), fc.b) + assert.JSONEq(t, `{"foo": "bar"}`, string(fc.b)) fc, err = sr.readFileContent(ctx, mustParseURL("dir/"), nil) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestReadFileContent(t *testing.T) { fc, err = sr.readFileContent(ctx, mustParseURL(srv.URL+"/foo.json"), nil) require.NoError(t, err) - assert.Equal(t, []byte(`{"foo": "bar"}`), fc.b) + assert.JSONEq(t, `{"foo": "bar"}`, string(fc.b)) } func TestDatasource(t *testing.T) { diff --git a/internal/funcs/path_test.go b/internal/funcs/path_test.go index a314933b..aa4d1322 100644 --- a/internal/funcs/path_test.go +++ b/internal/funcs/path_test.go @@ -35,7 +35,7 @@ func TestPathFuncs(t *testing.T) { assert.Equal(t, "/foo/baz", p.Clean("/foo/bar/../baz")) assert.Equal(t, "foo", p.Dir("foo/bar")) assert.Equal(t, ".txt", p.Ext("/foo/bar/baz.txt")) - assert.False(t, false, p.IsAbs("foo/bar")) + assert.False(t, p.IsAbs("foo/bar")) assert.True(t, p.IsAbs("/foo/bar")) assert.Equal(t, "foo/bar/qux", p.Join("foo", "bar", "baz", "..", "qux")) m, _ := p.Match("*.txt", "foo.json") diff --git a/internal/funcs/random.go b/internal/funcs/random.go index 0f18ae92..afadfef4 100644 --- a/internal/funcs/random.go +++ b/internal/funcs/random.go @@ -141,58 +141,58 @@ func (RandomFuncs) Item(items interface{}) (interface{}, error) { // Number - func (RandomFuncs) Number(args ...interface{}) (int64, error) { - var min, max int64 - min, max = 0, 100 + var nMin, nMax int64 + nMin, nMax = 0, 100 var err error switch len(args) { case 0: case 1: - max, err = conv.ToInt64(args[0]) + nMax, err = conv.ToInt64(args[0]) if err != nil { return 0, fmt.Errorf("max must be a number: %w", err) } case 2: - min, err = conv.ToInt64(args[0]) + nMin, err = conv.ToInt64(args[0]) if err != nil { return 0, fmt.Errorf("min must be a number: %w", err) } - max, err = conv.ToInt64(args[1]) + nMax, err = conv.ToInt64(args[1]) if err != nil { return 0, fmt.Errorf("max must be a number: %w", err) } } - return random.Number(min, max) + return random.Number(nMin, nMax) } // Float - func (RandomFuncs) Float(args ...interface{}) (float64, error) { - var min, max float64 - min, max = 0, 1.0 + var nMin, nMax float64 + nMin, nMax = 0, 1.0 var err error switch len(args) { case 0: case 1: - max, err = conv.ToFloat64(args[0]) + nMax, err = conv.ToFloat64(args[0]) if err != nil { return 0, fmt.Errorf("max must be a number: %w", err) } case 2: - min, err = conv.ToFloat64(args[0]) + nMin, err = conv.ToFloat64(args[0]) if err != nil { return 0, fmt.Errorf("min must be a number: %w", err) } - max, err = conv.ToFloat64(args[1]) + nMax, err = conv.ToFloat64(args[1]) if err != nil { return 0, fmt.Errorf("max must be a number: %w", err) } } - return random.Float(min, max) + return random.Float(nMin, nMax) } diff --git a/internal/funcs/strings.go b/internal/funcs/strings.go index a0afc072..44054f9b 100644 --- a/internal/funcs/strings.go +++ b/internal/funcs/strings.go @@ -152,6 +152,8 @@ func (StringFuncs) Abbrev(args ...interface{}) (string, error) { } // ReplaceAll - +// +//nolint:revive func (StringFuncs) ReplaceAll(old, new string, s interface{}) string { return strings.ReplaceAll(conv.ToString(s), old, new) } @@ -322,10 +324,10 @@ func (StringFuncs) ShellQuote(in interface{}) string { switch val.Kind() { case reflect.Array, reflect.Slice: var sb strings.Builder - max := val.Len() - for n := 0; n < max; n++ { + vLen := val.Len() + for n := 0; n < vLen; n++ { sb.WriteString(gompstrings.ShellQuote(conv.ToString(val.Index(n)))) - if n+1 != max { + if n+1 != vLen { sb.WriteRune(' ') } } diff --git a/internal/texttemplate/funcs.go b/internal/texttemplate/funcs.go index 08e6bdbb..e2f7d150 100644 --- a/internal/texttemplate/funcs.go +++ b/internal/texttemplate/funcs.go @@ -12,6 +12,8 @@ import ( ) // indexArg checks if a reflect.Value can be used as an index, and converts it to int if possible. +// +//nolint:revive func indexArg(index reflect.Value, cap int) (int, error) { var x int64 switch index.Kind() { -- cgit v1.2.3