diff --git a/client/internal/cmdline/cmdline.go b/client/internal/cmdline/cmdline.go new file mode 100644 index 0000000..2bc278d --- /dev/null +++ b/client/internal/cmdline/cmdline.go @@ -0,0 +1,45 @@ +package cmdline + +import ( + "fmt" + "os" + + "gitlink.org.cn/cloudream/common/pkgs/cmdtrie" + "gitlink.org.cn/cloudream/scheduler/client/internal/services" +) + +type CommandContext struct { + Cmdline *Commandline +} + +var commands cmdtrie.CommandTrie[CommandContext, error] = cmdtrie.NewCommandTrie[CommandContext, error]() + +type Commandline struct { + Svc *services.Service +} + +func NewCommandline(svc *services.Service) (*Commandline, error) { + return &Commandline{ + Svc: svc, + }, nil +} + +func (c *Commandline) DispatchCommand(allArgs []string) { + cmdCtx := CommandContext{ + Cmdline: c, + } + cmdErr, err := commands.Execute(cmdCtx, allArgs, cmdtrie.ExecuteOption{ReplaceEmptyArrayWithNil: true}) + if err != nil { + fmt.Printf("execute command failed, err: %s", err.Error()) + os.Exit(1) + } + if cmdErr != nil { + fmt.Printf("execute command failed, err: %s", cmdErr.Error()) + os.Exit(1) + } +} + +func MustAddCmd(fn any, prefixWords ...string) any { + commands.MustAdd(fn, prefixWords...) + return nil +} diff --git a/client/internal/cmdline/jobset.go b/client/internal/cmdline/jobset.go new file mode 100644 index 0000000..bd9b366 --- /dev/null +++ b/client/internal/cmdline/jobset.go @@ -0,0 +1,5 @@ +package cmdline + +// var _ = MustAddCmd(func(ctx CommandContext, infoFilePath string) error { +// +// }, "jobset", "new") diff --git a/client/internal/cmdline/serve.go b/client/internal/cmdline/serve.go new file mode 100644 index 0000000..07f9b1f --- /dev/null +++ b/client/internal/cmdline/serve.go @@ -0,0 +1,26 @@ +package cmdline + +import ( + "fmt" + + "gitlink.org.cn/cloudream/scheduler/client/internal/http" +) + +var _ = MustAddCmd(func(ctx CommandContext, args []string) error { + listenAddr := ":7891" + if len(args) > 0 { + listenAddr = args[0] + } + + httpSvr, err := http.NewServer(listenAddr, ctx.Cmdline.Svc) + if err != nil { + return fmt.Errorf("new http server: %w", err) + } + + err = httpSvr.Serve() + if err != nil { + return fmt.Errorf("serving http: %w", err) + } + + return nil +}, "serve", "http") diff --git a/client/internal/config/config.go b/client/internal/config/config.go new file mode 100644 index 0000000..7c6ac57 --- /dev/null +++ b/client/internal/config/config.go @@ -0,0 +1,23 @@ +package config + +import ( + "gitlink.org.cn/cloudream/common/pkgs/logger" + "gitlink.org.cn/cloudream/common/utils/config" + scmq "gitlink.org.cn/cloudream/scheduler/common/pkgs/mq" +) + +type Config struct { + MaxRepCount int `json:"maxRepCount"` + Logger logger.Config `json:"logger"` + RabbitMQ scmq.Config `json:"rabbitMQ"` +} + +var cfg Config + +func Init() error { + return config.DefaultLoad("client", &cfg) +} + +func Cfg() *Config { + return &cfg +} diff --git a/client/internal/http/http.go b/client/internal/http/http.go new file mode 100644 index 0000000..20b1394 --- /dev/null +++ b/client/internal/http/http.go @@ -0,0 +1,24 @@ +package http + +import "gitlink.org.cn/cloudream/common/consts/errorcode" + +type Response struct { + Code string `json:"code"` + Message string `json:"message"` + Data any `json:"data"` +} + +func OK(data any) Response { + return Response{ + Code: errorcode.OK, + Message: "", + Data: data, + } +} + +func Failed(code string, msg string) Response { + return Response{ + Code: code, + Message: msg, + } +} diff --git a/client/internal/http/jobset.go b/client/internal/http/jobset.go new file mode 100644 index 0000000..abf649b --- /dev/null +++ b/client/internal/http/jobset.go @@ -0,0 +1,80 @@ +package http + +import ( + "io" + "net/http" + + "github.com/gin-gonic/gin" + "gitlink.org.cn/cloudream/common/consts/errorcode" + "gitlink.org.cn/cloudream/common/models" + "gitlink.org.cn/cloudream/common/pkgs/logger" +) + +type JobSetService struct { + *Server +} + +func (s *Server) JobSetSvc() *JobSetService { + return &JobSetService{ + Server: s, + } +} + +type JobSetSubmitResp struct { + JobSetID string `json:"jobSetID"` +} + +func (s *JobSetService) Submit(ctx *gin.Context) { + log := logger.WithField("HTTP", "JobSet.Submit") + + bodyData, err := io.ReadAll(ctx.Request.Body) + if err != nil { + log.Warnf("reading request body: %s", err.Error()) + ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "read request body failed")) + return + } + + jobSetInfo, err := models.JobSetInfoFromJSON(bodyData) + if err != nil { + log.Warnf("parsing request body: %s", err.Error()) + ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) + return + } + + jobSetID, err := s.svc.JobSetSvc().Submit(*jobSetInfo) + if err != nil { + log.Warnf("submitting jobset: %s", err.Error()) + ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "submit jobset failed")) + return + } + + ctx.JSON(http.StatusOK, OK(JobSetSubmitResp{ + JobSetID: jobSetID, + })) +} + +type JobSetSetLocalFileReq struct { + JobSetID string `json:"jobSetID" binding:"required"` + LocalPath string `json:"localPath" binding:"required"` + PackageID *int64 `json:"packageID" binding:"required"` +} + +func (s *JobSetService) SetLocalFile(ctx *gin.Context) { + log := logger.WithField("HTTP", "JobSet.SetLocalFile") + + var req JobSetSetLocalFileReq + if err := ctx.ShouldBindJSON(&req); err != nil { + log.Warnf("binding body: %s", err.Error()) + ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) + return + } + + err := s.svc.JobSetSvc().SetLocalFile(req.JobSetID, req.LocalPath, *req.PackageID) + if err != nil { + log.Warnf("setting local file: %s", err.Error()) + ctx.JSON(http.StatusBadRequest, Failed(errorcode.OperationFailed, "set local file failed")) + return + } + + ctx.JSON(http.StatusOK, OK(nil)) +} diff --git a/client/internal/http/server.go b/client/internal/http/server.go new file mode 100644 index 0000000..43b9c57 --- /dev/null +++ b/client/internal/http/server.go @@ -0,0 +1,43 @@ +package http + +import ( + "github.com/gin-gonic/gin" + "gitlink.org.cn/cloudream/common/pkgs/logger" + "gitlink.org.cn/cloudream/scheduler/client/internal/services" +) + +type Server struct { + engine *gin.Engine + listenAddr string + svc *services.Service +} + +func NewServer(listenAddr string, svc *services.Service) (*Server, error) { + engine := gin.New() + + return &Server{ + engine: engine, + listenAddr: listenAddr, + svc: svc, + }, nil +} + +func (s *Server) Serve() error { + s.initRouters() + + logger.Infof("start serving http at: %s", s.listenAddr) + err := s.engine.Run(s.listenAddr) + + if err != nil { + logger.Infof("http stopped with error: %s", err.Error()) + return err + } + + logger.Infof("http stopped") + return nil +} + +func (s *Server) initRouters() { + s.engine.POST("/jobSet/submit", s.JobSetSvc().Submit) + s.engine.POST("/jobSet/setLocalFile", s.JobSetSvc().SetLocalFile) +} diff --git a/client/internal/services/jobset.go b/client/internal/services/jobset.go new file mode 100644 index 0000000..b782b2c --- /dev/null +++ b/client/internal/services/jobset.go @@ -0,0 +1,23 @@ +package services + +import "gitlink.org.cn/cloudream/common/models" + +type JobSetService struct { + *Service +} + +func (svc *Service) JobSetSvc() *JobSetService { + return &JobSetService{Service: svc} +} + +// 提交任务集 +func (svc *JobSetService) Submit(info models.JobSetInfo) (string, error) { + // TODO + return "testID", nil +} + +// 任务集中某个文件上传完成 +func (svc *JobSetService) SetLocalFile(jobSetID string, localPath string, packageID int64) error { + // TODO + return nil +} diff --git a/client/internal/services/service.go b/client/internal/services/service.go new file mode 100644 index 0000000..7509579 --- /dev/null +++ b/client/internal/services/service.go @@ -0,0 +1,8 @@ +package services + +type Service struct { +} + +func NewService() (*Service, error) { + return &Service{}, nil +} diff --git a/client/main.go b/client/main.go new file mode 100644 index 0000000..8fd1b96 --- /dev/null +++ b/client/main.go @@ -0,0 +1,44 @@ +package main + +import ( + "fmt" + "os" + + _ "google.golang.org/grpc/balancer/grpclb" + + "gitlink.org.cn/cloudream/common/pkgs/logger" + "gitlink.org.cn/cloudream/scheduler/client/internal/cmdline" + "gitlink.org.cn/cloudream/scheduler/client/internal/config" + "gitlink.org.cn/cloudream/scheduler/client/internal/services" + "gitlink.org.cn/cloudream/scheduler/common/globals" +) + +func main() { + err := config.Init() + if err != nil { + fmt.Printf("init config failed, err: %s", err.Error()) + os.Exit(1) + } + + err = logger.Init(&config.Cfg().Logger) + if err != nil { + fmt.Printf("init logger failed, err: %s", err.Error()) + os.Exit(1) + } + + globals.InitMQPool(&config.Cfg().RabbitMQ) + + svc, err := services.NewService() + if err != nil { + logger.Warnf("new services failed, err: %s", err.Error()) + os.Exit(1) + } + + cmds, err := cmdline.NewCommandline(svc) + if err != nil { + logger.Warnf("new command line failed, err: %s", err.Error()) + os.Exit(1) + } + + cmds.DispatchCommand(os.Args[1:]) +} diff --git a/common/assets/confs/dcontroller.config.json b/common/assets/confs/client.config.json similarity index 88% rename from common/assets/confs/dcontroller.config.json rename to common/assets/confs/client.config.json index 81eb6c7..30c649f 100644 --- a/common/assets/confs/dcontroller.config.json +++ b/common/assets/confs/client.config.json @@ -1,7 +1,7 @@ { "logger": { "output": "file", - "outputFileName": "dcontroller", + "outputFileName": "client", "outputDirectory": "log", "level": "debug" }, diff --git a/common/assets/confs/executor.config.json b/common/assets/confs/executor.config.json new file mode 100644 index 0000000..74ad9e9 --- /dev/null +++ b/common/assets/confs/executor.config.json @@ -0,0 +1,17 @@ +{ + "logger": { + "output": "file", + "outputFileName": "executor", + "outputDirectory": "log", + "level": "debug" + }, + "rabbitMQ": { + "address": "127.0.0.1:5672", + "account": "cloudream", + "password": "123456", + "vhost": "/" + }, + "cloudreamStorage": { + "url": "http://127.0.0.1:7890" + } +} \ No newline at end of file diff --git a/common/models/job.go b/common/models/job.go deleted file mode 100644 index 64fc04b..0000000 --- a/common/models/job.go +++ /dev/null @@ -1,64 +0,0 @@ -package models - -type JobSetInfo struct { - Jobs []any `json:"jobs"` -} - -type NormalJobInfo struct { - LocalJobID string `json:"localJobID"` - Type string `json:"type"` - Files JobFilesInfo `json:"files"` - Runtime JobRuntimeInfo `json:"runtime"` - Resources JobResourcesInfo `json:"resources"` -} - -type ResourceJobInfo struct { - LocalJobID string `json:"localJobID"` - Type string `json:"type"` - TargetLocalJobID string `json:"targetLocalJobID"` -} - -type JobFilesInfo struct { - Dateset any `json:"dataset"` - Code any `json:"code"` - Image any `json:"image"` -} - -type PackageFileInfo struct { - Type string `json:"type"` - PackageID int64 `json:"packageID"` -} - -type LocalFileInfo struct { - Type string `json:"type"` - LocalPath string `json:"localPath"` -} - -type ResourceFileInfo struct { - Type string `json:"type"` - ResourceLocalJobID string `json:"resourceLocalJobID"` -} - -type ImageFileInfo struct { - Type string `json:"type"` - ImageID string `json:"imageID"` -} - -type JobRuntimeInfo struct { - Command string `json:"command"` - Envs []EnvVar `json:"envs"` -} - -type EnvVar struct { - Var string `json:"var"` - Value string `json:"value"` -} - -type JobResourcesInfo struct { - CPU float64 `json:"cpu"` - GPU float64 `json:"gpu"` - NPU float64 `json:"npu"` - MLU float64 `json:"mlu"` - Storage int64 `json:"storage"` - Memory int64 `json:"memory"` -} diff --git a/common/pkgs/mq/collector/apis.go b/common/pkgs/mq/collector/apis.go index 556a4a2..5d7bd78 100644 --- a/common/pkgs/mq/collector/apis.go +++ b/common/pkgs/mq/collector/apis.go @@ -3,7 +3,6 @@ package collector import ( "gitlink.org.cn/cloudream/common/models" "gitlink.org.cn/cloudream/common/pkgs/mq" - myreflect "gitlink.org.cn/cloudream/common/utils/reflect" ) // 获取package的缓存分布情况 @@ -149,12 +148,5 @@ func (c *Client) GetAllResourceData(msg GetAllResourceData, opts ...mq.RequestOp } func init() { - mq.RegisterTypeSet[models.ResourceData]( - myreflect.TypeOf[models.CPUResourceData](), - myreflect.TypeOf[models.NPUResourceData](), - myreflect.TypeOf[models.GPUResourceData](), - myreflect.TypeOf[models.MLUResourceData](), - myreflect.TypeOf[models.StorageResourceData](), - myreflect.TypeOf[models.MemoryResourceData](), - ) + mq.RegisterUnionType(models.ResourceDataTypeUnion) } diff --git a/go.mod b/go.mod index 403e2f2..3116847 100644 --- a/go.mod +++ b/go.mod @@ -4,22 +4,49 @@ go 1.20 replace gitlink.org.cn/cloudream/common v0.0.0 => ../common -require gitlink.org.cn/cloudream/common v0.0.0 +require ( + github.com/gin-gonic/gin v1.9.1 + gitlink.org.cn/cloudream/common v0.0.0 + google.golang.org/grpc v1.54.0 +) require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 // indirect + github.com/bytedance/sonic v1.9.1 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.14.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/imdario/mergo v0.3.15 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/leodido/go-urn v1.2.4 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/samber/lo v1.36.0 // indirect github.com/sirupsen/logrus v1.9.2 // indirect github.com/streadway/amqp v1.1.0 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.11 // indirect github.com/zyedidia/generic v1.2.1 // indirect + golang.org/x/arch v0.3.0 // indirect + golang.org/x/crypto v0.9.0 // indirect golang.org/x/exp v0.0.0-20230519143937-03e91628a987 // indirect - golang.org/x/sys v0.6.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect + google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 94c265c..f7a58be 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,35 @@ github.com/antonfisher/nested-logrus-formatter v1.3.1 h1:NFJIr+pzwv5QLHTPyKz9UMEoHck02Q9L0FP13b/xSbQ= github.com/antonfisher/nested-logrus-formatter v1.3.1/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= +github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= +github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= +github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -17,12 +44,24 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/samber/lo v1.36.0 h1:4LaOxH1mHnbDGhTVE0i1z8v/lWaQW8AIfOD3HU4mSaw= @@ -34,18 +73,51 @@ github.com/smartystreets/goconvey v1.8.0 h1:Oi49ha/2MURE0WexF052Z0m+BNSGirfjg5RL github.com/streadway/amqp v1.1.0 h1:py12iX8XSyI7aN/3dUT8DFIDJazNJsVJdxNVEpnQTZM= github.com/streadway/amqp v1.1.0/go.mod h1:WYSrTEYHOXHd0nwFeUXAe2G2hRnQT+deZJJf88uS9Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/zyedidia/generic v1.2.1 h1:Zv5KS/N2m0XZZiuLS82qheRG4X1o5gsWreGb0hR7XDc= github.com/zyedidia/generic v1.2.1/go.mod h1:ly2RBz4mnz1yeuVbQA/VFwGjK3mnHGRj1JuoG336Bis= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= +golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20230519143937-03e91628a987 h1:3xJIFvzUFbu4ls0BTBYcgbCGhA63eAOEMxIHugyXJqA= golang.org/x/exp v0.0.0-20230519143937-03e91628a987/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd h1:sLpv7bNL1AsX3fdnWh9WVh7ejIzXdOc1RRHGeAmeStU= +google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/magefiles/main.go b/magefiles/main.go index 477fa48..5dc86e2 100644 --- a/magefiles/main.go +++ b/magefiles/main.go @@ -17,24 +17,19 @@ const ( BuildDir = "./build" ) -var Global = struct { - OS string - Arch string -}{} - // [配置项]设置编译平台为windows func Win() { - Global.OS = "win" + magefiles.Global.OS = "win" } // [配置项]设置编译平台为linux func Linux() { - Global.OS = "linux" + magefiles.Global.OS = "linux" } // [配置项]设置编译架构为amd64 func AMD64() { - Global.Arch = "amd64" + magefiles.Global.Arch = "amd64" } func All() error { @@ -54,9 +49,9 @@ func All() error { } func Bin() error { - //if err := Client(); err != nil { - // return err - //} + if err := Client(); err != nil { + return err + } if err := Collector(); err != nil { return err }