feat：保存流水线时，校验是否有子流水线循环依赖 TencentBlueKing#10479

hejieehe · Nov 25, 2024 · 021a537 · 021a537
1 parent 6b8f9d7
commit 021a537
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...ss/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/SubPipelineRef.kt b/...ss/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/SubPipelineRef.kt
@@ -95,5 +95,8 @@ data class SubPipelineRef(
     fun subRefKey() = "$subProjectId|$subPipelineId"
 
     // 链路打印
-    fun chainKey() = "$projectId|$pipelineId|$taskSeq"
+    fun chainKey() = "$projectId|$pipelineId|$stageId-$containerId-$taskSeq"
+
+    // 插件下标
+    fun relSeq() = "$stageId-$containerId-$taskSeq"
 }
diff --git a/...biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineCheckService.kt b/...biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineCheckService.kt
@@ -310,7 +310,7 @@ class SubPipelineCheckService @Autowired constructor(
                     val editUrl = pipelineEditUrl(projectId, pipelineId)
                     ProcessMessageCode.BK_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_MESSAGE to arrayOf(
                         editUrl,
-                        "${subPipelineRef.pipelineName} [${subPipelineRef.taskSeq}]"
+                        "${subPipelineRef.pipelineName} [${subPipelineRef.relSeq()}]"
                     )
                 }
                 // [其他流水线_1] -> [其他流水线_2]
@@ -320,7 +320,7 @@ class SubPipelineCheckService @Autowired constructor(
                     val editUrl = pipelineEditUrl(projectId, pipelineId)
                     ProcessMessageCode.BK_OTHER_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_MESSAGE to arrayOf(
                         editUrl,
-                        "${subPipelineRef.pipelineName} [${subPipelineRef.taskSeq}]",
+                        "${subPipelineRef.pipelineName} [${subPipelineRef.relSeq()}]",
                         editUrlBase,
                         parentPipelineRef.pipelineName.ifBlank { subPipelineRef.pipelineName }
                     )