change staticchecks settings

Author: ofekshenawa

.golangci.yml

@@ -3,6 +3,17 @@ 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:

json.go

@@ -113,7 +113,7 @@ func (cmd *JSONCmd) Expanded() (interface{}, error) {
 
 func (cmd *JSONCmd) readReply(rd *proto.Reader) error {
 	// nil response from JSON.(M)GET (cmd.baseCmd.err will be "redis: nil")
-	if cmd.Err() == Nil {
+	if cmd.baseCmd.Err() == Nil {
 		cmd.val = ""
 		return Nil
 	}
@@ -182,7 +182,7 @@ func (cmd *JSONSliceCmd) Result() ([]interface{}, error) {
 }
 
 func (cmd *JSONSliceCmd) readReply(rd *proto.Reader) error {
-	if cmd.Err() == Nil {
+	if cmd.baseCmd.Err() == Nil {
 		cmd.val = nil
 		return Nil
 	}

redis.go

@@ -677,16 +677,16 @@ func NewClient(opt *Options) *Client {
 func (c *Client) init() {
 	c.cmdable = c.Process
 	c.initHooks(hooks{
-		dial:       c.dial,
-		process:    c.process,
-		pipeline:   c.processPipeline,
-		txPipeline: c.processTxPipeline,
+		dial:       c.baseClient.dial,
+		process:    c.baseClient.process,
+		pipeline:   c.baseClient.processPipeline,
+		txPipeline: c.baseClient.processTxPipeline,
 	})
 }
 
 func (c *Client) WithTimeout(timeout time.Duration) *Client {
 	clone := *c
-	clone.baseClient = c.withTimeout(timeout)
+	clone.baseClient = c.baseClient.withTimeout(timeout)
 	clone.init()
 	return &clone
 }
@@ -839,10 +839,10 @@ func newConn(opt *Options, connPool pool.Pooler) *Conn {
 	c.cmdable = c.Process
 	c.statefulCmdable = c.Process
 	c.initHooks(hooks{
-		dial:       c.dial,
-		process:    c.process,
-		pipeline:   c.processPipeline,
-		txPipeline: c.processTxPipeline,
+		dial:       c.baseClient.dial,
+		process:    c.baseClient.process,
+		pipeline:   c.baseClient.processPipeline,
+		txPipeline: c.baseClient.processTxPipeline,
 	})
 
 	return &c

sentinel.go

@@ -321,8 +321,8 @@ func NewSentinelClient(opt *Options) *SentinelClient {
 	}
 
 	c.initHooks(hooks{
-		dial:    c.dial,
-		process: c.process,
+		dial:    c.baseClient.dial,
+		process: c.baseClient.process,
 	})
 	c.connPool = newConnPool(opt, c.dialHook)
 

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()

tx.go

@@ -39,10 +39,10 @@ func (c *Tx) init() {
 	c.statefulCmdable = c.Process
 
 	c.initHooks(hooks{
-		dial:       c.dial,
-		process:    c.process,
-		pipeline:   c.processPipeline,
-		txPipeline: c.processTxPipeline,
+		dial:       c.baseClient.dial,
+		process:    c.baseClient.process,
+		pipeline:   c.baseClient.processPipeline,
+		txPipeline: c.baseClient.processTxPipeline,
 	})
 }
 

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):