fix(cli): reduce cli size by extracting the dependency

Signed-off-by: Jiyong Huang <huangjy@emqx.io>

cmd/kuiper/main.go

@@ -18,7 +18,7 @@ import (
 	"bufio"
 	"fmt"
 	"github.com/lf-edge/ekuiper/internal/conf"
-	"github.com/lf-edge/ekuiper/internal/server"
+	"github.com/lf-edge/ekuiper/internal/pkg/model"
 	"github.com/urfave/cli"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
@@ -229,7 +229,7 @@ func main() {
 								}
 								rname := c.Args()[0]
 								var reply string
-								args := &server.RPCArgDesc{Name: rname, Json: string(rule)}
+								args := &model.RPCArgDesc{Name: rname, Json: string(rule)}
 								err = client.Call("Server.CreateRule", args, &reply)
 								if err != nil {
 									fmt.Println(err)
@@ -246,7 +246,7 @@ func main() {
 							rname := c.Args()[0]
 							rjson := c.Args()[1]
 							var reply string
-							args := &server.RPCArgDesc{Name: rname, Json: rjson}
+							args := &model.RPCArgDesc{Name: rname, Json: rjson}
 							err = client.Call("Server.CreateRule", args, &reply)
 							if err != nil {
 								fmt.Println(err)
@@ -279,8 +279,8 @@ func main() {
 						}
 						pname := c.Args()[1]
 						sfile := c.String("file")
-						args := &server.PluginDesc{
-							RPCArgDesc: server.RPCArgDesc{
+						args := &model.PluginDesc{
+							RPCArgDesc: model.RPCArgDesc{
 								Name: pname,
 							},
 							Type: ptype,
@@ -322,7 +322,7 @@ func main() {
 							return nil
 						}
 						var reply string
-						err = client.Call("Server.CreateService", &server.RPCArgDesc{
+						err = client.Call("Server.CreateService", &model.RPCArgDesc{
 							Name: c.Args()[0],
 							Json: c.Args()[1],
 						}, &reply)
@@ -393,8 +393,8 @@ func main() {
 							return nil
 						}
 						pname := c.Args()[1]
-						args := &server.PluginDesc{
-							RPCArgDesc: server.RPCArgDesc{
+						args := &model.PluginDesc{
+							RPCArgDesc: model.RPCArgDesc{
 								Name: pname,
 							},
 							Type: ptype,
@@ -539,8 +539,8 @@ func main() {
 							return nil
 						}
 						pname := c.Args()[1]
-						args := &server.PluginDesc{
-							RPCArgDesc: server.RPCArgDesc{
+						args := &model.PluginDesc{
+							RPCArgDesc: model.RPCArgDesc{
 								Name: pname,
 							},
 							Type: ptype,
@@ -843,8 +843,8 @@ func main() {
 						}
 						pname := c.Args()[1]
 						sfile := c.String("file")
-						args := &server.PluginDesc{
-							RPCArgDesc: server.RPCArgDesc{
+						args := &model.PluginDesc{
+							RPCArgDesc: model.RPCArgDesc{
 								Name: pname,
 							},
 						}

go.sum

@@ -44,6 +44,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fxamacker/cbor/v2 v2.2.0 h1:6eXqdDDe588rSYAi1HfZKbx6YYQO4mxQ9eC6xYpU/JQ=
 github.com/fxamacker/cbor/v2 v2.2.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/gdexlab/go-render v1.0.1 h1:rxqB3vo5s4n1kF0ySmoNeSPRYkEsyHgln4jFIQY7v0U=
 github.com/gdexlab/go-render v1.0.1/go.mod h1:wRi5nW2qfjiGj4mPukH4UV0IknS1cHD4VgFTmJX5JzM=
@@ -217,6 +218,7 @@ github.com/ugorji/go/codec v1.2.5 h1:8WobZKAk18Msm2CothY2jnztY56YVY8kF1oQrj21iis
 github.com/ugorji/go/codec v1.2.5/go.mod h1:QPxoTbPKSEAlAHPYt02++xp/en9B/wUdwFCz+hj5caA=
 github.com/urfave/cli v1.22.0 h1:8nz/RUUotroXnOpYzT/Fy3sBp+2XEbXaY641/s3nbFI=
 github.com/urfave/cli v1.22.0/go.mod h1:b3D7uWrF2GilkNgYpgcg6J+JMUw7ehmNkE8sZdliGLc=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

internal/server/data.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package server
+package model
 
 type RPCArgDesc struct {
 	Name, Json string

internal/server/rpc.go

@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/lf-edge/ekuiper/internal/pkg/model"
 	"github.com/lf-edge/ekuiper/internal/plugin"
 	"github.com/lf-edge/ekuiper/internal/service"
 	"github.com/lf-edge/ekuiper/internal/topo/sink"
@@ -89,7 +90,7 @@ func (t *Server) Stream(stream string, reply *string) error {
 	return nil
 }
 
-func (t *Server) CreateRule(rule *RPCArgDesc, reply *string) error {
+func (t *Server) CreateRule(rule *model.RPCArgDesc, reply *string) error {
 	r, err := ruleProcessor.ExecCreate(rule.Name, rule.Json)
 	if err != nil {
 		return fmt.Errorf("Create rule error : %s.", err)
@@ -200,7 +201,7 @@ func (t *Server) DropRule(name string, reply *string) error {
 	return nil
 }
 
-func (t *Server) CreatePlugin(arg *PluginDesc, reply *string) error {
+func (t *Server) CreatePlugin(arg *model.PluginDesc, reply *string) error {
 	pt := plugin.PluginType(arg.Type)
 	p, err := getPluginByJson(arg, pt)
 	if err != nil {
@@ -218,7 +219,7 @@ func (t *Server) CreatePlugin(arg *PluginDesc, reply *string) error {
 	return nil
 }
 
-func (t *Server) RegisterPlugin(arg *PluginDesc, reply *string) error {
+func (t *Server) RegisterPlugin(arg *model.PluginDesc, reply *string) error {
 	p, err := getPluginByJson(arg, plugin.FUNCTION)
 	if err != nil {
 		return fmt.Errorf("Register plugin functions error: %s", err)
@@ -235,7 +236,7 @@ func (t *Server) RegisterPlugin(arg *PluginDesc, reply *string) error {
 	return nil
 }
 
-func (t *Server) DropPlugin(arg *PluginDesc, reply *string) error {
+func (t *Server) DropPlugin(arg *model.PluginDesc, reply *string) error {
 	pt := plugin.PluginType(arg.Type)
 	p, err := getPluginByJson(arg, pt)
 	if err != nil {
@@ -282,7 +283,7 @@ func (t *Server) ShowUdfs(_ int, reply *string) error {
 	return nil
 }
 
-func (t *Server) DescPlugin(arg *PluginDesc, reply *string) error {
+func (t *Server) DescPlugin(arg *model.PluginDesc, reply *string) error {
 	pt := plugin.PluginType(arg.Type)
 	p, err := getPluginByJson(arg, pt)
 	if err != nil {
@@ -319,7 +320,7 @@ func (t *Server) DescUdf(arg string, reply *string) error {
 	return nil
 }
 
-func (t *Server) CreateService(arg *RPCArgDesc, reply *string) error {
+func (t *Server) CreateService(arg *model.RPCArgDesc, reply *string) error {
 	sd := &service.ServiceCreationRequest{}
 	if arg.Json != "" {
 		if err := json.Unmarshal([]byte(arg.Json), sd); err != nil {
@@ -424,7 +425,7 @@ func marshalDesc(m interface{}) (string, error) {
 	return dst.String(), nil
 }
 
-func getPluginByJson(arg *PluginDesc, pt plugin.PluginType) (plugin.Plugin, error) {
+func getPluginByJson(arg *model.PluginDesc, pt plugin.PluginType) (plugin.Plugin, error) {
 	p := plugin.NewPluginByType(pt)
 	if arg.Json != "" {
 		if err := json.Unmarshal([]byte(arg.Json), p); err != nil {