Merge branch 'master' into norm-credential-provider

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -25,9 +25,9 @@ runs:
         
         # Mapping of redis version to redis testing containers
         declare -A redis_version_mapping=(
-          ["8.0.1"]="8.0.1-pre"
-          ["7.4.2"]="rs-7.4.0-v2"
-          ["7.2.7"]="rs-7.2.0-v14"
+          ["8.0.x"]="8.0.2"
+          ["7.4.x"]="rs-7.4.0-v5"
+          ["7.2.x"]="rs-7.2.0-v17"
         )
         
         if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then

.github/workflows/build.yml

@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         redis-version:
-          - "8.0.1" # 8.0.1
-          - "7.4.2" # should use redis stack 7.4
+          - "8.0.x" # Redis CE 8.0
+          - "7.4.x" # Redis stack 7.4
         go-version:
           - "1.23.x"
           - "1.24.x"
@@ -43,8 +43,8 @@ jobs:
           
           # Mapping of redis version to redis testing containers
           declare -A redis_version_mapping=(
-            ["8.0.1"]="8.0.1-pre"
-            ["7.4.2"]="rs-7.4.0-v2"
+            ["8.0.x"]="8.0.2"
+            ["7.4.x"]="rs-7.4.0-v5"
           )
           if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
             echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
@@ -72,9 +72,9 @@ jobs:
         fail-fast: false
         matrix:
           redis-version:
-            - "8.0.1" # 8.0.1
-            - "7.4.2" # should use redis stack 7.4
-            - "7.2.7" # should redis stack 7.2
+            - "8.0.x" # Redis CE 8.0
+            - "7.4.x" # Redis stack 7.4
+            - "7.2.x" # Redis stack 7.2
           go-version:
             - "1.23.x"
             - "1.24.x"

.github/workflows/doctests.yaml

@@ -16,7 +16,7 @@ jobs:
 
     services:
       redis-stack:
-        image: redislabs/client-libs-test:8.0.1-pre
+        image: redislabs/client-libs-test:8.0.2
         env:
           TLS_ENABLED: no
           REDIS_CLUSTER: no

auth/auth_test.go

