migrate golangci-lint config to v2 format (#3354)

ofekshenawa · ndyakov · commit 09dc3510a2c7 · 2025-04-30T13:37:42.000+03:00
* migrate golangci-lint config to v2 format

* chore: skip CI on migration [skip ci]

* Bump golangci version

* Address several golangci-lint/staticcheck warnings

* change staticchecks settings
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6.5.2
+        uses: golangci/golangci-lint-action@v7.0.0
         with:
-          verify: false # disable verifying the configuration since golangci is currently introducing breaking changes in the configuration 
+          verify: true 
 
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,3 +1,34 @@
+version: "2"
 run:
   timeout: 5m
   tests: false
+linters:
+  settings:
+    staticcheck:
+      checks:
+        - all
+        # Incorrect or missing package comment.
+        # https://staticcheck.dev/docs/checks/#ST1000
+        - -ST1000
+        # Omit embedded fields from selector expression.
+        # https://staticcheck.dev/docs/checks/#QF1008
+        - -QF1008
+        - -ST1003
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/command.go b/command.go
@@ -1412,7 +1412,8 @@ func (cmd *MapStringSliceInterfaceCmd) readReply(rd *proto.Reader) (err error) {
 
 	cmd.val = make(map[string][]interface{})
 
-	if readType == proto.RespMap {
+	switch readType {
+	case proto.RespMap:
 		n, err := rd.ReadMapLen()
 		if err != nil {
 			return err
@@ -1435,7 +1436,7 @@ func (cmd *MapStringSliceInterfaceCmd) readReply(rd *proto.Reader) (err error) {
 				cmd.val[k][j] = value
 			}
 		}
-	} else if readType == proto.RespArray {
+	case proto.RespArray:
 		// RESP2 response
 		n, err := rd.ReadArrayLen()
 		if err != nil {
diff --git a/extra/rediscensus/go.mod b/extra/rediscensus/go.mod
@@ -19,6 +19,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )
diff --git a/extra/rediscmd/go.mod b/extra/rediscmd/go.mod
@@ -16,6 +16,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )
diff --git a/extra/redisotel/go.mod b/extra/redisotel/go.mod
@@ -24,6 +24,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )
diff --git a/extra/redisprometheus/go.mod b/extra/redisprometheus/go.mod
@@ -23,6 +23,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )
diff --git a/options.go b/options.go
@@ -214,9 +214,10 @@ func (opt *Options) init() {
 		opt.ConnMaxIdleTime = 30 * time.Minute
 	}
 
-	if opt.MaxRetries == -1 {
+	switch opt.MaxRetries {
+	case -1:
 		opt.MaxRetries = 0
-	} else if opt.MaxRetries == 0 {
+	case 0:
 		opt.MaxRetries = 3
 	}
 	switch opt.MinRetryBackoff {
diff --git a/osscluster.go b/osscluster.go
@@ -111,9 +111,10 @@ type ClusterOptions struct {
 }
 
 func (opt *ClusterOptions) init() {
-	if opt.MaxRedirects == -1 {
+	switch opt.MaxRedirects {
+	case -1:
 		opt.MaxRedirects = 0
-	} else if opt.MaxRedirects == 0 {
+	case 0:
 		opt.MaxRedirects = 3
 	}
 
diff --git a/ring.go b/ring.go
@@ -128,9 +128,10 @@ func (opt *RingOptions) init() {
 		opt.NewConsistentHash = newRendezvous
 	}
 
-	if opt.MaxRetries == -1 {
+	switch opt.MaxRetries {
+	case -1:
 		opt.MaxRetries = 0
-	} else if opt.MaxRetries == 0 {
+	case 0:
 		opt.MaxRetries = 3
 	}
 	switch opt.MinRetryBackoff {
diff --git a/sentinel_test.go b/sentinel_test.go
@@ -41,7 +41,7 @@ var _ = Describe("Sentinel resolution", func() {
 		client := redis.NewFailoverClient(&redis.FailoverOptions{
 			MasterName:    sentinelName,
 			SentinelAddrs: sentinelAddrs,
-			MaxRetries: -1,
+			MaxRetries:    -1,
 		})
 
 		err := client.Ping(shortCtx).Err()
diff --git a/universal.go b/universal.go
@@ -259,13 +259,13 @@ var (
 // NewUniversalClient returns a new multi client. The type of the returned client depends
 // on the following conditions:
 //
-// 1. If the MasterName option is specified with RouteByLatency, RouteRandomly or IsClusterMode,
-//    a FailoverClusterClient is returned.
-// 2. If the MasterName option is specified without RouteByLatency, RouteRandomly or IsClusterMode,
-//    a sentinel-backed FailoverClient is returned.
-// 3. If the number of Addrs is two or more, or IsClusterMode option is specified,
-//    a ClusterClient is returned.
-// 4. Otherwise, a single-node Client is returned.
+//  1. If the MasterName option is specified with RouteByLatency, RouteRandomly or IsClusterMode,
+//     a FailoverClusterClient is returned.
+//  2. If the MasterName option is specified without RouteByLatency, RouteRandomly or IsClusterMode,
+//     a sentinel-backed FailoverClient is returned.
+//  3. If the number of Addrs is two or more, or IsClusterMode option is specified,
+//     a ClusterClient is returned.
+//  4. Otherwise, a single-node Client is returned.
 func NewUniversalClient(opts *UniversalOptions) UniversalClient {
 	switch {
 	case opts.MasterName != "" && (opts.RouteByLatency || opts.RouteRandomly || opts.IsClusterMode):

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ require (`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`retract (`
`22`		`- v9.5.3 // This version was accidentally released.`
`23`	`22`	`v9.7.2 // This version was accidentally released.`
	`23`	`+ v9.5.3 // This version was accidentally released.`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ require (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`retract (`
`19`		`- v9.5.3 // This version was accidentally released.`
`20`	`19`	`v9.7.2 // This version was accidentally released.`
	`20`	`+ v9.5.3 // This version was accidentally released.`
`21`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ require (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`retract (`
`27`		`- v9.5.3 // This version was accidentally released.`
`28`	`27`	`v9.7.2 // This version was accidentally released.`
	`28`	`+ v9.5.3 // This version was accidentally released.`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ require (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`retract (`
`26`		`- v9.5.3 // This version was accidentally released.`
`27`	`26`	`v9.7.2 // This version was accidentally released.`
	`27`	`+ v9.5.3 // This version was accidentally released.`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -214,9 +214,10 @@ func (opt *Options) init() {`
`214`	`214`	`opt.ConnMaxIdleTime = 30 * time.Minute`
`215`	`215`	`}`
`216`	`216`
`217`		`- if opt.MaxRetries == -1 {`
	`217`	`+ switch opt.MaxRetries {`
	`218`	`+ case -1:`
`218`	`219`	`opt.MaxRetries = 0`
`219`		`- } else if opt.MaxRetries == 0 {`
	`220`	`+ case 0:`
`220`	`221`	`opt.MaxRetries = 3`
`221`	`222`	`}`
`222`	`223`	`switch opt.MinRetryBackoff {`
Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,10 @@ type ClusterOptions struct {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func (opt *ClusterOptions) init() {`
`114`		`- if opt.MaxRedirects == -1 {`
	`114`	`+ switch opt.MaxRedirects {`
	`115`	`+ case -1:`
`115`	`116`	`opt.MaxRedirects = 0`
`116`		`- } else if opt.MaxRedirects == 0 {`
	`117`	`+ case 0:`
`117`	`118`	`opt.MaxRedirects = 3`
`118`	`119`	`}`
`119`	`120`
Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,10 @@ func (opt *RingOptions) init() {`
`128`	`128`	`opt.NewConsistentHash = newRendezvous`
`129`	`129`	`}`
`130`	`130`
`131`		`- if opt.MaxRetries == -1 {`
	`131`	`+ switch opt.MaxRetries {`
	`132`	`+ case -1:`
`132`	`133`	`opt.MaxRetries = 0`
`133`		`- } else if opt.MaxRetries == 0 {`
	`134`	`+ case 0:`
`134`	`135`	`opt.MaxRetries = 3`
`135`	`136`	`}`
`136`	`137`	`switch opt.MinRetryBackoff {`