支持dataspace

cmd/saastool/task_make.go

@@ -9,6 +9,7 @@ import (
 	"path"
 	"runtime"
 	"sort"
+	"strings"
 	"sync"
 
 	"e.coding.net/rta/public/saasapi"
@@ -49,17 +50,24 @@ func RunTaskMake(args ...string) error {
 	hashFile := paramOutputHashFile(fs)
 	blockSize := paramBlockSize(fs)
 	desc := paramTaskDesc(fs)
+	appid := paramAppid(fs)
+	ds := paramDataSpaceId(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(*sourcePath) == 0 || len(*hashFile) == 0 {
+	if fs.NArg() > 0 || len(*sourcePath) == 0 || len(*hashFile) == 0 || len(*ds) == 0 {
 		fs.PrintDefaults()
 		return nil
 	}
 
+	if strings.ToLower(*ds) == "openid" && len(*appid) == 0 {
+		fmt.Fprintln(os.Stderr, "appid must be set when data space is openid")
+		return nil
+	}
+
 	blockSizeNum, err := ParseByteSize(*blockSize)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Error parsing block size", "err", err)
@@ -79,6 +87,8 @@ func RunTaskMake(args ...string) error {
 		task: &saasapi.Task{
 			TaskBlockSize:   blockSizeNum,
 			TaskDescription: *desc,
+			Appid:           *appid,
+			DataspaceId:     *ds,
 		},
 	}
 	return doMakeHash(makeTaskParams)