Merge pull request #70 from monkey92t/new_cmd

feat: add SlusterShareds command

Author: monkey92t

commands_test.go

@@ -2665,6 +2665,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("ClusterShards", func() {
+			operationClusterShardsCmd(clientMock, func() *ExpectedClusterShards {
+				return clientMock.ExpectClusterShards()
+			}, func() *redis.ClusterShardsCmd {
+				return client.ClusterShards(ctx)
+			})
+		})
+
 		It("ClusterLinks", func() {
 			operationClusterLinksCmd(clientMock, func() *ExpectedClusterLinks {
 				return clientMock.ExpectClusterLinks()

expect.go

@@ -314,6 +314,7 @@ type baseMock interface {
 	ExpectPubSubShardNumSub(channels ...string) *ExpectedMapStringInt
 
 	ExpectClusterSlots() *ExpectedClusterSlots
+	ExpectClusterShards() *ExpectedClusterShards
 	ExpectClusterLinks() *ExpectedClusterLinks
 	ExpectClusterNodes() *ExpectedString
 	ExpectClusterMeet(host, port string) *ExpectedStatus
@@ -1264,6 +1265,24 @@ func (cmd *ExpectedKeyFlags) inflow(c redis.Cmder) {
 
 // ------------------------------------------------------------
 
+type ExpectedClusterShards struct {
+	expectedBase
+
+	val []redis.ClusterShard
+}
+
+func (cmd *ExpectedClusterShards) SetVal(val []redis.ClusterShard) {
+	cmd.setVal = true
+	cmd.val = make([]redis.ClusterShard, len(val))
+	copy(cmd.val, val)
+}
+
+func (cmd *ExpectedClusterShards) inflow(c redis.Cmder) {
+	inflow(c, "val", cmd.val)
+}
+
+// ------------------------------------------------------------
+
 type ExpectedError struct {
 	expectedBase
 }

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.25.0
-	github.com/redis/go-redis/v9 v9.0.3-0.20230328041954-42d730c1433b
+	github.com/redis/go-redis/v9 v9.0.3-0.20230329134406-9aba95a74fa2
 )
 
 require (

go.sum

@@ -38,8 +38,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.0.3-0.20230328041954-42d730c1433b h1:T3MMStZm8QZbklJHD4ksof/+U5AAqBbrqdfY/SdqQqM=
-github.com/redis/go-redis/v9 v9.0.3-0.20230328041954-42d730c1433b/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
+github.com/redis/go-redis/v9 v9.0.3-0.20230329134406-9aba95a74fa2 h1:3pTy4Z2GUTMRJBX2F+i7CvqyqQx10feStcprdzDzjFE=
+github.com/redis/go-redis/v9 v9.0.3-0.20230329134406-9aba95a74fa2/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

mock.go

@@ -2369,6 +2369,13 @@ func (m *mock) ExpectClusterSlots() *ExpectedClusterSlots {
 	return e
 }
 
+func (m *mock) ExpectClusterShards() *ExpectedClusterShards {
+	e := &ExpectedClusterShards{}
+	e.cmd = m.factory.ClusterShards(m.ctx)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectClusterLinks() *ExpectedClusterLinks {
 	e := &ExpectedClusterLinks{}
 	e.cmd = m.factory.ClusterLinks(m.ctx)

mock_test.go

@@ -1594,3 +1594,62 @@ func operationKeyFlagsCmd(base baseMock, expected func() *ExpectedKeyFlags, actu
 	Expect(err).NotTo(HaveOccurred())
 	Expect(val).To(Equal(kfs))
 }
+
+func operationClusterShardsCmd(base baseMock, expected func() *ExpectedClusterShards, actual func() *redis.ClusterShardsCmd) {
+	var (
+		setErr = errors.New("cluster shareds cmd error")
+		val    []redis.ClusterShard
+		err    error
+	)
+
+	base.ClearExpect()
+	expected().SetErr(setErr)
+	val, err = actual().Result()
+	Expect(err).To(Equal(setErr))
+	Expect(val).To(Equal([]redis.ClusterShard(nil)))
+
+	base.ClearExpect()
+	expected()
+	val, err = actual().Result()
+	Expect(err).To(HaveOccurred())
+	Expect(val).To(Equal([]redis.ClusterShard(nil)))
+
+	cs := []redis.ClusterShard{
+		{
+			Slots: []redis.SlotRange{
+				{Start: 0, End: 1999},
+				{Start: 4000, End: 5999},
+			},
+			Nodes: []redis.Node{
+				{
+					ID:                "e10b7051d6bf2d5febd39a2be297bbaea6084111",
+					Endpoint:          "127.0.0.1",
+					IP:                "127.0.0.1",
+					Hostname:          "host",
+					Port:              30001,
+					TLSPort:           1999,
+					Role:              "master",
+					ReplicationOffset: 72156,
+					Health:            "online",
+				},
+				{
+					ID:                "fd20502fe1b32fc32c15b69b0a9537551f162f1f",
+					Endpoint:          "127.0.0.1",
+					IP:                "127.0.0.1",
+					Hostname:          "host",
+					Port:              30002,
+					TLSPort:           1999,
+					Role:              "replica",
+					ReplicationOffset: 72156,
+					Health:            "online",
+				},
+			},
+		},
+	}
+
+	base.ClearExpect()
+	expected().SetVal(cs)
+	val, err = actual().Result()
+	Expect(err).NotTo(HaveOccurred())
+	Expect(val).To(Equal(cs))
+}