feat：定时触发器支持设置启动变量 TencentBlueKing#10617

hejieehe · Dec 3, 2024 · 132556e · 132556e
1 parent 8296349
commit 132556e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/...pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ElementTransfer.kt b/...pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ElementTransfer.kt
@@ -183,7 +183,7 @@ class ElementTransfer @Autowired(required = false) constructor(
                         branches = element.branches,
                         always = (element.noScm != true).nullIfDefault(false),
                         enable = element.elementEnabled().nullIfDefault(true),
-                        startParam = element.startParam
+                        startParams = element.startParams
                     )
                 )
                 return@forEach

diff --git a/...pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TriggerTransfer.kt b/...pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TriggerTransfer.kt
@@ -737,7 +737,7 @@ class TriggerTransfer @Autowired(required = false) constructor(
                         newExpression = timer.newExpression,
                         advanceExpression = timer.advanceExpression,
                         noScm = timer.always != true,
-                        startParam = timer.startParam
+                        startParams = timer.startParams
                     ).checkTriggerElementEnable(timer.enable)
                 )
             }

diff --git a/...peline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/SchedulesRule.kt b/...peline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/SchedulesRule.kt
@@ -62,7 +62,8 @@ data class SchedulesRule(
     var newExpression: List<String>? = null,
     @JsonIgnore
     var advanceExpression: List<String>? = null,
-    val startParam: Map<String, String>? = null
+    @get:Schema(title = "start-params")
+    val startParams: Map<String, String>? = null
 ) {
     data class Interval(
         val week: List<String>,

diff --git a/...ain/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/TimerTriggerElement.kt b/...ain/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/TimerTriggerElement.kt
@@ -64,7 +64,7 @@ data class TimerTriggerElement(
     @get:Schema(title = "指定代码库别名", required = false)
     val repoName: String? = null,
     @get:Schema(title = "定时启动参数", required = false)
-    val startParam: Map<String,String>? = null
+    val startParams: Map<String,String>? = null
 ) : Element(name, id, status) {
     companion object {
         const val classType = "timerTrigger"

diff --git a/.../kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt b/.../kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt
@@ -107,7 +107,7 @@ class TimerTriggerElementBizPlugin constructor(
                 branchs = element.branches?.toSet(),
                 noScm = element.noScm,
                 taskId = element.id ?: "",
-                startParam = element.startParam
+                startParam = element.startParams
             )
             logger.info("[$pipelineId]|$userId| Update pipeline timer|crontab=$crontabExpressions")
             if (result.isNotOk()) {

diff --git a/...n/kotlin/com/tencent/devops/process/plugin/trigger/service/PipelineTimerUpgradeService.kt b/...n/kotlin/com/tencent/devops/process/plugin/trigger/service/PipelineTimerUpgradeService.kt
@@ -129,7 +129,7 @@ open class PipelineTimerUpgradeService @Autowired constructor(
                                 pipelineId = pipelineId,
                                 taskId = timerTriggerElement.id ?: "",
                                 userId = lastModifyUser,
-                                startParam = timerTriggerElement.startParam,
+                                startParam = timerTriggerElement.startParams,
                                 crontabExpressionJson = crontab
                             )
                         }
@@ -179,7 +179,7 @@ open class PipelineTimerUpgradeService @Autowired constructor(
                 branchs = element.branches?.toSet(),
                 noScm = element.noScm,
                 taskId = element.id ?: "",
-                startParam = element.startParam
+                startParam = element.startParams
             )
         }
     }