From b47019b8b6157c004064664264f136dc70dafc07 Mon Sep 17 00:00:00 2001 From: huanghongbo-hhb Date: Thu, 21 May 2026 16:27:43 +0800 Subject: [PATCH 1/2] fix: preserve long test and scanning name compatibility Signed-off-by: huanghongbo-hhb --- pkg/microservice/aslan/core/common/util/workflow.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/microservice/aslan/core/common/util/workflow.go b/pkg/microservice/aslan/core/common/util/workflow.go index c4be944872..b61ff6b47d 100644 --- a/pkg/microservice/aslan/core/common/util/workflow.go +++ b/pkg/microservice/aslan/core/common/util/workflow.go @@ -49,12 +49,20 @@ func GenTestingWorkflowName(testingName string) string { return fmt.Sprintf(setting.TestWorkflowNamingConvention, testingName) } +func normalizeWorkflowJobName(name string) string { + jobName := []rune(strings.ToLower(name)) + if len(jobName) > 32 { + jobName = jobName[:32] + } + return strings.TrimSuffix(string(jobName), "-") +} + func GenerateTestingModuleJobName(name string) string { - return strings.ToLower(name) + return normalizeWorkflowJobName(name) } func GenerateScanningModuleJobName(name string) string { - return strings.ToLower(name) + return normalizeWorkflowJobName(name) } func ValidateGeneratedWorkflowJobName(name string, generator func(string) string) error { From 6d59f078e37b9bca79b96ae7974d99eb84500a5f Mon Sep 17 00:00:00 2001 From: huanghongbo-hhb Date: Fri, 22 May 2026 09:49:09 +0800 Subject: [PATCH 2/2] fix: generate valid execution job names for test and scan Signed-off-by: huanghongbo-hhb --- .../aslan/core/common/util/workflow.go | 23 +++++++++++-------- .../core/workflow/testing/service/scanning.go | 2 +- .../workflow/testing/service/test_task.go | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkg/microservice/aslan/core/common/util/workflow.go b/pkg/microservice/aslan/core/common/util/workflow.go index b61ff6b47d..cf0c4835ab 100644 --- a/pkg/microservice/aslan/core/common/util/workflow.go +++ b/pkg/microservice/aslan/core/common/util/workflow.go @@ -49,20 +49,23 @@ func GenTestingWorkflowName(testingName string) string { return fmt.Sprintf(setting.TestWorkflowNamingConvention, testingName) } -func normalizeWorkflowJobName(name string) string { - jobName := []rune(strings.ToLower(name)) - if len(jobName) > 32 { - jobName = jobName[:32] - } - return strings.TrimSuffix(string(jobName), "-") -} - func GenerateTestingModuleJobName(name string) string { - return normalizeWorkflowJobName(name) + return strings.ToLower(name) } func GenerateScanningModuleJobName(name string) string { - return normalizeWorkflowJobName(name) + return strings.ToLower(name) +} + +func GenerateExecutionModuleJobName(name string) string { + jobName := []rune(strings.ToLower(name)) + if len(jobName) > 32 { + jobName = jobName[:32] + if len(jobName) > 0 && jobName[len(jobName)-1] == '-' { + jobName = jobName[:len(jobName)-1] + } + } + return string(jobName) } func ValidateGeneratedWorkflowJobName(name string, generator func(string) string) error { diff --git a/pkg/microservice/aslan/core/workflow/testing/service/scanning.go b/pkg/microservice/aslan/core/workflow/testing/service/scanning.go index 4475ce3ceb..cacf7b2b56 100644 --- a/pkg/microservice/aslan/core/workflow/testing/service/scanning.go +++ b/pkg/microservice/aslan/core/workflow/testing/service/scanning.go @@ -543,7 +543,7 @@ func generateCustomWorkflowFromScanningModule(scanInfo *commonmodels.Scanning, a job := make([]*commonmodels.Job, 0) job = append(job, &commonmodels.Job{ - Name: commonutil.GenerateScanningModuleJobName(scanInfo.Name), + Name: commonutil.GenerateExecutionModuleJobName(scanInfo.Name), JobType: config.JobZadigScanning, Skipped: false, Spec: &commonmodels.ZadigScanningJobSpec{ diff --git a/pkg/microservice/aslan/core/workflow/testing/service/test_task.go b/pkg/microservice/aslan/core/workflow/testing/service/test_task.go index c2e84b1b27..0736dc34c9 100644 --- a/pkg/microservice/aslan/core/workflow/testing/service/test_task.go +++ b/pkg/microservice/aslan/core/workflow/testing/service/test_task.go @@ -340,7 +340,7 @@ func generateCustomWorkflowFromTestingModule(testInfo *commonmodels.Testing, arg job := make([]*commonmodels.Job, 0) job = append(job, &commonmodels.Job{ - Name: util.GenerateTestingModuleJobName(testInfo.Name), + Name: util.GenerateExecutionModuleJobName(testInfo.Name), JobType: config.JobZadigTesting, Skipped: false, Spec: &commonmodels.ZadigTestingJobSpec{