Migrate golangci-lint configuration from v1 to v2

Author: albertony

.golangci.yml

@@ -1,33 +1,31 @@
+version: "2"
+
 linters:
-  # Disable all defaults, then enable individual linters explicitely
-  disable-all: true
+  # Disable all linters by default, then enable individual linters explicitly.
+  default: none
   enable:
-    # Enable the ones that are by default
+    # Enable the ones that are by default.
     - errcheck
-    - gosimple
     - govet
     - ineffassign
     - staticcheck
     - unused
-    # Enable remaining linters required to match checks performed by stand-alone staticcheck tool (corresponds to: staticcheck, stylecheck, gosimple and unused)
-    - stylecheck
     # Add some additional linters
-    - goimports
-    - revive
-    - unconvert
     - misspell
     - prealloc
+    - revive
+    - unconvert
 
-issues:
-  # Enable some lints excluded by default
-  exclude-use-default: false
+formatters:
+  enable:
+    - goimports
 
+issues:
   # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
   max-issues-per-linter: 0
-
   # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
   max-same-issues: 0
 
 run:
-  # Timeout for analysis, e.g. 30s, 5m. Default is 1m.
-  timeout: 3m
+  # Timeout for total work, e.g. 30s, 5m, 5m30s. Default is 0 (disabled).
+  timeout: 3m

npiperelay.go

@@ -19,10 +19,10 @@ import (
 
 // How long to sleep between failures while polling
 const (
-	cSECURITY_SQOS_PRESENT = 0x100000               //nolint:revive,stylecheck // Don't include revive and stylecheck when running golangci-lint to stop complain about use of underscores in Go names
-	cSECURITY_ANONYMOUS    = 0                      //nolint:revive,stylecheck // Don't include revive and stylecheck when running golangci-lint to stop complain about use of underscores in Go names
-	cPOLL_TIMEOUT          = 200 * time.Millisecond //nolint:revive,stylecheck // Don't include revive and stylecheck when running golangci-lint to stop complain about use of underscores in Go names
-	cPOLL_ATTEMPTS         = 300                    //nolint:revive,stylecheck // Don't include revive and stylecheck when running golangci-lint to stop complain about use of underscores in Go names
+	cSECURITY_SQOS_PRESENT = 0x100000               //nolint:revive // Don't include revive when running golangci-lint to stop complain about use of underscores in Go names
+	cSECURITY_ANONYMOUS    = 0                      //nolint:revive // Don't include revive when running golangci-lint to stop complain about use of underscores in Go names
+	cPOLL_TIMEOUT          = 200 * time.Millisecond //nolint:revive // Don't include revive when running golangci-lint to stop complain about use of underscores in Go names
+	cPOLL_ATTEMPTS         = 300                    //nolint:revive // Don't include revive when running golangci-lint to stop complain about use of underscores in Go names
 )
 
 var (