fix lint

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Author: crenshaw-dev

.github/workflows/ci-build.yaml

@@ -110,8 +110,8 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
-          # renovate: datasource=go packageName=github.com/golangci/golangci-lint versioning=regex:^v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?$
-          version: v2.5.0
+          # renovate: datasource=go packageName=github.com/golangci/golangci-lint/v2 versioning=regex:^v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?$
+          version: v2.11.4
           args: --verbose
 
   test-go:

.golangci.yaml

@@ -22,6 +22,7 @@ linters:
     - govet
     - importas
     - misspell
+    - modernize
     - noctx
     - perfsprint
     - revive
@@ -121,6 +122,13 @@ linters:
         - pkg: github.com/argoproj/argo-cd/v3/util/io
           alias: utilio
 
+    modernize:
+      disable:
+        # Suggest replacing omitempty with omitzero for struct fields.
+        - omitzero
+        # Simplify code by using go1.26's new(expr). - generates lots of false positives.
+        - newexpr
+
     nolintlint:
       require-specific: true
 
@@ -137,16 +145,19 @@ linters:
       strconcat: true
 
     revive:
+      enable-all-rules: false
+      enable-default-rules: true
+      max-open-files: 2048
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
       rules:
-        - name: bool-literal-in-expr
-
         - name: blank-imports
           disabled: true
 
+        - name: bool-literal-in-expr
+
         - name: context-as-argument
           arguments:
-            - allowTypesBefore: '*testing.T,testing.TB'
+            - allow-types-before: '*testing.T,testing.TB'
 
         - name: context-keys-type
           disabled: true
@@ -158,21 +169,21 @@ linters:
 
         - name: early-return
           arguments:
-            - preserveScope
+            - preserve-scope
 
         - name: empty-block
           disabled: true
 
-        - name: error-naming
-          disabled: true
-
         - name: error-return
 
         - name: error-strings
           disabled: true
 
         - name: errorf
 
+        - name: exported
+          disabled: true
+
         - name: identical-branches
 
         - name: if-return
@@ -181,7 +192,7 @@ linters:
 
         - name: indent-error-flow
           arguments:
-            - preserveScope
+            - preserve-scope
 
         - name: modifies-parameter
 
@@ -198,7 +209,7 @@ linters:
 
         - name: superfluous-else
           arguments:
-            - preserveScope
+            - preserve-scope
 
         - name: time-equal
 
@@ -208,6 +219,8 @@ linters:
         - name: unexported-return
           disabled: true
 
+        - name: unnecessary-format
+
         - name: unnecessary-stmt
 
         - name: unreachable-code
@@ -224,8 +237,8 @@ linters:
           arguments:
             - - ID
             - - VM
-            - - skipPackageNameChecks: true
-                upperCaseConst: true
+            - - skip-initialism-name-checks: true
+                upper-case-const: true
 
     staticcheck:
       checks:
@@ -247,7 +260,4 @@ linters:
     usetesting:
       os-mkdir-temp: false
 
-output:
-  show-stats: false
-
 version: "2"

hack/installers/install-lint-tools.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
 
-# renovate: datasource=go packageName=github.com/golangci/golangci-lint
-GOLANGCI_LINT_VERSION=2.5.0
+# renovate: datasource=go packageName=github.com/golangci/golangci-lint/v2
+GOLANGCI_LINT_VERSION=2.11.4
 
 GO111MODULE=on go install "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v${GOLANGCI_LINT_VERSION}"

renovate-presets/devtool.json5

@@ -16,7 +16,7 @@
         "go"
       ],
       "matchPackageNames": [
-        "github.com/golangci/golangci-lint",
+        "github.com/golangci/golangci-lint/v2",
         "github.com/vektra/mockery/v3"
       ],
       "enabled": true