Merge branch 'master' into testinfraupdate

Author: kushalShukla-web

.github/workflows/golangci-lint.yml

@@ -26,14 +26,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install Go
-        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Install snmp_exporter/generator dependencies
         run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
         if: github.repository == 'prometheus/snmp_exporter'
       - name: Lint
-        uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
           args: --verbose
-          version: v1.63.4
+          version: v2.0.2

.golangci.yml

@@ -1,77 +1,89 @@
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/prometheus/test-infra
 issues:
-  exclude-files:
-    # Skip autogenerated files.
-    - ^.*\.(pb|y)\.go$
   max-issues-per-linter: 0
   max-same-issues: 0
-
 linters:
   enable:
     - errorlint
-    - gofumpt
-    - goimports
     - gomodguard
     - misspell
     - revive
     - whitespace
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/prometheus/test-infra
-  gomodguard:
-    blocked:
-      modules:
-        - github.com/pkg/errors:
-            recommendations:
-              - errors
-              - fmt
-  revive:
-    rules:
-      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
-      - name: blank-imports
-        disabled: true
-      - name: comment-spacings
-      - name: context-as-argument
-        arguments:
-          # Allow functions with test or bench signatures.
-          - allowTypesBefore: "*testing.T,testing.TB"
-      - name: context-keys-type
-      - name: dot-imports
-      - name: early-return
-        arguments:
-          - "preserveScope"
-      # A lot of false positives: incorrectly identifies channel draining as "empty code block".
-      # See https://github.com/mgechev/revive/issues/386
-      - name: empty-block
-        disabled: true
-      - name: error-naming
-      - name: error-return
-      - name: error-strings
-      - name: errorf
-      - name: exported
-      - name: increment-decrement
-      - name: indent-error-flow
-        arguments:
-          - "preserveScope"
-      - name: package-comments
-        # TODO(beorn7): Currently, we have a lot of missing package doc comments. Maybe we should have them.
-        disabled: true
-      - name: range
-      - name: receiver-naming
-      - name: redefines-builtin-id
-      - name: superfluous-else
-        arguments:
-          - "preserveScope"
-      - name: time-naming
-      - name: unexported-return
-      - name: unreachable-code
-      - name: unused-parameter
-      - name: var-declaration
-      - name: var-naming
-        disabled: true
-
-output:
-  sort-results: true
-
+  exclusions:
+    generated: strict
+    paths:
+      # Skip autogenerated files.
+      - ^.*\.(pb|y)\.go$
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    warn-unused: true
+  settings:
+    gomodguard:
+      blocked:
+        modules:
+          - github.com/pkg/errors:
+              recommendations:
+                - errors
+                - fmt
+    revive:
+      rules:
+        # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
+        - name: blank-imports
+          disabled: true
+        - name: comment-spacings
+        - name: context-as-argument
+          arguments:
+            # Allow functions with test or bench signatures.
+            - allowTypesBefore: '*testing.T,testing.TB'
+        - name: context-keys-type
+        - name: dot-imports
+        - name: early-return
+          arguments:
+            - preserveScope
+        # A lot of false positives: incorrectly identifies channel draining as "empty code block".
+        # See https://github.com/mgechev/revive/issues/386
+        - name: empty-block
+          disabled: true
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: errorf
+        - name: exported
+        - name: increment-decrement
+        - name: indent-error-flow
+          arguments:
+            - preserveScope
+        - name: package-comments
+          # TODO(beorn7): Currently, we have a lot of missing package doc comments. Maybe we should have them.
+          disabled: true
+        - name: range
+        - name: receiver-naming
+        - name: redefines-builtin-id
+        - name: superfluous-else
+          arguments:
+            - preserveScope
+        - name: time-naming
+        - name: unexported-return
+        - name: unreachable-code
+        - name: unused-parameter
+        - name: var-declaration
+        - name: var-naming
+          disabled: true
+    staticcheck:
+      checks:
+        - all
+        - -ST1003 # FIXME: Poorly chosen identifier
+        - -ST1005 # FIXME: Incorrectly formatted error string
 run:
   timeout: 5m
+version: "2"

Makefile.common

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.63.4
+GOLANGCI_LINT_VERSION ?= v2.0.2
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

pkg/provider/provider.go

@@ -84,7 +84,7 @@ func applyTemplateVars(content []byte, deploymentVars map[string]string) ([]byte
 	t = t.Funcs(template.FuncMap{
 		// k8s objects can't have dots(.) se we add a custom function to allow normalising the variable values.
 		"normalise": func(t string) string {
-			return strings.Replace(t, ".", "-", -1)
+			return strings.ReplaceAll(t, ".", "-")
 		},
 		"split": func(rangeVars, separator string) []string {
 			return strings.Split(rangeVars, separator)

prombench/manifests/cert-manager/1b_certificate.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: default
 spec:
   dnsNames:
-    - prombench.prometheus.io 
+    - prombench.prometheus.io
   secretName: prombench-prometheus-tls
   issuerRef:
     name: letsencrypt-cluster-issuer

prombench/manifests/cluster-infra/3b_prometheus-meta.yaml

@@ -266,7 +266,7 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-      - prombench.prometheus.io
+    - prombench.prometheus.io
     secretName: prombench-prometheus-tls
   rules:
   - http: