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

src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt

@@ -56,7 +56,8 @@ interface ModelCheckPlugin {
         userId: String,
         isTemplate: Boolean = false,
         oauthUser: String? = null,
-        pipelineDialect: IPipelineDialect? = null
+        pipelineDialect: IPipelineDialect? = null,
+        pipelineId: String = ""
     ): Int
 
     /**

src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/SubPipelineCallElement.kt

@@ -51,7 +51,8 @@ data class SubPipelineCallElement(
 ) : Element(name, id, status) {
     companion object {
         const val classType = "subPipelineCall"
+        const val TASK_ATOM = "subPipelineCallAtom"
     }
-    override fun getTaskAtom() = "subPipelineCallAtom"
+    override fun getTaskAtom() = TASK_ATOM
     override fun getClassType() = classType
 }

src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/atom/ElementBatchCheckParam.kt

@@ -0,0 +1,40 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.devops.common.pipeline.pojo.element.atom
+
+/**
+ * 插件检查参数
+ */
+data class ElementBatchCheckParam(
+    val projectId: String?,
+    val pipelineId: String,
+    val userId: String,
+    val contextMap: Map<String, String>,
+    val isTemplate: Boolean,
+    val oauthUser: String?
+)

src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/atom/ElementHolder.kt

@@ -0,0 +1,41 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.devops.common.pipeline.pojo.element.atom
+
+import com.tencent.devops.common.pipeline.container.Container
+import com.tencent.devops.common.pipeline.container.Stage
+import com.tencent.devops.common.pipeline.pojo.element.Element
+
+/**
+ * 插件引用信息
+ */
+data class ElementHolder(
+    val element: Element,
+    val stage: Stage,
+    val container: Container
+)

src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/utils/ThreadPoolUtil.kt → src/backend/ci/core/common/common-util/src/main/kotlin/com/tencent/devops/common/util/ThreadPoolUtil.kt

@@ -24,9 +24,8 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.tencent.devops.store.common.utils
+package com.tencent.devops.common.util
 
-import com.tencent.devops.store.atom.service.impl.OpAtomServiceImpl
 import java.util.concurrent.Executors
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.ThreadPoolExecutor
@@ -72,5 +71,5 @@ object ThreadPoolUtil {
         logger.info("$actionTitle time cost: ${System.currentTimeMillis() - startTime}")
     }
 
-    private val logger = LoggerFactory.getLogger(OpAtomServiceImpl::class.java)
+    private val logger = LoggerFactory.getLogger(ThreadPoolUtil::class.java)
 }

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/op/OpSubPipelineRefResource.kt

@@ -0,0 +1,64 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.devops.process.api.op
+
+import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID
+import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID_DEFAULT_VALUE
+import com.tencent.devops.common.api.pojo.Result
+import io.swagger.v3.oas.annotations.tags.Tag
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.Parameter
+import javax.ws.rs.Consumes
+import javax.ws.rs.HeaderParam
+import javax.ws.rs.POST
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.MediaType
+
+@Tag(name = "OP_PIPELINE_AGENT_REF", description = "OP-流水线-更新子流水线引用信息")
+@Path("/op/subpipeline/ref")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+interface OpSubPipelineRefResource {
+
+    @Operation(summary = "更新子流水线引用信息")
+    @POST
+    @Path("/create")
+    fun createSubPipelineRef(
+        @Parameter(description = "用户ID", required = true, example = AUTH_HEADER_USER_ID_DEFAULT_VALUE)
+        @HeaderParam(AUTH_HEADER_USER_ID)
+        userId: String,
+        @Parameter(description = "项目ID", required = false)
+        @QueryParam("projectId")
+        projectId: String?,
+        @Parameter(description = "流水线id", required = false)
+        @QueryParam("pipelineId")
+        pipelineId: String?
+    ): Result<Boolean>
+}

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt

@@ -558,4 +558,18 @@ object ProcessMessageCode {
     // 用户[xxx] 没有如下子流水线的执行权限，重置授权失败
     const val BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_RESET_ERROR_TITLE =
         "bkNotSubPipelineExecutePermissionResetErrorTitle"
+    // 子流水线循环依赖错误标题
+    const val BK_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_TITLE = "bkSubPipelineCircularDependencyErrorTitle"
+
+    // 当前流水线存在循环依赖
+    const val BK_CURRENT_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_MESSAGE =
+        "bkCurrentSubPipelineCircularDependencyErrorMessage"
+
+    // 子流水线[xxx]调用了当前流水线，形成循环依赖
+    const val BK_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_MESSAGE =
+        "bkSubPipelineCircularDependencyErrorMessage"
+
+    // [xxx]流水线循环调用[xxx]流水线，形成循环依赖
+    const val BK_OTHER_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_MESSAGE =
+        "bkOtherSubPipelineCircularDependencyErrorMessage"
 }

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/PipelineModelTask.kt

