Merge pull request #25726 from kolyshkin/golangci-v2

Golangci v2

Author: openshift-merge-bot[bot]

.codespellrc

@@ -3,4 +3,4 @@
 skip = bin,vendor,.git,go.sum,.cirrus.yml,"*.fish,RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go
 check-hidden = true
 ignore-regex = \b(Not|assert)In\b
-ignore-words-list = ddress,secon,passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif,whit
+ignore-words-list = ddress,secon,passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif,whit,decorder

.golangci.yml

@@ -1,95 +1,82 @@
----
+version: "2"
 run:
-  concurrency: 6
-  timeout: 5m
   modules-download-mode: readonly
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: strict
+
 linters:
-  enable-all: true
-  disable:
-    # too many reports but requires attention
-    - depguard
-    - intrange # should be turned on but we have to convert each place manually as there is no auto fix function
-    - tagalign
-    - perfsprint
-    - typecheck
-    # useful hints that should be addressed
-    - testifylint # all of reports that should be fixed
-    - nakedret
-    - gosmopolitan # usage of time.Local in pkg/k8s.io
-    - tagliatelle # too many JSON keys cannot be changed due to compat
-    - dupword # too many false positives (e.g., in tests)
-    - gocognit
-    - testpackage
-    - err113
-    - errorlint
-    - wrapcheck
-    - paralleltest
-    - wsl
-    - godox
-    - tparallel
-    - nlreturn
-    - noctx
-    - nestif
-    - predeclared
-    - thelper
-    - forbidigo
-    - exhaustive
-    - gofumpt
-    - gci
-    - godot
-    - dupl
-    - funlen
-    - gochecknoglobals
-    - gochecknoinits
-    - goconst
-    - gocyclo
-    - lll
-    - gosec
-    - musttag # way to many warnings to fix for now, also some false positives
-    - mnd # way to many false positives
-    - gomoddirectives
-    - containedctx
-    - contextcheck
-    - cyclop
-    - canonicalheader # our current header values are fixed and should not be changed
-    - errname
-    - forcetypeassert
-    - ireturn
-    - varnamelen
-    - maintidx
-    - nilnil
-    - nonamedreturns
-    - exhaustruct
-    # deprecated linters
-    - tenv
-linters-settings:
-  errcheck:
-    check-blank: false
-  nolintlint:
-    allow-unused: true
-    require-specific: true
-  revive:
+  enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - copyloopvar
+    - decorder
+    - dogsled
+    - durationcheck
+    - errchkjson
+    - exptostd
+    - fatcontext
+    - ginkgolinter
+    - gocheckcompilerdirectives
+    - gochecksumtype
+    - gocritic
+    - goprintffuncname
+    - grouper
+    - iface
+    - inamedparam
+    - interfacebloat
+    - makezero
+    - mirror
+    - misspell
+    - nilerr
+    - nilnesserr
+    - nolintlint
+    - nosprintfhostport
+    - prealloc
+    - protogetter
+    - reassign
+    - recvcheck
+    - revive
+    - rowserrcheck
+    - sqlclosecheck
+    - staticcheck
+    - testableexamples
+    - unconvert
+    - unparam
+    - usestdlibvars
+    - usetesting
+    - wastedassign
+    - whitespace
+  settings:
+    staticcheck:
+      checks:
+        - all
+        - -ST1003 # https://staticcheck.dev/docs/checks/#ST1003 Poorly chosen identifier.
+        - -QF1008 # https://staticcheck.dev/docs/checks/#QF1008 Omit embedded fields from selector expression.
+    nolintlint:
+      require-specific: true
+    revive:
+      rules:
+        - name: unused-parameter
+          disabled: true
+  exclusions:
+    generated: strict
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-    - name: unused-parameter
-      disabled: true
+      - linters:
+          - recvcheck
+        path: pkg/k8s.io/
 
 issues:
-  # Maximum issues count per one linter.
-  # Set to 0 to disable.
-  # Default: 50
   max-issues-per-linter: 0
-  # Maximum count of issues with the same text.
-  # Set to 0 to disable.
-  # Default: 3
   max-same-issues: 0
-  exclude-dirs-use-default: true
-  exclude-dirs:
-    - contrib
-    - dependencies
-  exclude-files:
-    - swagger.go
-  exclude-rules:
-    # Exclude recvcheck from running on the imported k8s files, to much failures
-    - path: pkg/k8s.io/
-      linters:
-        - recvcheck

