实验报表授权、GEO支持

cmd/saastool/.gitignore

@@ -3,4 +3,5 @@ saastool
 saastool_linux
 *.toml
 test/
-*.lua
+*.lua
+test.txt

cmd/saastool/daemon.go

@@ -221,9 +221,9 @@ func (d *Daemon) parsePublicParams(r *http.Request) (*daemonPublicParams, error)
 
 	params.ds = strings.ToLower(strings.TrimSpace(q.Get("ds")))
 	switch params.ds {
-	case "did", "wuid":
+	case "did", "wuid", "geo":
 	default:
-		return nil, fmt.Errorf("ds must use did/wuid. current is %v", params.ds)
+		return nil, fmt.Errorf("ds must use did/wuid/geo. current is %v", params.ds)
 	}
 
 	params.appid = strings.TrimSpace(q.Get("appid"))

cmd/saastool/exp.go

@@ -17,6 +17,8 @@ func RunExp(args ...string) error {
 		return RunExpList(args...)
 	case "get":
 		return RunExpGet(args...)
+	case "grant":
+		return RunExpGrant(args...)
 	default:
 		err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool exp help' for usage`, name)
 		fmt.Fprintln(os.Stderr, err)
@@ -31,11 +33,12 @@ func RunExpHelp(args ...string) error {
 }
 
 const expUsage = `
-Usage:  saastoola exp COMMAND [OPTIONS]
+Usage:  saastool exp COMMAND [OPTIONS]
 
 Commands:
     list                 List exps
     get                  Get exp report
+    grant                Experiment authorization management
 
 "help" is the default command.
 

cmd/saastool/exp_grant.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+)
+
+func RunExpGrant(args ...string) error {
+	name, args := ParseCommandName(args)
+
+	switch name {
+	case "", "help":
+		fmt.Println(strings.TrimSpace(expGrantUsage))
+		return nil
+	case "list":
+		return RunExpGrantList(args...)
+	case "add":
+		return RunExpGrantAdd(args...)
+	case "delete":
+		return RunExpGrantDelete(args...)
+	default:
+		err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool exp grant help' for usage`, name)
+		fmt.Fprintln(os.Stderr, err)
+		return err
+	}
+}
+
+const expGrantUsage = `
+Usage:  saastool exp grant COMMAND [OPTIONS]
+
+Commands:
+    list                 List experiment authorization
+    add                  Add experiment authorization
+    delete               Delete experiment authorization
+
+"help" is the default command.
+
+Use "saastool exp grant COMMAND -help" for more information about a command.
+`

cmd/saastool/exp_grant_add.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 expGrantAddParams struct {
+	srtaAccountId uint32
+	saasHttp      *saashttp.SaasClient
+}
+
+func RunExpGrantAdd(args ...string) error {
+	fs := flag.NewFlagSet("add", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	srtaAccountId := paramSrtaAccountId(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
+	}
+
+	if *srtaAccountId == 0 {
+		fmt.Fprintln(os.Stderr, "Error: sRTA account ID is required")
+		fs.PrintDefaults()
+		return fmt.Errorf("sRTA account ID is required")
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	expGrantAddParams := expGrantAddParams{
+		srtaAccountId: uint32(*srtaAccountId),
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doExpGrantAdd(expGrantAddParams)
+}
+
+func doExpGrantAdd(params expGrantAddParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ExpGrantAdd{
+			ExpGrantAdd: &saasapi.ExpGrant{
+				TargetAccountId: params.srtaAccountId,
+			},
+		},
+	}
+
+	res, err := params.saasHttp.ExpGrantAdd(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Exp Grant Add error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "Exp grant add failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	expGrantRes := res.GetExpGrantAddRes()
+	fmt.Printf("exp grant add res: %v\n", protojson.Format(expGrantRes))
+	return nil
+}

cmd/saastool/exp_grant_delete.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 expGrantDeleteParams struct {
+	srtaAccountId uint32
+	saasHttp      *saashttp.SaasClient
+}
+
+func RunExpGrantDelete(args ...string) error {
+	fs := flag.NewFlagSet("delete", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	srtaAccountId := paramSrtaAccountId(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
+	}
+
+	if *srtaAccountId == 0 {
+		fmt.Fprintln(os.Stderr, "Error: sRTA account ID is required")
+		fs.PrintDefaults()
+		return fmt.Errorf("sRTA account ID is required")
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	expGrantDeleteParams := expGrantDeleteParams{
+		srtaAccountId: uint32(*srtaAccountId),
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doExpGrantDelete(expGrantDeleteParams)
+}
+
+func doExpGrantDelete(params expGrantDeleteParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ExpGrantDelete{
+			ExpGrantDelete: &saasapi.ExpGrant{
+				TargetAccountId: params.srtaAccountId,
+			},
+		},
+	}
+
+	res, err := params.saasHttp.ExpGrantDelete(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Exp Grant Delete error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "Exp grant delete failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	expGrantRes := res.GetExpGrantDeleteRes()
+	fmt.Printf("exp grant delete res: %v\n", protojson.Format(expGrantRes))
+	return nil
+}

cmd/saastool/exp_grant_list.go

@@ -0,0 +1,70 @@
+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 expGrantListParams struct {
+	saasHttp *saashttp.SaasClient
+}
+
+func RunExpGrantList(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
+	}
+
+	expGrantListParams := expGrantListParams{
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doExpGrantList(expGrantListParams)
+}
+
+func doExpGrantList(params expGrantListParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ExpGrantList{
+			ExpGrantList: &saasapi.ExpGrantList{},
+		},
+	}
+
+	res, err := params.saasHttp.ExpGrantList(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "submit Exp Grant List error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		fmt.Fprintln(os.Stderr, "Exp grant list failed", "code", res.Code, "status", res.Status)
+		return nil
+	}
+
+	expGrantRes := res.GetExpGrantListRes()
+	fmt.Printf("exp grant list res: %v\n", protojson.Format(expGrantRes))
+	return nil
+}

cmd/saastool/task_make.go

@@ -74,7 +74,6 @@ func RunTaskMake(args ...string) error {
 		fmt.Fprintln(os.Stderr, "Error parsing block size", "err", err)
 		fmt.Fprintln(os.Stderr, "Using default 200M")
 		blockSizeNum = 200 * 1024 * 1024
-
 	}
 
 	if blockSizeNum < blockSizeMin || blockSizeNum > blockSizeMax {