feat(ios-action): create runner-task with org-id

erda-project · Jul 5, 2024 · 7109d6c · 7109d6c
1 parent a402016
commit 7109d6c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/actions/ios/1.0/internal/conf/conf.go b/actions/ios/1.0/internal/conf/conf.go
@@ -9,6 +9,7 @@ type Conf struct {
 	DiceOpenapiPrefix string `env:"DICE_OPENAPI_ADDR" required:"true"`
 	PipelineTaskID    string `env:"PIPELINE_TASK_ID" required:"true"`
 	PipelineID        string `env:"PIPELINE_ID" required:"true"`
+	DiceOrgID         int64  `env:"DICE_ORG_ID" required:"true"`
 
 	Commands        []string             `env:"ACTION_COMMANDS"`
 	Targets         []string             `env:"ACTION_TARGETS"`

diff --git a/actions/ios/1.0/internal/pkg/build/api.go b/actions/ios/1.0/internal/pkg/build/api.go
@@ -47,7 +47,7 @@ func UpdateTaskStatus(cfg conf.Conf, taskID int64, status string) error {
 	return nil
 }
 
-func CreateTask(cfg conf.Conf, req *apistructs.CreateRunnerTaskRequest) (int64, error) {
+func CreateTask(cfg conf.Conf, req *CreateRunnerTaskRequest) (int64, error) {
 	var resp apistructs.CreateRunnerTaskResponse
 	request := httpclient.New(httpclient.WithCompleteRedirect()).Post(cfg.DiceOpenapiPrefix).
 		Path(fmt.Sprintf("/api/runner/tasks")).

diff --git a/actions/ios/1.0/internal/pkg/build/build.go b/actions/ios/1.0/internal/pkg/build/build.go
@@ -39,6 +39,11 @@ type RunnerTask struct {
 	ResultDataUrl  string `json:"result_data_url"`
 }
 
+type CreateRunnerTaskRequest struct {
+	apistructs.CreateRunnerTaskRequest
+	OrgID int64 `json:"org_id"`
+}
+
 func Execute() error {
 
 	envconf.MustLoad(&cfg)
@@ -115,15 +120,19 @@ func Execute() error {
 	}
 
 	commands = append(commands, cfg.Commands...)
-	createReq := &apistructs.CreateRunnerTaskRequest{
+	createReq := apistructs.CreateRunnerTaskRequest{
 		JobID:          cfg.PipelineTaskLogID,
 		ContextDataUrl: uploadResult.Data.DownloadURL,
 		Commands:       commands,
 		WorkDir:        strings.Replace(cfg.Context, cfg.PipelineContext+"/", "", -1),
 		Targets:        cfg.Targets,
 	}
+	createReqWithOrg := CreateRunnerTaskRequest{
+		CreateRunnerTaskRequest: createReq,
+		OrgID:                   cfg.DiceOrgID,
+	}
 
-	taskID, err := CreateTask(cfg, createReq)
+	taskID, err := CreateTask(cfg, &createReqWithOrg)
 	if err != nil {
 		return err
 	}