ci: use golangci-lint v2

and use autofix

Signed-off-by: Pascal Bourdier <pascal.bourdier@gmail.com>

Author: PascalBourdier

.golangci.yml

@@ -1,38 +1,46 @@
-run:
-  timeout: 5m
+version: "2"
 linters:
   enable:
-    - nakedret
-    - misspell
-    - ineffassign
+    - dupl
     - ginkgolinter
     - goconst
-    - goimports
-    - errcheck
-    - dupl
-    - unparam
-    - revive
-    - staticcheck
-    - unused
-    - gosimple
-    - unconvert
     - gocyclo
     - gosec
-issues:
-  exclude-rules:
-    # Allow dot imports for ginkgo and gomega
-    - source: ginkgo|gomega
-      linters:
-      - revive
-      text: "should not use dot imports"
-
-    - linters:
-      - gosec
-      # these exclusion rules are for current failures in the code base for gosec which are
-      # excluded for future PRs which include:
-      # G110: Potential DoS vulnerability via decompression bomb
-      # G204: Audit use of command execution
-      # G306: Poor file permissions used when writing to a new file
-      # G404: Insecure random number source (rand)
-      # G601: Implicit memory aliasing of items from a range statement
-      text: "G110|G601|G404|G204|G306"
+    - misspell
+    - nakedret
+    - revive
+    - unconvert
+    - unparam
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - revive
+        text: should not use dot imports
+        source: ginkgo|gomega
+      - linters:
+          - gosec
+        text: G110|G601|G404|G204|G306
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+  settings:
+    revive:
+      rules:
+        - name: var-naming
+          disabled: true
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -61,7 +61,7 @@ fix: ## Fixup files in the repo.
 
 .PHONY: setup-lint
 setup-lint: ## Setup the lint
-	$(SCRIPTS_DIR)/fetch golangci-lint 1.64.8
+	$(SCRIPTS_DIR)/fetch golangci-lint 2.6.2
 
 .PHONY: lint
 lint: setup-lint ## Run the lint check

hack/generate/cli-doc/gen-cli-doc.go

@@ -82,7 +82,7 @@ func recreateDocDir(rootCmd *cobra.Command, docPath string) {
 	filePrepender := func(filename string) string {
 		name := filepath.Base(filename)
 		base := strings.TrimSuffix(name, path.Ext(name))
-		return fmt.Sprintf(fmTemplate, strings.Replace(base, "_", " ", -1))
+		return fmt.Sprintf(fmTemplate, strings.ReplaceAll(base, "_", " "))
 	}
 	linkHandler := func(name string) string {
 		base := strings.TrimSuffix(name, path.Ext(name))

hack/generate/samples/internal/go/memcached-with-customization/e2e_test_code.go

@@ -23,7 +23,7 @@ func (mh *Memcached) implementingE2ETests() {
 	testUtilsDir := filepath.Join(testDir, "utils")
 
 	// Following we will create the directories
-	// Create the golang files with a string replace inside onlu
+	// Create the golang files with a string replace inside only
 	// Then, replace the string replace by the template contents
 	mh.createDirs(testDir, testE2eDir, testUtilsDir)
 	mh.createGoFiles(testE2eDir, testUtilsDir)

internal/cmd/operator-sdk/generate/bundle/bundle.go

@@ -134,7 +134,7 @@ func (c bundleCmd) validateManifests() (err error) {
 	isInputDir := c.inputDir != ""
 	isLegacyDirs := c.deployDir != "" || c.crdsDir != ""
 	switch {
-	case !(isPipeReader || isInputDir || isLegacyDirs):
+	case !isPipeReader && !isInputDir && !isLegacyDirs:
 		return errors.New("one of stdin, --input-dir, or --deploy-dir (and optionally --crds-dir) must be set")
 	case isPipeReader && (isInputDir || isLegacyDirs):
 		return errors.New("none of --input-dir, --deploy-dir, or --crds-dir may be set if reading from stdin")

internal/cmd/operator-sdk/generate/bundle/cmd.go

@@ -147,7 +147,7 @@ func (c *bundleCmd) addFlagsTo(fs *pflag.FlagSet) {
 }
 
 func (c bundleCmd) println(a ...interface{}) {
-	if !(c.quiet || c.stdout) {
+	if !c.quiet && !c.stdout {
 		fmt.Println(a...)
 	}
 }

internal/cmd/operator-sdk/generate/internal/relatedimages.go

@@ -147,5 +147,5 @@ func (c *relatedImageCollector) collectedRelatedImages() []operatorsv1alpha1.Rel
 
 // formatName transforms RELATED_IMAGE_This_IS_a_cool_image to this-is-a-cool-image
 func (c *relatedImageCollector) formatName(name string) string {
-	return strings.ToLower(strings.Replace(strings.TrimPrefix(name, relatedImagePrefix), "_", "-", -1))
+	return strings.ToLower(strings.ReplaceAll(strings.TrimPrefix(name, relatedImagePrefix), "_", "-"))
 }

internal/cmd/operator-sdk/generate/packagemanifests/cmd.go

@@ -112,7 +112,7 @@ func (c *packagemanifestsCmd) addFlagsTo(fs *pflag.FlagSet) {
 }
 
 func (c packagemanifestsCmd) println(a ...interface{}) {
-	if !(c.quiet || c.stdout) {
+	if !c.quiet && !c.stdout {
 		fmt.Println(a...)
 	}
 }

internal/cmd/operator-sdk/pkgmantobundle/pkgmantobundle_test.go

@@ -33,7 +33,7 @@ var _ = Describe("Running pkgmanToBundle command", func() {
 	var (
 		p         pkgManToBundleCmd
 		pkgManDir string
-		outputDir string = "bundle-output"
+		outputDir = "bundle-output"
 	)
 
 	BeforeEach(func() {

internal/cmd/operator-sdk/scorecard/cmd.go

@@ -194,9 +194,10 @@ func (c *scorecardCmd) run() (err error) {
 	}
 
 	podSecFlag := true
-	if c.podSecurity == "restricted" {
+	switch c.podSecurity {
+	case "restricted":
 		podSecFlag = true
-	} else if c.podSecurity == "legacy" {
+	case "legacy":
 		podSecFlag = false
 	}