@@ -2,6 +2,7 @@ package auth
 
 import (
 	"errors"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -179,36 +180,90 @@ func TestStreamingCredentialsProvider(t *testing.T) {
 }
 
 func TestBasicCredentials(t *testing.T) {
-	t.Run("basic auth", func(t *testing.T) {
-		creds := NewBasicCredentials("user1", "pass1")
-		username, password := creds.BasicAuth()
-		if username != "user1" {
-			t.Fatalf("expected username 'user1', got '%s'", username)
-		}
-		if password != "pass1" {
-			t.Fatalf("expected password 'pass1', got '%s'", password)
-		}
-	})
-
-	t.Run("raw credentials", func(t *testing.T) {
-		creds := NewBasicCredentials("user1", "pass1")
-		raw := creds.RawCredentials()
-		expected := "user1:pass1"
-		if raw != expected {
-			t.Fatalf("expected raw credentials '%s', got '%s'", expected, raw)
-		}
-	})
+	tests := []struct {
+		name         string
+		username     string
+		password     string
+		expectedUser string
+		expectedPass string
+		expectedRaw  string
+	}{
+		{
+			name:         "basic auth",
+			username:     "user1",
+			password:     "pass1",
+			expectedUser: "user1",
+			expectedPass: "pass1",
+			expectedRaw:  "user1:pass1",
+		},
+		{
+			name:         "empty username",
+			username:     "",
+			password:     "pass1",
+			expectedUser: "",
+			expectedPass: "pass1",
+			expectedRaw:  ":pass1",
+		},
+		{
+			name:         "empty password",
+			username:     "user1",
+			password:     "",
+			expectedUser: "user1",
+			expectedPass: "",
+			expectedRaw:  "user1:",
+		},
+		{
+			name:         "both username and password empty",
+			username:     "",
+			password:     "",
+			expectedUser: "",
+			expectedPass: "",
+			expectedRaw:  ":",
+		},
+		{
+			name:         "special characters",
+			username:     "user:1",
+			password:     "pa:ss@!#",
+			expectedUser: "user:1",
+			expectedPass: "pa:ss@!#",
+			expectedRaw:  "user:1:pa:ss@!#",
+		},
+		{
+			name:         "unicode characters",
+			username:     "ユーザー",
+			password:     "密碼123",
+			expectedUser: "ユーザー",
+			expectedPass: "密碼123",
+			expectedRaw:  "ユーザー:密碼123",
+		},
+		{
+			name:         "long credentials",
+			username:     strings.Repeat("u", 1000),
+			password:     strings.Repeat("p", 1000),
+			expectedUser: strings.Repeat("u", 1000),
+			expectedPass: strings.Repeat("p", 1000),
+			expectedRaw:  strings.Repeat("u", 1000) + ":" + strings.Repeat("p", 1000),
+		},
+	}
 
-	t.Run("empty username", func(t *testing.T) {
-		creds := NewBasicCredentials("", "pass1")
-		username, password := creds.BasicAuth()
-		if username != "" {
-			t.Fatalf("expected empty username, got '%s'", username)
-		}
-		if password != "pass1" {
-			t.Fatalf("expected password 'pass1', got '%s'", password)
-		}
-	})
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			creds := NewBasicCredentials(tt.username, tt.password)
+
+			user, pass := creds.BasicAuth()
+			if user != tt.expectedUser {
+				t.Errorf("BasicAuth() username = %q; want %q", user, tt.expectedUser)
+			}
+			if pass != tt.expectedPass {
+				t.Errorf("BasicAuth() password = %q; want %q", pass, tt.expectedPass)
+			}
+
+			raw := creds.RawCredentials()
+			if raw != tt.expectedRaw {
+				t.Errorf("RawCredentials() = %q; want %q", raw, tt.expectedRaw)
+			}
+		})
+	}
 }
 
 func TestReAuthCredentialsListener(t *testing.T) {

osscluster.go

@@ -979,13 +979,6 @@ func (c *ClusterClient) Close() error {
 	return c.nodes.Close()
 }
 
-// Do create a Cmd from the args and processes the cmd.
-func (c *ClusterClient) Do(ctx context.Context, args ...interface{}) *Cmd {
-	cmd := NewCmd(ctx, args...)
-	_ = c.Process(ctx, cmd)
-	return cmd
-}
-
 func (c *ClusterClient) Process(ctx context.Context, cmd Cmder) error {
 	err := c.processHook(ctx, cmd)
 	cmd.SetErr(err)

osscluster_test.go

@@ -264,6 +264,12 @@ var _ = Describe("ClusterClient", func() {
 	var client *redis.ClusterClient
 
 	assertClusterClient := func() {
+		It("do", func() {
+			val, err := client.Do(ctx, "ping").Result()
+			Expect(err).NotTo(HaveOccurred())
+			Expect(val).To(Equal("PONG"))
+		})
+
 		It("should GET/SET/DEL", func() {
 			err := client.Get(ctx, "A").Err()
 			Expect(err).To(Equal(redis.Nil))

redis.go

@@ -776,13 +776,6 @@ func (c *Client) Conn() *Conn {
 	return newConn(c.opt, pool.NewStickyConnPool(c.connPool), &c.hooksMixin)
 }
 
-// Do create a Cmd from the args and processes the cmd.
-func (c *Client) Do(ctx context.Context, args ...interface{}) *Cmd {
-	cmd := NewCmd(ctx, args...)
-	_ = c.Process(ctx, cmd)
-	return cmd
-}
-
 func (c *Client) Process(ctx context.Context, cmd Cmder) error {
 	err := c.processHook(ctx, cmd)
 	cmd.SetErr(err)

redis_test.go

@@ -89,6 +89,12 @@ var _ = Describe("Client", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	It("do", func() {
+		val, err := client.Do(ctx, "ping").Result()
+		Expect(err).NotTo(HaveOccurred())
+		Expect(val).To(Equal("PONG"))
+	})
+
 	It("should ping", func() {
 		val, err := client.Ping(ctx).Result()
 		Expect(err).NotTo(HaveOccurred())

ring.go

@@ -565,13 +565,6 @@ func (c *Ring) SetAddrs(addrs map[string]string) {
 	c.sharding.SetAddrs(addrs)
 }
 
-// Do create a Cmd from the args and processes the cmd.
-func (c *Ring) Do(ctx context.Context, args ...interface{}) *Cmd {
-	cmd := NewCmd(ctx, args...)
-	_ = c.Process(ctx, cmd)
-	return cmd
-}
-
 func (c *Ring) Process(ctx context.Context, cmd Cmder) error {
 	err := c.processHook(ctx, cmd)
 	cmd.SetErr(err)

ring_test.go

@@ -74,6 +74,12 @@ var _ = Describe("Redis Ring", func() {
 		Expect(ring.Close()).NotTo(HaveOccurred())
 	})
 
+	It("do", func() {
+		val, err := ring.Do(ctx, "ping").Result()
+		Expect(err).NotTo(HaveOccurred())
+		Expect(val).To(Equal("PONG"))
+	})
+
 	It("supports context", func() {
 		ctx, cancel := context.WithCancel(ctx)
 		cancel()