Makefile

@@ -61,7 +61,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
 # N/B: This value is managed by Renovate, manual changes are
 # possible, as long as they don't disturb the formatting
 # (i.e. DO NOT ADD A 'v' prefix!)
-GOLANGCI_LINT_VERSION := 1.64.4
+GOLANGCI_LINT_VERSION := 2.0.2
 PYTHON ?= $(shell command -v python3 python|head -n1)
 PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
 # ~/.local/bin is not in PATH on all systems
@@ -282,7 +282,7 @@ endif
 
 .PHONY: golangci-lint
 golangci-lint: .install.golangci-lint
-	hack/golangci-lint.sh run
+	hack/golangci-lint.sh
 
 .PHONY: test/checkseccomp/checkseccomp
 test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go)

cmd/podman-wslkerninst/main.go

@@ -16,12 +16,9 @@ import (
 )
 
 const (
-	//nolint:stylecheck
 	MB_ICONWARNING = 0x00000030
-	//nolint:stylecheck
-	MB_OK = 0x00000000
-	//nolint:stylecheck
-	MB_DEFBUTTON1 = 0x00000000
+	MB_OK          = 0x00000000
+	MB_DEFBUTTON1  = 0x00000000
 )
 
 const KernelWarning = "WSL Kernel installation did not complete successfully. " +

cmd/podman/containers/stats.go

@@ -252,10 +252,10 @@ func combineBytesValues(a, b uint64) string {
 
 func outputJSON(stats []containerStats) error {
 	type jstat struct {
-		Id         string `json:"id"` //nolint:revive,stylecheck
+		Id         string `json:"id"`
 		Name       string `json:"name"`
 		CPUTime    string `json:"cpu_time"`
-		CpuPercent string `json:"cpu_percent"` //nolint:revive,stylecheck
+		CpuPercent string `json:"cpu_percent"`
 		AverageCPU string `json:"avg_cpu"`
 		MemUsage   string `json:"mem_usage"`
 		MemPerc    string `json:"mem_percent"`

cmd/podman/images/search.go

@@ -164,7 +164,7 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 	isJSON := report.IsJSON(searchOptions.Format)
 	for i, element := range searchReport {
 		d := strings.ReplaceAll(element.Description, "\n", " ")
-		if len(d) > 44 && !(searchOptions.NoTrunc || isJSON) {
+		if len(d) > 44 && (!searchOptions.NoTrunc && !isJSON) {
 			d = strings.TrimSpace(d[:44]) + "..."
 		}
 		searchReport[i].Description = d

cmd/podman/pods/ps.go

@@ -221,7 +221,7 @@ func (l ListPodReporter) ID() string {
 }
 
 // Id returns the Pod id
-func (l ListPodReporter) Id() string { //nolint:revive,stylecheck
+func (l ListPodReporter) Id() string {
 	if noTrunc {
 		return l.ListPodsReport.Id
 	}
@@ -235,7 +235,7 @@ func (l ListPodReporter) InfraID() string {
 
 // InfraId returns the infra container id for the pod
 // depending on trunc
-func (l ListPodReporter) InfraId() string { //nolint:revive,stylecheck
+func (l ListPodReporter) InfraId() string {
 	if len(l.ListPodsReport.InfraId) == 0 {
 		return ""
 	}

cmd/podman/system/migrate.go

@@ -58,7 +58,6 @@ func migrate(cmd *cobra.Command, args []string) {
 
 		// FIXME change this to return the error like other commands
 		// defer will never run on os.Exit()
-		//nolint:gocritic
 		os.Exit(define.ExecErrorCodeGeneric)
 	}
 	os.Exit(0)

cmd/podman/system/renumber.go

@@ -38,12 +38,12 @@ func init() {
 		Parent:  systemCmd,
 	})
 }
+
 func renumber(cmd *cobra.Command, args []string) {
 	if err := registry.ContainerEngine().Renumber(registry.Context()); err != nil {
 		fmt.Println(err)
 		// FIXME change this to return the error like other commands
 		// defer will never run on os.Exit()
-		//nolint:gocritic
 		os.Exit(define.ExecErrorCodeGeneric)
 	}
 	os.Exit(0)

cmd/rootlessport/wsl.go

@@ -1,3 +1,5 @@
+//go:build linux
+
 package main
 
 import (