fix job task name in vm deploy job (#3971)

Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
koderover · Jan 21, 2025 · 48407d8 · 48407d8
1 parent 5a655c7
commit 48407d8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/job/job.go b/pkg/microservice/aslan/core/workflow/service/workflow/job/job.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/koderover/zadig/v2/pkg/util"
-	"github.com/mozillazg/go-pinyin"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 
@@ -567,35 +566,35 @@ func JobSkiped(job *commonmodels.Job) bool {
 }
 
 // use service name and service module hash to generate job name
-func jobNameFormat(jobName string) string {
-	if len(jobName) <= 63 {
-		jobName = strings.Trim(jobName, "-")
-		jobName = strings.ToLower(jobName)
-		return jobName
-	}
-
-	pyArgs := pinyin.NewArgs()
-	pyArgs.Fallback = func(r rune, a pinyin.Args) []string {
-		return []string{string(r)}
-	}
-
-	res := pinyin.Pinyin(jobName, pyArgs)
-
-	pinyins := make([]string, 0)
-	for _, py := range res {
-		pinyins = append(pinyins, strings.Join(py, ""))
-	}
-
-	resp := strings.Join(pinyins, "")
-	if len(resp) > 63 {
-		resp = strings.TrimSuffix(resp[:63], "-")
-		resp = strings.ToLower(resp)
-		return resp
-	}
-	resp = strings.TrimSuffix(resp, "-")
-	resp = strings.ToLower(resp)
-	return resp
-}
+// func jobNameFormat(jobName string) string {
+// 	if len(jobName) <= 63 {
+// 		jobName = strings.Trim(jobName, "-")
+// 		jobName = strings.ToLower(jobName)
+// 		return jobName
+// 	}
+
+// 	pyArgs := pinyin.NewArgs()
+// 	pyArgs.Fallback = func(r rune, a pinyin.Args) []string {
+// 		return []string{string(r)}
+// 	}
+
+// 	res := pinyin.Pinyin(jobName, pyArgs)
+
+// 	pinyins := make([]string, 0)
+// 	for _, py := range res {
+// 		pinyins = append(pinyins, strings.Join(py, ""))
+// 	}
+
+// 	resp := strings.Join(pinyins, "")
+// 	if len(resp) > 63 {
+// 		resp = strings.TrimSuffix(resp[:63], "-")
+// 		resp = strings.ToLower(resp)
+// 		return resp
+// 	}
+// 	resp = strings.TrimSuffix(resp, "-")
+// 	resp = strings.ToLower(resp)
+// 	return resp
+// }
 
 // before workflowflow task was created, we need to remove the fixed mark from variables.
 func RemoveFixedValueMarks(workflow *commonmodels.WorkflowV4) error {

diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/job/job_vm_deploy.go b/pkg/microservice/aslan/core/workflow/service/workflow/job/job_vm_deploy.go
@@ -89,18 +89,18 @@ func (j *VMDeployJob) SetPreset() error {
 		if err != nil {
 			err = fmt.Errorf("can't find service %s in project %s, error: %v", serviceAndVMDeploy.ServiceName, j.workflow.Project, err)
 			log.Error(err)
-			return fmt.Errorf(err.Error())
+			return err
 		}
 		if templateSvc.BuildName == "" {
 			err = fmt.Errorf("service %s in project %s has no deploy", serviceAndVMDeploy.ServiceName, j.workflow.Project)
 			log.Error(err)
-			return fmt.Errorf(err.Error())
+			return err
 		}
 		build, err := commonrepo.NewBuildColl().Find(&commonrepo.BuildFindOption{Name: templateSvc.BuildName, ProductName: j.workflow.Project})
 		if err != nil {
 			err = fmt.Errorf("can't find build %s in project %s, error: %v", templateSvc.BuildName, j.workflow.Project, err)
 			log.Error(err)
-			return fmt.Errorf(err.Error())
+			return err
 		}
 		serviceAndVMDeploy.Repos = mergeRepos(serviceAndVMDeploy.Repos, build.DeployRepos)
 	}
@@ -655,7 +655,7 @@ func (j *VMDeployJob) getOriginReferedJobTargets(jobName string, taskID int) ([]
 				if err := commonmodels.IToi(job.Spec, buildSpec); err != nil {
 					return serviceAndVMDeploys, err
 				}
-				for _, build := range buildSpec.ServiceAndBuilds {
+				for i, build := range buildSpec.ServiceAndBuilds {
 					serviceAndVMDeploys = append(serviceAndVMDeploys, &commonmodels.ServiceAndVMDeploy{
 						ServiceName:   build.ServiceName,
 						ServiceModule: build.ServiceModule,
@@ -664,7 +664,7 @@ func (j *VMDeployJob) getOriginReferedJobTargets(jobName string, taskID int) ([]
 						TaskID:        taskID,
 						WorkflowName:  j.workflow.Name,
 						WorkflowType:  config.WorkflowTypeV4,
-						JobTaskName:   jobNameFormat(build.ServiceName + "-" + build.ServiceModule + "-" + jobName),
+						JobTaskName:   GenJobName(j.workflow, job.Name, i),
 					})
 					log.Infof("DeployJob ToJobs getOriginReferedJobTargets: workflow %s service %s, module %s, fileName %s",
 						j.workflow.Name, build.ServiceName, build.ServiceModule, build.Package)