支持策略创建、删除，脚本列表、创建、删除、获取、使用

cmd/saastool/params.go

@@ -109,6 +109,10 @@ func paramLua(fs *flag.FlagSet) *string {
 	return fs.String("lua", "", "LUA file name")
 }
 
+func paramName(fs *flag.FlagSet) *string {
+	return fs.String("name", "", "Name")
+}
+
 func paramDid(fs *flag.FlagSet) *string {
 	return fs.String("did", "", "device md5 (lower case)")
 }

cmd/saastool/script.go

@@ -15,6 +15,16 @@ func RunScript(args ...string) error {
 		return RunScriptHelp(args...)
 	case "run":
 		return RunScriptRun(args...)
+	case "create":
+		return RunScriptCreate(args...)
+	case "list":
+		return RunScriptList(args...)
+	case "delete":
+		return RunScriptDelete(args...)
+	case "get":
+		return RunScriptGet(args...)
+	case "use":
+		return RunScriptUse(args...)
 	default:
 		err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool script help' for usage`, name)
 		fmt.Fprintln(os.Stderr, err)
@@ -29,10 +39,15 @@ func RunScriptHelp(args ...string) error {
 }
 
 const scriptUsage = `
-Usage:  saastoola script COMMAND [OPTIONS]
+Usage:  saastool script COMMAND [OPTIONS]
 
 Commands:
     run                  Run lua script test on server
+	create               Create lua script on server
+    list                 List all scripts on server
+    delete               Delete a script from server
+    get                  Get script content from server
+    use                  Use a script as default
 
 "help" is the default command.
 

cmd/saastool/script_create.go

@@ -0,0 +1,94 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type scriptCreateParams struct {
+	luaName   string
+	luaScript string
+	saasHttp  *saashttp.SaasClient
+}
+
+func RunScriptCreate(args ...string) error {
+	fs := flag.NewFlagSet("create", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	luaFile := paramLua(fs)
+	luaName := paramName(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*luaFile) == 0 || len(*luaName) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	file, err := os.Open(*luaFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "lua file error", "err", err)
+		return err
+	}
+	defer file.Close()
+
+	body, err := io.ReadAll(file)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "lua file read error", "err", err)
+		return err
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	scriptCreateParams := scriptCreateParams{
+		luaName:   *luaName,
+		luaScript: string(body),
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doScriptCreate(scriptCreateParams)
+}
+
+func doScriptCreate(scriptCreateParams scriptCreateParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ScriptCreate{
+			ScriptCreate: &saasapi.ScriptCreate{
+				LuaName:   scriptCreateParams.luaName,
+				LuaScript: scriptCreateParams.luaScript,
+			},
+		},
+	}
+
+	res, err := scriptCreateParams.saasHttp.ScriptCreate(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Create Script error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "script create failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	scriptRes := res.GetScriptCreateRes()
+
+	fmt.Printf("script res: %v\n", protojson.Format(scriptRes))
+	return nil
+}

cmd/saastool/script_delete.go

@@ -0,0 +1,76 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type scriptDeleteParams struct {
+	luaName  string
+	saasHttp *saashttp.SaasClient
+}
+
+func RunScriptDelete(args ...string) error {
+	fs := flag.NewFlagSet("delete", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	luaName := paramName(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*luaName) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	scriptDeleteParams := scriptDeleteParams{
+		luaName: *luaName,
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doScriptDelete(scriptDeleteParams)
+}
+
+func doScriptDelete(scriptDeleteParams scriptDeleteParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ScriptDelete{
+			ScriptDelete: &saasapi.ScriptDelete{
+				LuaName: scriptDeleteParams.luaName,
+			},
+		},
+	}
+
+	res, err := scriptDeleteParams.saasHttp.ScriptDelete(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Delete Script error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "script delete failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	scriptRes := res.GetScriptDeleteRes()
+
+	fmt.Printf("script res: %v\n", protojson.Format(scriptRes))
+	return nil
+}

cmd/saastool/script_get.go

@@ -0,0 +1,76 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type scriptGetParams struct {
+	luaName  string
+	saasHttp *saashttp.SaasClient
+}
+
+func RunScriptGet(args ...string) error {
+	fs := flag.NewFlagSet("get", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	luaName := paramName(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*luaName) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	scriptGetParams := scriptGetParams{
+		luaName: *luaName,
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doScriptGet(scriptGetParams)
+}
+
+func doScriptGet(scriptGetParams scriptGetParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ScriptGet{
+			ScriptGet: &saasapi.ScriptGet{
+				LuaName: scriptGetParams.luaName,
+			},
+		},
+	}
+
+	res, err := scriptGetParams.saasHttp.ScriptGet(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Get Script error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "script get failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	scriptRes := res.GetScriptGetRes()
+
+	fmt.Printf("script res: %v\n", protojson.Format(scriptRes))
+	return nil
+}

cmd/saastool/script_list.go

@@ -0,0 +1,71 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type scriptListParams struct {
+	saasHttp *saashttp.SaasClient
+}
+
+func RunScriptList(args ...string) error {
+	fs := flag.NewFlagSet("list", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	scriptListParams := scriptListParams{
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doScriptList(scriptListParams)
+}
+
+func doScriptList(scriptListParams scriptListParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ScriptList{
+			ScriptList: &saasapi.ScriptList{},
+		},
+	}
+
+	res, err := scriptListParams.saasHttp.ScriptList(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit List Script error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "script list failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	scriptRes := res.GetScriptListRes()
+
+	fmt.Printf("script res: %v\n", protojson.Format(scriptRes))
+	return nil
+}

cmd/saastool/script_use.go

@@ -0,0 +1,76 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type scriptUseParams struct {
+	luaName  string
+	saasHttp *saashttp.SaasClient
+}
+
+func RunScriptUse(args ...string) error {
+	fs := flag.NewFlagSet("use", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	luaName := paramName(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*luaName) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	scriptUseParams := scriptUseParams{
+		luaName: *luaName,
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doScriptUse(scriptUseParams)
+}
+
+func doScriptUse(scriptUseParams scriptUseParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ScriptUse{
+			ScriptUse: &saasapi.ScriptUse{
+				LuaName: scriptUseParams.luaName,
+			},
+		},
+	}
+
+	res, err := scriptUseParams.saasHttp.ScriptUse(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Use Script error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "script use failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	scriptRes := res.GetScriptUseRes()
+
+	fmt.Printf("script use res: %v\n", protojson.Format(scriptRes))
+	return nil
+}

cmd/saastool/target.go

@@ -15,6 +15,10 @@ func RunTarget(args ...string) error {
 		return RunTargetHelp(args...)
 	case "list":
 		return RunTargetList(args...)
+	case "create":
+		return RunTargetCreate(args...)
+	case "delete":
+		return RunTargetDelete(args...)
 	default:
 		err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool target help' for usage`, name)
 		fmt.Fprintln(os.Stderr, err)
