chore: update linter

Author: ldez

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v2.0.1
+      GOLANGCI_LINT_VERSION: v2.2.2
       CGO_ENABLED: 0
 
     steps:

.golangci.yml

@@ -16,6 +16,7 @@ linters:
     - exhaustive
     - exhaustruct
     - forcetypeassert
+    - funcorder
     - ireturn
     - lll
     - mnd
@@ -30,7 +31,7 @@ linters:
     - tparallel
     - varnamelen
     - wrapcheck
-    - wsl
+    - wsl # deprecated
   settings:
     depguard:
       rules:

builder/builder.go

@@ -65,6 +65,7 @@ func (s StringsExpr) String() string {
 	for _, val := range s {
 		out = append(out, fmt.Sprintf("%q", val))
 	}
+
 	return strings.Join(out, ",")
 }
 

lib.go

@@ -32,18 +32,21 @@ func GetStringMapValue(mapVal, keyVal interface{}) (interface{}, error) {
 	if !ok {
 		return nil, trace.BadParameter("only string keys are supported")
 	}
+
 	switch m := mapVal.(type) {
 	case map[string][]string:
 		if len(m) == 0 {
 			// to return nil with a proper type
 			var n []string
 			return n, nil
 		}
+
 		return m[key], nil
 	case map[string]string:
 		if len(m) == 0 {
 			return "", nil
 		}
+
 		return m[key], nil
 	default:
 		return nil, trace.BadParameter("type %T is not supported", m)
@@ -67,14 +70,17 @@ func Equals(a interface{}, b interface{}) BoolPredicate {
 			if !ok {
 				return false
 			}
+
 			if len(aval) != len(bval) {
 				return false
 			}
+
 			for i := range aval {
 				if aval[i] != bval[i] {
 					return false
 				}
 			}
+
 			return true
 		default:
 			return false
@@ -90,15 +96,18 @@ func Contains(a interface{}, b interface{}) BoolPredicate {
 		if !ok {
 			return false
 		}
+
 		bval, ok := b.(string)
 		if !ok {
 			return false
 		}
+
 		for _, v := range aval {
 			if v == bval {
 				return true
 			}
 		}
+
 		return false
 	}
 }
@@ -141,6 +150,7 @@ func GetFieldByTag(ival interface{}, tagName string, fieldNames []string) (inter
 	if val.Kind() != reflect.Struct {
 		return nil, trace.NotFound("field name %v is not found", strings.Join(fieldNames, "."))
 	}
+
 	fieldName := fieldNames[0]
 	rest := fieldNames[1:]
 

parse.go

@@ -72,8 +72,10 @@ func (p *predicateParser) evaluateArguments(nodes []ast.Expr) ([]interface{}, er
 		if err != nil {
 			return nil, trace.Wrap(err)
 		}
+
 		out[i] = val
 	}
+
 	return out, nil
 }
 
@@ -123,6 +125,7 @@ func (p *predicateParser) evaluateExpr(n ast.Expr) (interface{}, error) {
 		if err != nil {
 			return nil, trace.Wrap(err)
 		}
+
 		return val, nil
 
 	case *ast.Ident:
@@ -134,6 +137,7 @@ func (p *predicateParser) evaluateExpr(n ast.Expr) (interface{}, error) {
 		if err != nil {
 			return nil, trace.Wrap(err)
 		}
+
 		return val, nil
 
 	case *ast.CallExpr:
@@ -181,6 +185,7 @@ func (p *predicateParser) getFunction(name string) (interface{}, error) {
 	if !ok {
 		return nil, trace.BadParameter("unsupported function: %s", name)
 	}
+
 	return v, nil
 }
 
@@ -195,6 +200,7 @@ func (p *predicateParser) joinPredicates(op token.Token, a, b interface{}) (inte
 
 func (p *predicateParser) getJoinFunction(op token.Token) (interface{}, error) {
 	var fn interface{}
+
 	switch op {
 	case token.NOT:
 		fn = p.d.Operators.NOT
@@ -215,9 +221,11 @@ func (p *predicateParser) getJoinFunction(op token.Token) (interface{}, error) {
 	case token.NEQ:
 		fn = p.d.Operators.NEQ
 	}
+
 	if fn == nil {
 		return nil, trace.BadParameter("%v is not supported", op)
 	}
+
 	return fn, nil
 }
 
@@ -228,13 +236,15 @@ func getIdentifier(node ast.Node) (string, error) {
 		if !okIdent {
 			return "", trace.BadParameter("expected selector identifier, got: %T", sexpr.X)
 		}
+
 		return fmt.Sprintf("%s.%s", id.Name, sexpr.Sel.Name), nil
 	}
 
 	id, ok := node.(*ast.Ident)
 	if !ok {
 		return "", trace.BadParameter("expected identifier, got: %T", node)
 	}
+
 	return id.Name, nil
 }
 
@@ -245,20 +255,23 @@ func literalToValue(a *ast.BasicLit) (interface{}, error) {
 		if err != nil {
 			return nil, trace.BadParameter("failed to parse argument: %s, error: %s", a.Value, err)
 		}
+
 		return value, nil
 
 	case token.INT:
 		value, err := strconv.Atoi(a.Value)
 		if err != nil {
 			return nil, trace.BadParameter("failed to parse argument: %s, error: %s", a.Value, err)
 		}
+
 		return value, nil
 
 	case token.STRING:
 		value, err := strconv.Unquote(a.Value)
 		if err != nil {
 			return nil, trace.BadParameter("failed to parse argument: %s, error: %s", a.Value, err)
 		}
+
 		return value, nil
 	}
 
@@ -289,10 +302,12 @@ func callFunction(f interface{}, args []interface{}) (v interface{}, err error)
 		if e == nil {
 			return v, nil
 		}
+
 		err, ok := e.(error)
 		if !ok {
 			return nil, trace.BadParameter("expected error as a second return value, got %T", e)
 		}
+
 		return v, err
 
 	default:

parse_test.go

@@ -320,6 +320,7 @@ func (s *PredicateSuite) TestIndexExpr() {
 	getProperty := func(mapVal, keyVal interface{}) (interface{}, error) {
 		m := mapVal.(map[string]int)
 		k := keyVal.(string)
+
 		return m[k], nil
 	}
 
@@ -360,17 +361,20 @@ func (s *PredicateSuite) TestIdentifierExpr() {
 		case "num":
 			return 2, nil
 		}
+
 		return nil, nil
 	}
 	p := s.getParserWithOpts(getID, nil)
 
 	pr, err := p.Parse("Equals(firstSlice, firstSlice)")
 	s.NoError(err)
+
 	fn := pr.(BoolPredicate)
 	s.True(fn())
 
 	pr, err = p.Parse("Equals(a, a)")
 	s.NoError(err)
+
 	fn = pr.(BoolPredicate)
 	s.True(fn())
 
@@ -382,6 +386,7 @@ func (s *PredicateSuite) TestIdentifierExpr() {
 
 	pr, err = p.Parse("Remainder(4) <= num")
 	s.NoError(err)
+
 	fn2 := pr.(numberPredicate)
 	s.True(fn2(2))
 	s.False(fn2(3))
@@ -454,6 +459,7 @@ func (s *PredicateSuite) TestGetTagField() {
 		expect interface{}
 		err    error
 	}
+
 	testCases := []testCase{
 		// nested field
 		{tag: "json", val: val, fields: []string{"param", "key1"}, expect: val.Param.Key1},
@@ -492,6 +498,7 @@ func (s *PredicateSuite) TestUnhappyCases() {
 		"Remainder(3) >> 3",       // unsupported operator
 		`Remainder(3) > "banana"`, // unsupported comparison type
 	}
+
 	p := s.getParser()
 	for _, expr := range cases {
 		pr, err := p.Parse(expr)
@@ -542,6 +549,7 @@ func numberGT(m numberMapper, value interface{}) (numberPredicate, error) {
 	default:
 		return nil, fmt.Errorf("GT: unsupported argument type: %T", value)
 	}
+
 	return func(v int) bool {
 		switch val := value.(type) {
 		case int: