Bump golangci-lint (#171)

Author: secwall

.github/workflows/golangci-lint.yml

@@ -16,9 +16,9 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22.4
+          go-version: 1.24.1
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: latest
+          version: v2.0

.golangci.yml

@@ -1,81 +1,87 @@
-# This file contains all available configuration options
-# with their default values.
-
-# all available settings of specific linters
-linters-settings:
-  dupl:
-    threshold: 400
-  funlen:
-    lines: 150
-    statements: 100
-  gocritic:
-    enabled-tags:
-      - performance
-    disabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - style
-  gocyclo:
-    min-complexity: 25
-  misspell:
-    locale: US
-  lll:
-    line-length: 140
-  revive:
-    rules:
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-    # - name: increment-decrement
-      - name: error-return
-      - name: error-naming
-      - name: exported
-      - name: var-naming
-      - name: var-declaration
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: time-naming
-      - name: unexported-return
-    # - name: indent-error-flow
-      - name: errorf
-      - name: empty-block
-      - name: unreachable-code
-      - name: redefines-builtin-id
-
+version: "2"
+run:
+  go: "1.22"
+  modules-download-mode: mod
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
+    - copyloopvar
     - dupl
     - errcheck
-    - copyloopvar
     - funlen
     - gocritic
     - gocyclo
-    - gofmt
-    - goimports
     - govet
     - ineffassign
     - misspell
     - nakedret
     - revive
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-  # - lll
-    - stylecheck
-    - gosimple
     - whitespace
-
-run:
-  go: "1.22"
-  timeout: 5m
-  modules-download-mode: mod
-
+  settings:
+    dupl:
+      threshold: 400
+    funlen:
+      lines: 150
+      statements: 100
+    gocritic:
+      enabled-tags:
+        - performance
+      disabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - style
+    gocyclo:
+      min-complexity: 25
+    lll:
+      line-length: 140
+    misspell:
+      locale: US
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: error-return
+        - name: error-naming
+        - name: exported
+        - name: var-naming
+        - name: var-declaration
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: errorf
+        - name: empty-block
+        - name: unreachable-code
+        - name: redefines-builtin-id
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 severity:
-  default-severity: error
+  default: error
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -6,7 +6,7 @@ format:
 	goimports -w `find . -name '*.go'`
 
 lint:
-	docker run --rm -v ${CURDIR}:/app -w /app golangci/golangci-lint:v1.60 golangci-lint run -v 
+	docker run --rm -v ${CURDIR}:/app -w /app golangci/golangci-lint:v2.0-alpine golangci-lint run -v 
 
 unittests:
 	go test ./cmd/... ./internal/...

internal/app/app.go

@@ -518,7 +518,7 @@ func (app *App) stateLost() appState {
 		err = node.SetReadOnlyWithForce(app.config.ExcludeUsers, true)
 
 		merr, ok := err.(*mysql_driver.MySQLError)
-		if !(errors.Is(err, context.DeadlineExceeded) || ok && merr.Number == 1205) { // Error 1205: Lock wait timeout exceeded; try restarting transaction
+		if !errors.Is(err, context.DeadlineExceeded) && (!ok || merr.Number != 1205) { // Error 1205: Lock wait timeout exceeded; try restarting transaction
 			app.logger.Errorf("failed to set node %s read-only: %v", node.Host(), err)
 			return stateLost
 		}
@@ -875,10 +875,7 @@ func (app *App) approveFailover(clusterState, clusterStateDcs map[string]*NodeSt
 	if !app.config.Failover {
 		return fmt.Errorf("auto_failover is disabled in config")
 	}
-	afterCrashRecovery := false
-	if clusterStateDcs[master].DaemonState != nil && clusterStateDcs[master].DaemonState.CrashRecovery && app.config.ResetupCrashedHosts {
-		afterCrashRecovery = true
-	}
+	afterCrashRecovery := clusterStateDcs[master].DaemonState != nil && clusterStateDcs[master].DaemonState.CrashRecovery && app.config.ResetupCrashedHosts
 	if afterCrashRecovery {
 		app.logger.Infof("approve failover: after crash recovery, skip replication and delay checks")
 	} else if clusterStateDcs[master].IsFileSystemReadonly {
@@ -1976,7 +1973,7 @@ func (app *App) repairCascadeNode(node *mysql.Node, clusterState map[string]*Nod
 		return
 	}
 
-	if !isReplicationRunning && (upstreamLostAt == time.Time{}) {
+	if !isReplicationRunning && upstreamLostAt.IsZero() {
 		app.logger.Warnf("repair: replication from stream_from host `%s` stopped. Schedule switch to new stream_from", upstreamMaster)
 		upstreamLostAt = time.Now()
 		app.streamFromFailedAt[host] = upstreamLostAt

internal/app/cli.go

@@ -468,13 +468,14 @@ func (app *App) CliGetMaintenance() int {
 	app.dcs.Initialize()
 
 	err = app.dcs.Get(pathMaintenance, new(Maintenance))
-	if err == nil {
+	switch err {
+	case nil:
 		fmt.Println("on")
 		return 0
-	} else if err == dcs.ErrNotFound {
+	case dcs.ErrNotFound:
 		fmt.Println("off")
 		return 0
-	} else {
+	default:
 		app.logger.Error(err.Error())
 		return 1
 	}

tests/mysync_test.go

@@ -1412,7 +1412,7 @@ func InitializeScenario(s *godog.ScenarioContext) {
 	s.After(func(ctx context.Context, scenario *godog.Scenario, err error) (context.Context, error) {
 		if err != nil {
 			name := scenario.Name
-			name = strings.Replace(name, " ", "_", -1)
+			name = strings.ReplaceAll(name, " ", "_")
 			err2 := tctx.saveLogs(name)
 			if err2 != nil {
 				log.Printf("failed to save logs: %v", err2)