@@ -33,6 +37,8 @@ Usage:  saastoola target COMMAND [OPTIONS]
 
 Commands:
     list                 List targets
+    create               Create a new target
+    delete               Delete an existing target
 
 "help" is the default command.
 

cmd/saastool/target_create.go

@@ -0,0 +1,81 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type createTargetParams struct {
+	targetId   string
+	targetDesc string
+	saasHttp   *saashttp.SaasClient
+}
+
+func RunTargetCreate(args ...string) error {
+	fs := flag.NewFlagSet("create", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	targetId := paramTarget(fs)
+	targetDesc := paramTaskDesc(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*targetId) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	createTargetParams := createTargetParams{
+		targetId:   *targetId,
+		targetDesc: *targetDesc,
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doTargetCreate(createTargetParams)
+}
+
+func doTargetCreate(createTargetParams createTargetParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_TargetCreate{
+			TargetCreate: &saasapi.TargetCreate{
+				TargetId:          createTargetParams.targetId,
+				TargetDescription: createTargetParams.targetDesc,
+			},
+		},
+	}
+
+	res, err := createTargetParams.saasHttp.TargetCreate(saasReq)
+
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Create Target error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "target create failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	targetRes := res.GetTargetCreateRes()
+
+	fmt.Printf("target res: %v\n", protojson.Format(targetRes))
+	return nil
+}

cmd/saastool/target_delete.go

@@ -0,0 +1,76 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+	"google.golang.org/protobuf/encoding/protojson"
+)
+
+type deleteTargetParams struct {
+	targetId string
+	saasHttp *saashttp.SaasClient
+}
+
+func RunTargetDelete(args ...string) error {
+	fs := flag.NewFlagSet("delete", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	targetId := paramTarget(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*targetId) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	deleteTargetParams := deleteTargetParams{
+		targetId: *targetId,
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doTargetDelete(deleteTargetParams)
+}
+
+func doTargetDelete(deleteTargetParams deleteTargetParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_TargetDelete{
+			TargetDelete: &saasapi.TargetDelete{
+				TargetId: deleteTargetParams.targetId,
+			},
+		},
+	}
+
+	res, err := deleteTargetParams.saasHttp.TargetDelete(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Target delete error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		err = fmt.Errorf("target delete failed. code:%v, status:%v", res.Code, res.Status)
+		fmt.Fprintln(os.Stderr, err)
+		return err
+	}
+
+	targetDeleteRes := res.GetTargetDeleteRes()
+	fmt.Printf("target res: %v\n", protojson.Format(targetDeleteRes))
+	return nil
+}

cmd/saastool/term.go

@@ -1,25 +0,0 @@
-package main
-
-import (
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-// https://man7.org/linux/man-pages/man2/TIOCSWINSZ.2const.html
-
-// winSize console窗口大小
-type winSize struct {
-	wsRow     uint16
-	wsCols    uint16
-	wsXPixels uint16
-	wxYPixels uint16
-}
-
-// getConsoleSize 获取控制台窗口大小
-func getConsoleSize() (cols, rows int) {
-	var sz winSize
-	_, _, _ = syscall.Syscall(syscall.SYS_IOCTL,
-		os.Stdout.Fd(), uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(&sz)))
-	return int(sz.wsCols), int(sz.wsRow)
-}