Merge branch 'master' into load-balance-search-commands-to-shards

Author: ndyakov

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

@@ -24,7 +24,7 @@ runs:
 
         # Mapping of redis version to redis testing containers
         declare -A redis_version_mapping=(
-          ["8.4.x"]="8.4-RC1-pre"
+          ["8.4.x"]="8.4-RC1-pre.2"
           ["8.2.x"]="8.2.1-pre"
           ["8.0.x"]="8.0.2"
         )

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
           
           # Mapping of redis version to redis testing containers
           declare -A redis_version_mapping=(
-            ["8.4.x"]="8.4-RC1-pre"
+            ["8.4.x"]="8.4-RC1-pre.2"
             ["8.2.x"]="8.2.1-pre"
             ["8.0.x"]="8.0.2"
           )

Makefile

@@ -2,7 +2,7 @@ GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
 REDIS_VERSION ?= 8.4
 RE_CLUSTER ?= false
 RCE_DOCKER ?= true
-CLIENT_LIBS_TEST_IMAGE ?= redislabs/client-libs-test:8.4-RC1-pre
+CLIENT_LIBS_TEST_IMAGE ?= redislabs/client-libs-test:8.4-RC1-pre.2
 
 docker.start:
 	export RE_CLUSTER=$(RE_CLUSTER) && \

acl_commands.go

@@ -8,8 +8,12 @@ type ACLCmdable interface {
 	ACLLog(ctx context.Context, count int64) *ACLLogCmd
 	ACLLogReset(ctx context.Context) *StatusCmd
 
+	ACLGenPass(ctx context.Context, bit int) *StringCmd
+
 	ACLSetUser(ctx context.Context, username string, rules ...string) *StatusCmd
 	ACLDelUser(ctx context.Context, username string) *IntCmd
+	ACLUsers(ctx context.Context) *StringSliceCmd
+	ACLWhoAmI(ctx context.Context) *StringCmd
 	ACLList(ctx context.Context) *StringSliceCmd
 
 	ACLCat(ctx context.Context) *StringSliceCmd
@@ -65,6 +69,24 @@ func (c cmdable) ACLSetUser(ctx context.Context, username string, rules ...strin
 	return cmd
 }
 
+func (c cmdable) ACLGenPass(ctx context.Context, bit int) *StringCmd {
+	cmd := NewStringCmd(ctx, "acl", "genpass")
+	_ = c(ctx, cmd)
+	return cmd
+}
+
+func (c cmdable) ACLUsers(ctx context.Context) *StringSliceCmd {
+	cmd := NewStringSliceCmd(ctx, "acl", "users")
+	_ = c(ctx, cmd)
+	return cmd
+}
+
+func (c cmdable) ACLWhoAmI(ctx context.Context) *StringCmd {
+	cmd := NewStringCmd(ctx, "acl", "whoami")
+	_ = c(ctx, cmd)
+	return cmd
+}
+
 func (c cmdable) ACLList(ctx context.Context) *StringSliceCmd {
 	cmd := NewStringSliceCmd(ctx, "acl", "list")
 	_ = c(ctx, cmd)

acl_commands_test.go

@@ -92,6 +92,21 @@ var _ = Describe("ACL user commands", Label("NonRedisEnterprise"), func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(res).To(HaveLen(1))
 		Expect(res[0]).To(ContainSubstring("default"))
+
+		res, err = client.ACLUsers(ctx).Result()
+		Expect(err).NotTo(HaveOccurred())
+		Expect(res).To(HaveLen(1))
+		Expect(res[0]).To(Equal("default"))
+
+		res1, err := client.ACLWhoAmI(ctx).Result()
+		Expect(err).NotTo(HaveOccurred())
+		Expect(res1).To(Equal("default"))
+	})
+
+	It("gen password", func() {
+		password, err := client.ACLGenPass(ctx, 0).Result()
+		Expect(err).NotTo(HaveOccurred())
+		Expect(password).NotTo(BeEmpty())
 	})
 
 	It("setuser and deluser", func() {

command.go

@@ -1937,6 +1937,12 @@ func (cmd *StringStructMapCmd) Clone() Cmder {
 type XMessage struct {
 	ID     string
 	Values map[string]interface{}
+	// MillisElapsedFromDelivery is the number of milliseconds since the entry was last delivered.
+	// Only populated when using XREADGROUP with CLAIM argument for claimed entries.
+	MillisElapsedFromDelivery int64
+	// DeliveredCount is the number of times the entry was delivered.
+	// Only populated when using XREADGROUP with CLAIM argument for claimed entries.
+	DeliveredCount int64
 }
 
 type XMessageSliceCmd struct {
@@ -2016,10 +2022,16 @@ func readXMessageSlice(rd *proto.Reader) ([]XMessage, error) {
 }
 
 func readXMessage(rd *proto.Reader) (XMessage, error) {
-	if err := rd.ReadFixedArrayLen(2); err != nil {
+	// Read array length can be 2 or 4 (with CLAIM metadata)
+	n, err := rd.ReadArrayLen()
+	if err != nil {
 		return XMessage{}, err
 	}
 
+	if n != 2 && n != 4 {
+		return XMessage{}, fmt.Errorf("redis: got %d elements in the XMessage array, expected 2 or 4", n)
+	}
+
 	id, err := rd.ReadString()
 	if err != nil {
 		return XMessage{}, err
@@ -2032,10 +2044,24 @@ func readXMessage(rd *proto.Reader) (XMessage, error) {
 		}
 	}
 
-	return XMessage{
+	msg := XMessage{
 		ID:     id,
 		Values: v,
-	}, nil
+	}
+
+	if n == 4 {
+		msg.MillisElapsedFromDelivery, err = rd.ReadInt()
+		if err != nil {
+			return XMessage{}, err
+		}
+
+		msg.DeliveredCount, err = rd.ReadInt()
+		if err != nil {
+			return XMessage{}, err
+		}
+	}
+
+	return msg, nil
 }
 
 func stringInterfaceMapParser(rd *proto.Reader) (map[string]interface{}, error) {