Merge pull request #71 from monkey92t/new_cmd

feat: add FCall/FCallRo/FunctionKill command

Author: monkey92t

commands_test.go

@@ -3086,6 +3086,14 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("FunctionKill", func() {
+			operationStringCmd(clientMock, func() *ExpectedString {
+				return clientMock.ExpectFunctionKill()
+			}, func() *redis.StringCmd {
+				return client.FunctionKill(ctx)
+			})
+		})
+
 		It("FunctionDump", func() {
 			operationStringCmd(clientMock, func() *ExpectedString {
 				return clientMock.ExpectFunctionDump()
@@ -3102,6 +3110,22 @@ var _ = Describe("Commands", func() {
 			})
 		})
 
+		It("FCall", func() {
+			operationCmdCmd(clientMock, func() *ExpectedCmd {
+				return clientMock.ExpectFCall("func-1", []string{"key1", "key2"}, "arg1", "arg2")
+			}, func() *redis.Cmd {
+				return client.FCall(ctx, "func-1", []string{"key1", "key2"}, "arg1", "arg2")
+			})
+		})
+
+		It("FCallRo", func() {
+			operationCmdCmd(clientMock, func() *ExpectedCmd {
+				return clientMock.ExpectFCallRo("func-1", []string{"key1", "key2"}, "arg1", "arg2")
+			}, func() *redis.Cmd {
+				return client.FCallRo(ctx, "func-1", []string{"key1", "key2"}, "arg1", "arg2")
+			})
+		})
+
 		// ------------------------------------------------------------------
 
 		It("ACLDryRun", func() {

expect.go

@@ -353,8 +353,11 @@ type baseMock interface {
 	ExpectFunctionFlush() *ExpectedString
 	ExpectFunctionFlushAsync() *ExpectedString
 	ExpectFunctionList(q redis.FunctionListQuery) *ExpectedFunctionList
+	ExpectFunctionKill() *ExpectedString
 	ExpectFunctionDump() *ExpectedString
 	ExpectFunctionRestore(libDump string) *ExpectedString
+	ExpectFCall(function string, keys []string, args ...interface{}) *ExpectedCmd
+	ExpectFCallRo(function string, keys []string, args ...interface{}) *ExpectedCmd
 
 	ExpectACLDryRun(username string, command ...interface{}) *ExpectedString
 }

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.20230329134406-9aba95a74fa2
+	github.com/redis/go-redis/v9 v9.0.3
 )
 
 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.20230329134406-9aba95a74fa2 h1:3pTy4Z2GUTMRJBX2F+i7CvqyqQx10feStcprdzDzjFE=
-github.com/redis/go-redis/v9 v9.0.3-0.20230329134406-9aba95a74fa2/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
+github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k=
+github.com/redis/go-redis/v9 v9.0.3/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

@@ -2634,6 +2634,13 @@ func (m *mock) ExpectFunctionList(q redis.FunctionListQuery) *ExpectedFunctionLi
 	return e
 }
 
+func (m *mock) ExpectFunctionKill() *ExpectedString {
+	e := &ExpectedString{}
+	e.cmd = m.factory.FunctionKill(m.ctx)
+	m.pushExpect(e)
+	return e
+}
+
 func (m *mock) ExpectFunctionDump() *ExpectedString {
 	e := &ExpectedString{}
 	e.cmd = m.factory.FunctionDump(m.ctx)
@@ -2648,6 +2655,20 @@ func (m *mock) ExpectFunctionRestore(libDump string) *ExpectedString {
 	return e
 }
 
+func (m *mock) ExpectFCall(function string, keys []string, args ...interface{}) *ExpectedCmd {
+	e := &ExpectedCmd{}
+	e.cmd = m.factory.FCall(m.ctx, function, keys, args...)
+	m.pushExpect(e)
+	return e
+}
+
+func (m *mock) ExpectFCallRo(function string, keys []string, args ...interface{}) *ExpectedCmd {
+	e := &ExpectedCmd{}
+	e.cmd = m.factory.FCallRo(m.ctx, function, keys, args...)
+	m.pushExpect(e)
+	return e
+}
+
 // ------------------------------------------------------------------------
 
 func (m *mock) ExpectACLDryRun(username string, command ...interface{}) *ExpectedString {