feat：流水线变量语法支持两种风格 TencentBlueKing#10576

mingshewhe · Aug 26, 2024 · d333cc9 · d333cc9
1 parent 1617e09
commit d333cc9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/...n-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/PipelineVersionWithModel.kt b/...n-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/PipelineVersionWithModel.kt
@@ -56,5 +56,5 @@ data class PipelineVersionWithModel(
     @get:Schema(title = "更新操作人", required = true)
     val updater: String?,
     @get:Schema(title = "版本修改时间", required = true)
-    val updateTime: LocalDateTime?
+    val updateTime: Long?
 )
diff --git a/...-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt b/...-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt
@@ -400,7 +400,7 @@ class PipelineBuildService(
         val longVarNames = context.pipelineParamMap.filter {
             it.value.value.toString().length >= PIPELINE_VARIABLES_STRING_LENGTH_MAX
         }.map { it.key }
-        if (!pipelineDialect.supportLongVarValue()) {
+        if (longVarNames.isNotEmpty() && !pipelineDialect.supportLongVarValue()) {
             throw ErrorCodeException(
                 errorCode = ProcessMessageCode.ERROR_PIPELINE_VARIABLES_OUT_OF_LENGTH,
                 params = arrayOf(longVarNames.toString())

diff --git a/...rocess/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt b/...rocess/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt
@@ -644,7 +644,7 @@ class PipelineVersionFacadeService @Autowired constructor(
             yamlSupported = yamlSupported,
             yamlInvalidMsg = msg,
             updater = resource.updater,
-            updateTime = resource.updateTime
+            updateTime = resource.updateTime?.timestampmilli()
         )
     }
 

diff --git a/...ker-common/src/main/kotlin/com/tencent/devops/worker/common/task/market/MarketAtomTask.kt b/...ker-common/src/main/kotlin/com/tencent/devops/worker/common/task/market/MarketAtomTask.kt
@@ -491,7 +491,7 @@ open class MarketAtomTask : ITask() {
         val dialect = PipelineDialectEnums.getDialect(asCodeSettings)
         val atomParams = mutableMapOf<String, String>()
         try {
-            if (asCodeEnabled || !dialect.supportSingleCurlyBracesVar()) {
+            if (!dialect.supportUseSingleCurlyBracesVar()) {
                 val customReplacement = EnvReplacementParser.getCustomExecutionContextByMap(
                     variables = variables,
                     extendNamedValueMap = listOf(

diff --git a/...er/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ICommand.kt b/...er/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ICommand.kt
@@ -85,9 +85,8 @@ interface ICommand {
         ).toMutableMap()
         // 增加上下文的替换
         PipelineVarUtil.fillContextVarMap(contextMap)
-        val asCodeEnabled = asCodeSettings?.enable
         val dialect = PipelineDialectEnums.getDialect(asCodeSettings)
-        return if (asCodeEnabled == true || !dialect.supportSingleCurlyBracesVar()) {
+        return if (!dialect.supportUseSingleCurlyBracesVar()) {
             EnvReplacementParser.parse(
                 value = command,
                 contextMap = contextMap,