Bump CI Go version to include 1.24.x + golangci-lint to 1.64.5 (#198)

Author: rodaine

.github/workflows/ci.yaml

@@ -22,6 +22,7 @@ jobs:
           - 1.21.x
           - 1.22.x
           - 1.23.x
+          - 1.24.x
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -36,5 +37,5 @@ jobs:
       - name: Lint
         # Often, lint guidelines depend on the Go version. To prevent
         # conflicting guidance, run only on the most recent supported version.
-        if: matrix.go-version == '1.23.x'
+        if: matrix.go-version == '1.24.x'
         run: make lint-go

.golangci.yml

@@ -26,13 +26,11 @@ linters:
     - cyclop            # covered by gocyclo
     - depguard          # we can manage dependencies strictly if the need arises in the future
     - err113            # internal error causes may be dynamic
-    - execinquery       # deprecated by author
     - exhaustruct       # don't _always_ need to exhaustively create struct
     - funlen            # rely on code review to limit function length
     - gocognit          # dubious "cognitive overhead" quantification
     - gofumpt           # prefer standard gofmt
     - goimports         # rely on gci instead
-    - gomnd             # some unnamed constants are okay
     - gomoddirectives   # we use go modules replacements intentionally
     - gomodguard        # not compatible with go workspaces
     - intrange          # enable once go 1.22 is baseline
@@ -42,6 +40,7 @@ linters:
     - mnd               # some unnamed constants are okay
     - nlreturn          # generous whitespace violates house style
     - nonamedreturns    # usage of named returns should be selective
+    - tenv              # deprecated: replaced by usetesting
     - testpackage       # internal tests are fine
     - wrapcheck         # don't _always_ need to wrap errors
     - wsl               # over-generous whitespace violates house style

Makefile

@@ -12,7 +12,7 @@ LICENSE_IGNORE := -e internal/testdata/
 # Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
 GO ?= go
 ARGS ?= --strict --strict_message --strict_error
-GOLANGCI_LINT_VERSION ?= v1.60.1
+GOLANGCI_LINT_VERSION ?= v1.64.5
 # Set to use a different version of protovalidate-conformance.
 # Should be kept in sync with the version referenced in proto/buf.lock and
 # 'buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go' in go.mod.

builder.go

@@ -305,7 +305,7 @@ func (bldr *builder) processFieldExpressions(
 				FieldType:   celRuleField.GetFieldType().Enum(),
 				FieldName:   proto.String(celRuleField.GetFieldName()),
 				Subscript: &validate.FieldPathElement_Index{
-					Index: uint64(i),
+					Index: uint64(i), //nolint:gosec // indices are guaranteed to be non-negative
 				},
 			},
 		}

cel/library.go

@@ -56,8 +56,7 @@ func NewLibrary() cel.Library {
 // should avoid exposing additional functions as they will not be portable.
 type library struct{}
 
-//nolint:funlen
-func (l library) CompileOptions() []cel.EnvOption {
+func (l library) CompileOptions() []cel.EnvOption { //nolint:funlen,gocyclo
 	return []cel.EnvOption{
 		cel.TypeDescs(protoregistry.GlobalFiles),
 		cel.DefaultUTCTimeZone(true),
@@ -258,7 +257,11 @@ func (l library) CompileOptions() []cel.EnvOption {
 					if !ok {
 						return types.UnsupportedRefValConversionErr(rhs)
 					}
-					return types.Bool(strings.Contains(lhs.Value().(string), substr))
+					value, ok := lhs.Value().(string)
+					if !ok {
+						return types.UnsupportedRefValConversionErr(lhs)
+					}
+					return types.Bool(strings.Contains(value, substr))
 				}),
 			),
 			cel.MemberOverload("contains_bytes", []*cel.Type{cel.BytesType, cel.BytesType}, cel.BoolType,
@@ -267,7 +270,11 @@ func (l library) CompileOptions() []cel.EnvOption {
 					if !ok {
 						return types.UnsupportedRefValConversionErr(rhs)
 					}
-					return types.Bool(bytes.Contains(lhs.Value().([]byte), substr))
+					value, ok := lhs.Value().([]byte)
+					if !ok {
+						return types.UnsupportedRefValConversionErr(lhs)
+					}
+					return types.Bool(bytes.Contains(value, substr))
 				}),
 			),
 		),
@@ -279,7 +286,11 @@ func (l library) CompileOptions() []cel.EnvOption {
 					if !ok {
 						return types.UnsupportedRefValConversionErr(rhs)
 					}
-					return types.Bool(strings.HasSuffix(lhs.Value().(string), suffix))
+					value, ok := lhs.Value().(string)
+					if !ok {
+						return types.UnsupportedRefValConversionErr(lhs)
+					}
+					return types.Bool(strings.HasSuffix(value, suffix))
 				}),
 			),
 			cel.MemberOverload("ends_with_bytes", []*cel.Type{cel.BytesType, cel.BytesType}, cel.BoolType,
@@ -288,7 +299,11 @@ func (l library) CompileOptions() []cel.EnvOption {
 					if !ok {
 						return types.UnsupportedRefValConversionErr(rhs)
 					}
-					return types.Bool(bytes.HasSuffix(lhs.Value().([]byte), suffix))
+					value, ok := lhs.Value().([]byte)
+					if !ok {
+						return types.UnsupportedRefValConversionErr(lhs)
+					}
+					return types.Bool(bytes.HasSuffix(value, suffix))
 				}),
 			),
 		),
@@ -300,7 +315,11 @@ func (l library) CompileOptions() []cel.EnvOption {
 					if !ok {
 						return types.UnsupportedRefValConversionErr(rhs)
 					}
-					return types.Bool(strings.HasPrefix(lhs.Value().(string), prefix))
+					value, ok := lhs.Value().(string)
+					if !ok {
+						return types.UnsupportedRefValConversionErr(lhs)
+					}
+					return types.Bool(strings.HasPrefix(value, prefix))
 				}),
 			),
 			cel.MemberOverload("starts_with_bytes", []*cel.Type{cel.BytesType, cel.BytesType}, cel.BoolType,
@@ -309,7 +328,11 @@ func (l library) CompileOptions() []cel.EnvOption {
 					if !ok {
 						return types.UnsupportedRefValConversionErr(rhs)
 					}
-					return types.Bool(bytes.HasPrefix(lhs.Value().([]byte), prefix))
+					value, ok := lhs.Value().([]byte)
+					if !ok {
+						return types.UnsupportedRefValConversionErr(lhs)
+					}
+					return types.Bool(bytes.HasPrefix(value, prefix))
 				}),
 			),
 		),

repeated.go

@@ -58,7 +58,7 @@ func (r listItems) Evaluate(msg protoreflect.Message, val protoreflect.Value, cf
 				FieldNumber: proto.Int32(r.base.FieldPathElement.GetFieldNumber()),
 				FieldType:   r.base.FieldPathElement.GetFieldType().Enum(),
 				FieldName:   proto.String(r.base.FieldPathElement.GetFieldName()),
-				Subscript:   &validate.FieldPathElement_Index{Index: uint64(i)},
+				Subscript:   &validate.FieldPathElement_Index{Index: uint64(i)}, //nolint:gosec // indices are guaranteed to be non-negative
 			}, r.base.RulePrefix.GetElements())
 		}
 		if ok, err = mergeViolations(err, itemErr, cfg); !ok {