@@ -46,7 +46,10 @@ data class PipelineModelTask(
     val taskAtom: String,
     val taskParams: MutableMap<String, Any>,
     val additionalOptions: ElementAdditionalOptions?,
-    val os: String? = "linux"
+    val os: String? = "linux",
+    val taskPosition: String = "", // 插件在model中的位置，eg: stageSeq-jobSeq-taskSeq
+    val stageEnable: Boolean = true,
+    val containerEnable: Boolean = true
 ) {
     fun getTaskParam(paramName: String): String {
         return if (taskParams[paramName] != null) {

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/SubPipelineIdAndName.kt

@@ -0,0 +1,37 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.devops.process.pojo.pipeline
+
+/**
+ * 子流水线ID和名称
+ */
+data class SubPipelineIdAndName(
+    val projectId: String,
+    val pipelineId: String,
+    val pipelineName: String
+)

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/SubPipelineRef.kt

@@ -0,0 +1,92 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.devops.process.pojo.pipeline
+
+import com.tencent.devops.common.pipeline.pojo.element.Element
+import com.tencent.devops.common.pipeline.pojo.element.EmptyElement
+import com.tencent.devops.common.pipeline.pojo.element.atom.SubPipelineType
+import io.swagger.v3.oas.annotations.media.Schema
+
+@Schema(title = "子流水线依赖信息")
+data class SubPipelineRef(
+    @get:Schema(title = "流水线Id", required = true)
+    val pipelineId: String,
+    @get:Schema(title = "流水线名称", required = true)
+    val pipelineName: String,
+    @get:Schema(title = "流水线项目Id", required = true)
+    val projectId: String,
+    @get:Schema(title = "流水线项目渠道", required = true)
+    val channel: String,
+    @get:Schema(title = "插件", required = true)
+    val element: Element,
+    @get:Schema(title = "插件所在位置[stageIndex-containerIndex-taskIndex]", required = true)
+    val taskPosition: String,
+    @get:Schema(title = "子流水线流水线Id", required = true)
+    val subPipelineId: String,
+    @get:Schema(title = "子流水线项目Id", required = true)
+    val subProjectId: String,
+    @get:Schema(title = "子流水线名称", required = true)
+    val subPipelineName: String,
+    @get:Schema(title = "校验权限用户", required = true)
+    val userId: String = "",
+    @get:Schema(title = "插件启用状态", required = true)
+    val elementEnable: Boolean = true,
+    @get:Schema(title = "是否为模板流水线", required = true)
+    val isTemplate: Boolean = false,
+    @get:Schema(title = "插件参数[projectId]", required = false)
+    val taskProjectId: String = "",
+    @get:Schema(title = "插件参数[type]", required = false)
+    val taskPipelineType: SubPipelineType = SubPipelineType.ID,
+    @get:Schema(title = "插件参数[pipelineId]", required = false)
+    val taskPipelineId: String? = "",
+    @get:Schema(title = "插件参数[pipelineName]", required = false)
+    val taskPipelineName: String? = ""
+) {
+    constructor(projectId: String, pipelineId: String, subPipelineId: String, subProjectId: String) : this(
+        pipelineId = pipelineId,
+        pipelineName = "",
+        projectId = projectId,
+        channel = "",
+        element = EmptyElement(),
+        subPipelineId = subPipelineId,
+        subProjectId = subProjectId,
+        subPipelineName = "",
+        userId = "",
+        elementEnable = true,
+        isTemplate = false,
+        taskPosition = ""
+    )
+
+    // 递归检查使用
+    fun refKey() = "$projectId|$pipelineId"
+
+    fun subRefKey() = "$subProjectId|$subPipelineId"
+
+    // 链路打印
+    fun chainKey() = "$projectId|$pipelineId|$taskPosition"
+}

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/SubPipelineTaskParam.kt

@@ -0,0 +1,49 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.tencent.devops.process.pojo.pipeline
+
+import com.tencent.devops.common.pipeline.pojo.element.atom.SubPipelineType
+import io.swagger.v3.oas.annotations.media.Schema
+
+@Schema(title = "子流水线插件参数")
+data class SubPipelineTaskParam(
+    @get:Schema(title = "源参数值[projectId]", required = false)
+    val taskProjectId: String = "",
+    @get:Schema(title = "源参数值[type]", required = false)
+    val taskPipelineType: SubPipelineType = SubPipelineType.ID,
+    @get:Schema(title = "源参数值[pipelineId]", required = false)
+    val taskPipelineId: String? = null,
+    @get:Schema(title = "源参数值[pipelineName]", required = false)
+    val taskPipelineName: String? = null,
+    @get:Schema(title = "解析后[projectId]", required = false)
+    val projectId: String = "",
+    @get:Schema(title = "解析后[pipelineId]", required = false)
+    val pipelineId: String = "",
+    @get:Schema(title = "解析后[pipelineName]", required = false)
+    val pipelineName: String = ""
+)