feat：支持管理员查看项目成员 #9620 子流水线启动日志埋点

TencentBlueKing · Aug 20, 2024 · 0bc0135 · 0bc0135
1 parent a3e76f2
commit 0bc0135
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...on-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt b/...on-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt
@@ -43,6 +43,7 @@ interface ModelCheckPlugin {
 
     /**
      * 检查[model]编排的完整性，并返回[JobSize + ElementSize = MetaSize]所有元素数量
+     * @param userId 当前流水线权限代持人
      * @throws RuntimeException 子类  将检查失败或异常的以[ErrorCodeException]类抛出
      */
     @Throws(ErrorCodeException::class)

diff --git a/...se/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt b/...se/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt
@@ -340,8 +340,8 @@ class PipelineRepositoryService constructor(
         channelCode: ChannelCode,
         yamlInfo: PipelineYamlVo? = null
     ): List<PipelineModelTask> {
-
-        val metaSize = modelCheckPlugin.checkModelIntegrity(model, projectId, userId)
+        val oauthUser = getPipelineOauthUser(projectId, pipelineId) ?: userId
+        val metaSize = modelCheckPlugin.checkModelIntegrity(model, projectId, oauthUser)
         // 去重id
         val distinctIdSet = HashSet<String>(metaSize, 1F /* loadFactor */)
 

diff --git a/support-files/i18n/process/message_en_US.properties b/support-files/i18n/process/message_en_US.properties
@@ -768,7 +768,7 @@ trigger.build.param.codeP4WebHookTrigger.common=SVN Trigger - Common
 bkRepoTriggerPrActionNotMatch=Pull request action does not match
 bkAgentReuseMutex=AgentReuseMutex[{0}]|
 bkAgentReuseMutexAgentIdNull=AgentReuseMutex|AgentId is null|
-bkNotSubPipelineExecutePermissionErrorTitle=User [{0}] does not have execution permission for the following sub-pipelines, save failed:
+bkNotSubPipelineExecutePermissionErrorTitle=Authority holder [{0}] does not have execution permission for the following sub-pipelines, save failed:
 bkNotSubPipelineExecutePermissionErrorMessage=Stage[{0}]-Job[{1}]-Step[{2}]:<a target="_blank" href="{3}">{4}</a>
 bkPipelineElementCheckFailedMessage=Pipeline plugin validity check failed
 bkRepoTriggerMrActionNotMatch=Merge request action does not match

diff --git a/support-files/i18n/process/message_zh_CN.properties b/support-files/i18n/process/message_zh_CN.properties
@@ -768,7 +768,7 @@ trigger.build.param.codeP4WebHookTrigger.common=P4 事件触发 - 公共变量
 bkRepoTriggerPrActionNotMatch=Pull request 动作不满足触发条件
 bkAgentReuseMutex=Agent复用互斥组Mutex[{0}]|
 bkAgentReuseMutexAgentIdNull=Agent复用互斥组Mutex|AgentId为空|
-bkNotSubPipelineExecutePermissionErrorTitle=用户[{0}]没有如下子流水线的执行权限，保存失败:
+bkNotSubPipelineExecutePermissionErrorTitle=流水线权限代持人[{0}]没有如下子流水线的执行权限，保存失败:
 bkNotSubPipelineExecutePermissionErrorMessage=Stage[{0}]-Job[{1}]-Step[{2}]:<a target="_blank" href="{3}">{4}</a>
 bkPipelineElementCheckFailedMessage=流水线插件有效性校验失败
 bkRepoTriggerMrActionNotMatch=Merge request 动作不满足触发条件