Update dependency golangci/golangci-lint to v2.7.2 (#4395)

renovate[bot] · sjberman · web-flow · commit 3676f9920d66 · 2025-12-10T09:03:32.000Z
* Update dependency golangci/golangci-lint to v2.7.2

| datasource  | package                | from   | to     |
| ----------- | ---------------------- | ------ | ------ |
| github-tags | golangci/golangci-lint | v2.6.2 | v2.7.2 |


Signed-off-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;

* Linting fixes

---------

Signed-off-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: Saylor Berman &lt;s.berman@f5.com&gt;
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -50,7 +50,7 @@ jobs:
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
           working-directory: ${{ matrix.directory }}
-          version: v2.6.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.7.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   njs-lint:
     name: NJS Lint
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
           - javascript
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.6.2
+    rev: v2.7.2
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
 
 # tools versions
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION = v2.6.2
+GOLANGCI_LINT_VERSION = v2.7.2
 # renovate: datasource=docker depName=kindest/node
 KIND_K8S_VERSION = v1.34.0
 # renovate: datasource=github-tags depName=norwoodj/helm-docs
diff --git a/internal/controller/ngfsort/doc.go b/internal/controller/ngfsort/doc.go
@@ -0,0 +1,2 @@
+// Package ngfsort provides utilities for sorting Kubernetes resources.
+package ngfsort
diff --git a/internal/controller/ngfsort/sort.go b/internal/controller/ngfsort/sort.go
@@ -1,4 +1,4 @@
-package sort
+package ngfsort
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/controller/ngfsort/sort_test.go b/internal/controller/ngfsort/sort_test.go
@@ -1,4 +1,4 @@
-package sort
+package ngfsort
 
 import (
 	"testing"
diff --git a/internal/controller/nginx/agent/grpc/context/doc.go b/internal/controller/nginx/agent/grpc/context/doc.go
@@ -1,4 +1,4 @@
 /*
 Package context contains the functions for storing extra information in the gRPC context.
 */
-package context
+package context //nolint:revive // ignoring conflicting package name
diff --git a/internal/controller/nginx/config/http/config.go b/internal/controller/nginx/config/http/config.go
@@ -1,4 +1,4 @@
-package http
+package http //nolint:revive // ignoring conflicting package name
 
 import (
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared"
diff --git a/internal/controller/nginx/config/shared/config.go b/internal/controller/nginx/config/shared/config.go
@@ -1,4 +1,4 @@
-package shared
+package shared //nolint:revive // ignoring meaningless package name
 
 // Map defines an NGINX map.
 type Map struct {
diff --git a/internal/controller/sort/doc.go b/internal/controller/sort/doc.go
diff --git a/internal/controller/state/dataplane/sort.go b/internal/controller/state/dataplane/sort.go
@@ -3,7 +3,7 @@ package dataplane
 import (
 	"sort"
 
-	ngfsort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
+	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 )
 
 func sortMatchRules(matchRules []MatchRule) {
diff --git a/internal/controller/state/graph/backend_refs.go b/internal/controller/state/graph/backend_refs.go
@@ -12,7 +12,7 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2"
-	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
+	sort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
diff --git a/internal/controller/state/graph/policies.go b/internal/controller/state/graph/policies.go
@@ -10,8 +10,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies"
-	ngfsort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
diff --git a/internal/controller/state/graph/route_common.go b/internal/controller/state/graph/route_common.go
@@ -14,7 +14,7 @@ import (
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	v1alpha "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	ngfSort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
+	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
@@ -438,7 +438,7 @@ func bindRoutesToListeners(
 
 		// Sort the slice by timestamp and name so that we process the routes in the priority order
 		sort.Slice(l4RouteSlice, func(i, j int) bool {
-			return ngfSort.LessClientObject(l4RouteSlice[i].Source, l4RouteSlice[j].Source)
+			return ngfsort.LessClientObject(l4RouteSlice[i].Source, l4RouteSlice[j].Source)
 		})
 
 		// portHostnamesMap exists to detect duplicate hostnames on the same port

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Package ngfsort provides utilities for sorting Kubernetes resources.`
	`2`	`+package ngfsort`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package sort`
	`1`	`+package ngfsort`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package http`
	`1`	`+package http //nolint:revive // ignoring conflicting package name`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package shared`
	`1`	`+package shared //nolint:revive // ignoring meaningless package name`
`2`	`2`
`3`	`3`	`// Map defines an NGINX map.`
`4`	`4`	`type Map struct {`