-
Notifications
You must be signed in to change notification settings - Fork 498
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat:流水线变量语法支持两种风格 #10576 #10961
base: master
Are you sure you want to change the base?
feat:流水线变量语法支持两种风格 #10576 #10961
Conversation
@@ -1598,6 +1608,24 @@ abstract class AbsProjectServiceImpl @Autowired constructor( | |||
deptName: String? | |||
) | |||
|
|||
override fun getPipelineDialect(projectId: String): String { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
此方法不需要,统一由项目VO缓存,在修改项目处增加方案提示:注意:该配置可能会影响项目下所有流水线行为,配置更新需要10分钟
@@ -297,7 +297,7 @@ class SubPipelineRepositoryService @Autowired constructor( | |||
val trigger = stages.getOrNull(0) | |||
?: throw ErrorCodeException(errorCode = ProcessMessageCode.ERROR_PIPELINE_MODEL_NEED_JOB) | |||
// 检查触发容器 | |||
val paramsMap = defaultModelCheckPlugin.checkTriggerContainer(trigger) | |||
val paramsMap = defaultModelCheckPlugin.checkTriggerContainer(trigger, false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
check
...biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt
Outdated
Show resolved
Hide resolved
var newValue = value | ||
if (dialect.supportUseSingleCurlyBracesVar()) { | ||
newValue = ObjectReplaceEnvVarUtil.replaceEnvVar(newValue, contextMap).let { | ||
JsonUtil.toJson(it, false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
原有逻辑是否json转换
@@ -31,3 +31,4 @@ const val EXCHANGE_PROJECT_COUNT_LOGIN = "exchange_project_count_login" | |||
const val ROUTE_PROJECT_COUNT_LOGIN = "route_project_count_login" | |||
const val QUEUE_PROJECT_COUNT_LOGIN = "queue_project_count_login" | |||
const val SECRECY_PROJECT_REDIS_KEY = "SECRECY_PROJECT_REDIS_KEY" // 保密项目Key | |||
const val PROJECT_PIPELINE_DIALECT_REDIS_KEY = "project:pipeline:dialect" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
不需要此redis 缓存key
@@ -378,4 +378,13 @@ interface ServiceProjectResource { | |||
@QueryParam("englishName") | |||
englishName: List<String> | |||
): Result<List<String>?> | |||
|
|||
@Operation(summary = "获取项目级流水线方言, 流水线编辑/修改时调用") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
del; 此方法不需要了,方言统一由项目返回
方言设计:
引擎执行设计