Merge pull request #98 from Icinga/dependabot/github_actions/golangci/golangci-lint-action-7

Bump golangci/golangci-lint-action from 6 to 7

Author: RincewindsHat

.github/workflows/golangci-lint.yml

@@ -15,9 +15,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64.6
+          version: v2.0.2
 
       - name: Go mod tidy
         run: |

.golangci.yml

@@ -1,29 +1,58 @@
-run:
-  timeout: 5m
-
-issues:
-  exclude-files:
-  - '(.+)_test\.go'
-  - 'internal/config/http_config.go'
-  - 'internal/config/config.go'
+version: "2"
 linters:
-  disable-all: false
   enable:
+    - asasalint
+    - asciicheck
+    - bidichk
     - dogsled
     - dupl
+    - durationcheck
+    - errchkjson
+    - errorlint
+    - exhaustive
+    - gocheckcompilerdirectives
+    - gochecksumtype
+    - gosec
+    - gosmopolitan
+    - loggercheck
+    - makezero
+    - nilnesserr
+    - protogetter
+    - reassign
+    - recvcheck
+    - spancheck
+    - testifylint
     - whitespace
     - wsl
+    - zerologlint
   disable:
-    - funlen
     - bodyclose
     - contextcheck
+    - funlen
+    - musttag
     - nilerr
     - noctx
     - rowserrcheck
     - sqlclosecheck
     - unparam
-    - musttag
-  presets:
-    - bugs
-    - unused
-  fast: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - (.+)_test\.go
+      - internal/config/http_config.go
+      - internal/config/config.go
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

check.go

@@ -183,7 +183,7 @@ func (c *Config) BuildCommand() (cmd string) {
 	return
 }
 
-func (c *Config) Run(timeout time.Duration) (err error, rc int, output string) {
+func (c *Config) Run(timeout time.Duration) (rc int, output string, err error) {
 	if !c.validated {
 		panic("you need to call Validate() before Run()")
 	}

check_test.go

@@ -59,7 +59,7 @@ func TestConfig_Run_WithError(t *testing.T) {
 	err := c.Validate()
 	assert.NoError(t, err)
 
-	err, _, _ = c.Run(1 * time.Second)
+	_, _, err = c.Run(1 * time.Second)
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "dial tcp 192.0.2.11:")
 }
@@ -145,7 +145,7 @@ func runCheck(t *testing.T, c *Config) {
 	err := c.Validate()
 	assert.NoError(t, err)
 
-	err, rc, output := c.Run(DefaultTimeout)
+	rc, output, err := c.Run(DefaultTimeout)
 	assert.NoError(t, err)
 	assert.Equal(t, 0, rc)
 	assert.Contains(t, output, "ConsoleHost")

main.go

@@ -60,7 +60,7 @@ func main() {
 		check.ExitRaw(check.Unknown, "could not validate parameters: "+err.Error())
 	}
 
-	err, rc, output := config.Run(time.Duration(plugin.Timeout) * time.Second)
+	rc, output, err := config.Run(time.Duration(plugin.Timeout) * time.Second)
 	if err != nil {
 		check.ExitRaw(check.Unknown, "execution failed: "+err.Error())
 	}