Skip to content

Commit

Permalink
Merge pull request #10993 from royalhuang/issue_10958
Browse files Browse the repository at this point in the history
feat:推荐版本号优化 #10958
  • Loading branch information
bkci-bot authored Oct 15, 2024
2 parents 8c7ba46 + 60b2e87 commit d065486
Show file tree
Hide file tree
Showing 31 changed files with 240 additions and 147 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import com.tencent.devops.common.api.constant.CommonMessageCode.YAML_NOT_VALID
import com.tencent.devops.common.client.Client
import com.tencent.devops.common.pipeline.Model
import com.tencent.devops.common.pipeline.container.Stage
import com.tencent.devops.common.pipeline.container.TriggerContainer
import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType
import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting
import com.tencent.devops.common.pipeline.pojo.setting.Subscription
Expand Down Expand Up @@ -341,7 +340,7 @@ class ModelTransfer @Autowired constructor(
modelInput.model.stages[0].containers[0],
PipelineTransferAspectWrapper.AspectType.BEFORE
)
val triggers = (modelInput.model.stages[0].containers[0] as TriggerContainer).elements
val triggers = (modelInput.model.getTriggerContainer()).elements
val baseTrigger = elementTransfer.baseTriggers2yaml(triggers, modelInput.aspectWrapper)
?.toPre(modelInput.version)
val scmTrigger = elementTransfer.scmTriggers2Yaml(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ package com.tencent.devops.process.yaml.transfer
import com.tencent.devops.common.api.constant.CommonMessageCode.YAML_NOT_VALID
import com.tencent.devops.common.api.enums.ScmType
import com.tencent.devops.common.pipeline.Model
import com.tencent.devops.common.pipeline.container.TriggerContainer
import com.tencent.devops.common.pipeline.enums.BuildFormPropertyType
import com.tencent.devops.common.pipeline.pojo.BuildContainerType
import com.tencent.devops.common.pipeline.pojo.BuildFormProperty
Expand Down Expand Up @@ -60,7 +59,7 @@ class VariableTransfer {

fun makeVariableFromModel(model: Model): Map<String, Variable>? {
val result = mutableMapOf<String, Variable>()
(model.stages[0].containers[0] as TriggerContainer).params.forEach {
model.getTriggerContainer().params.forEach {
if (it.id in ignoredVariable) return@forEach
val props = when {
// 不带
Expand Down Expand Up @@ -163,19 +162,18 @@ class VariableTransfer {
}

fun makeRecommendedVersion(model: Model): RecommendedVersion? {
val triggerContainer = model.stages[0].containers[0] as TriggerContainer
val res = if (triggerContainer.buildNo != null) {
with(triggerContainer.buildNo) {
RecommendedVersion(
enabled = true, allowModifyAtStartup = this!!.required, buildNo = RecommendedVersion.BuildNo(
this.buildNo,
RecommendedVersion.Strategy.parse(this.buildNoType).alis
)
val triggerContainer = model.getTriggerContainer()
val res = triggerContainer.buildNo?.let {
RecommendedVersion(
enabled = true,
allowModifyAtStartup = it.required,
buildNo = RecommendedVersion.BuildNo(
it.buildNo, RecommendedVersion.Strategy.parse(it.buildNoType).alis
)
}
} else return null
)
} ?: return null

(model.stages[0].containers[0] as TriggerContainer).params.forEach {
triggerContainer.params.forEach {
if (it.id == MAJORVERSION || it.id == "MajorVersion") {
res.major = it.defaultValue.toString().toIntOrNull() ?: 0
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ package com.tencent.devops.common.pipeline
import com.tencent.devops.common.pipeline.container.Container
import com.tencent.devops.common.pipeline.container.NormalContainer
import com.tencent.devops.common.pipeline.container.Stage
import com.tencent.devops.common.pipeline.container.TriggerContainer
import com.tencent.devops.common.pipeline.container.VMBuildContainer
import com.tencent.devops.common.pipeline.event.CallBackEvent
import com.tencent.devops.common.pipeline.event.PipelineCallbackEvent
Expand Down Expand Up @@ -226,4 +227,6 @@ data class Model(
}
return pipelineCallBack
}

fun getTriggerContainer() = stages[0].containers[0] as TriggerContainer
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
package com.tencent.devops.common.pipeline.pojo

data class BuildNo(
var buildNo: Int,
var buildNo: Int, // 用于保存编排中定义的构建号初始值
val buildNoType: BuildNoType,
var required: Boolean? = false
var required: Boolean? = false,
var currentBuildNo: Int? = null // 用于替换当前的最新值,如果是创建流水线则不传值
)

enum class BuildNoType {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* 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

import io.swagger.v3.oas.annotations.media.Schema

@Schema(title = "流水线构建推荐版本号更新")
data class BuildNoUpdateReq(
@get:Schema(title = "推荐版本号buildNo当前值", required = true)
val currentBuildNo: Int
)
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import com.tencent.devops.common.api.pojo.Page
import com.tencent.devops.common.api.pojo.Result
import com.tencent.devops.common.pipeline.PipelineVersionWithModel
import com.tencent.devops.common.pipeline.PipelineVersionWithModelRequest
import com.tencent.devops.common.pipeline.pojo.BuildNoUpdateReq
import com.tencent.devops.common.pipeline.pojo.TemplateInstanceCreateRequest
import com.tencent.devops.common.pipeline.pojo.transfer.PreviewResponse
import com.tencent.devops.process.pojo.PipelineDetail
Expand Down Expand Up @@ -78,7 +79,7 @@ interface UserPipelineVersionResource {
pipelineId: String
): Result<PipelineDetail>

@Operation(summary = "将当前草稿发布为正式版本")
@Operation(summary = "草稿发布为正式版本的信息预览")
@GET
@Path("/projects/{projectId}/pipelines/{pipelineId}/releaseVersion/{version}/prefetch")
fun preFetchDraftVersion(
Expand Down Expand Up @@ -334,4 +335,21 @@ interface UserPipelineVersionResource {
@QueryParam("storageType")
storageType: String?
): Response

@Operation(summary = "重置流水线推荐版本号")
@POST
@Path("/projects/{projectId}/pipelines/{pipelineId}/updateBuildNo")
fun updateBuildNo(
@Parameter(description = "用户ID", required = true, example = AUTH_HEADER_USER_ID_DEFAULT_VALUE)
@HeaderParam(AUTH_HEADER_USER_ID)
userId: String,
@Parameter(description = "项目ID", required = true)
@PathParam("projectId")
projectId: String,
@Parameter(description = "流水线ID", required = true)
@PathParam("pipelineId")
pipelineId: String,
@Parameter(description = "流水线构建推荐版本号更新", required = true)
buildNo: BuildNoUpdateReq
): Result<Boolean>
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ enum class OperationLogType(val description: String) {
ADD_PIPELINE_TO_GROUP("将流水线添加到流水线组时:「添加到流水线组 a」"),
MOVE_PIPELINE_OUT_OF_GROUP("将流水线移出流水线组时:「从流水线组 a 中移出」"),
UPDATE_PIPELINE_SETTING("修改流水线设置:「修改配置新增版本 P2.T1.2」"),
RESET_RECOMMENDED_VERSION_BUILD_NO("重置流水线推荐版本号:「重置流水线推荐版本号为 xxx」"),
NORMAL_SAVE_OPERATION("普通保存操作");

fun getI18n(language: String): String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ data class DeployPipelineResult(
@get:Schema(title = "目标链接", required = false)
val targetUrl: String? = null,
@get:Schema(title = "yaml信息", required = false)
val yamlInfo: PipelineYamlVo? = null
val yamlInfo: PipelineYamlVo? = null,
@get:Schema(title = "是否更新了推荐版本号", required = false)
val updateBuildNo: Boolean? = null
)
Original file line number Diff line number Diff line change
Expand Up @@ -534,4 +534,8 @@ object PipelineVarUtil {

return "$majorVersion.$minorVersion.$fixVersion"
}

fun recommendVersionKey(key: String): Boolean {
return key == MAJORVERSION || key == MINORVERSION || key == FIXVERSION
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,12 @@ class PipelineBuildSummaryDao {
fun resetDebugInfo(
dslContext: DSLContext,
projectId: String,
pipelineId: String
pipelineId: String,
debugBuildNo: Int
) {
with(T_PIPELINE_BUILD_SUMMARY) {
dslContext.update(this)
.set(DEBUG_BUILD_NO, 0)
.set(DEBUG_BUILD_NO, debugBuildNo)
.set(DEBUG_BUILD_NUM, 0)
.where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId))).execute()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatch
import com.tencent.devops.common.pipeline.Model
import com.tencent.devops.common.pipeline.container.Container
import com.tencent.devops.common.pipeline.container.Stage
import com.tencent.devops.common.pipeline.container.TriggerContainer
import com.tencent.devops.common.pipeline.enums.BuildStatus
import com.tencent.devops.common.pipeline.enums.StartType
import com.tencent.devops.common.pipeline.pojo.BuildFormProperty
Expand Down Expand Up @@ -126,10 +125,9 @@ class PipelineBuildDetailService @Autowired constructor(
}
}

val triggerContainer = model.stages[0].containers[0] as TriggerContainer
val buildNo = triggerContainer.buildNo
if (buildNo != null) {
buildNo.buildNo = buildSummaryRecord?.buildNo ?: buildNo.buildNo
val triggerContainer = model.getTriggerContainer()
triggerContainer.buildNo?.apply {
currentBuildNo = buildSummaryRecord?.buildNo ?: buildNo
}
val params = triggerContainer.params
val newParams = ArrayList<BuildFormProperty>(params.size)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,11 @@ class PipelineRepositoryService constructor(
channelCode = channelCode,
yamlInfo = yamlInfo
)

val buildNo = (model.stages[0].containers[0] as TriggerContainer).buildNo
val triggerContainer = model.stages[0].containers[0] as TriggerContainer
val triggerContainer = model.getTriggerContainer()
val buildNo = triggerContainer.buildNo?.apply {
// #10958 每次存储model都需要忽略当前的推荐版本号值,在返回前端时重查
currentBuildNo = null
}
var canManualStartup = false
var canElementSkip = false
run lit@{
Expand Down Expand Up @@ -891,6 +893,7 @@ class PipelineRepositoryService constructor(
var operationLogParams = versionName
var branchAction: BranchVersionAction? = null
var versionNum: Int? = null
var updateBuildNo = false
try {
lock.lock()
dslContext.transaction { configuration ->
Expand Down Expand Up @@ -1059,6 +1062,11 @@ class PipelineRepositoryService constructor(
) throw ErrorCodeException(
errorCode = ProcessMessageCode.ERROR_VERSION_IS_NOT_UPDATED
)
releaseResource.model.getTriggerContainer().buildNo?.let {
if (draftVersion.model.getTriggerContainer().buildNo?.buildNo != it.buildNo) {
updateBuildNo = true
}
}
draftVersion.version
} else {
// 兼容逻辑:没有已有草稿保存正式版本时,直接增加正式版本,基准为上一个发布版本
Expand Down Expand Up @@ -1184,7 +1192,8 @@ class PipelineRepositoryService constructor(
pipelineName = model.name,
version = version,
versionNum = versionNum,
versionName = versionName
versionName = versionName,
updateBuildNo = updateBuildNo
)
}

Expand Down Expand Up @@ -1347,7 +1356,7 @@ class PipelineRepositoryService constructor(
)
// 返回时将别名name补全为id
resource?.let {
(resource.model.stages[0].containers[0] as TriggerContainer).params.forEach { param ->
resource.model.getTriggerContainer().params.forEach { param ->
param.name = param.name ?: param.id
}
}
Expand All @@ -1367,7 +1376,7 @@ class PipelineRepositoryService constructor(
)
// 返回时将别名name补全为id
resource?.let {
(resource.model.stages[0].containers[0] as TriggerContainer).params.forEach { param ->
resource.model.getTriggerContainer().params.forEach { param ->
param.name = param.name ?: param.id
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@

package com.tencent.devops.process.engine.service

import com.tencent.devops.common.api.exception.ErrorCodeException
import com.tencent.devops.common.api.util.PageUtil
import com.tencent.devops.common.api.util.timestampmilli
import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO
import com.tencent.devops.common.auth.enums.AuthSystemType
import com.tencent.devops.common.client.Client
import com.tencent.devops.common.pipeline.enums.VersionStatus
import com.tencent.devops.common.redis.RedisOperation
import com.tencent.devops.process.constant.ProcessMessageCode
import com.tencent.devops.process.engine.control.lock.PipelineModelLock
import com.tencent.devops.process.engine.control.lock.PipelineVersionLock
import com.tencent.devops.process.engine.dao.PipelineBuildDao
Expand All @@ -48,7 +46,6 @@ import com.tencent.devops.process.pojo.setting.PipelineVersionSimple
import com.tencent.devops.process.utils.PipelineVersionUtils
import com.tencent.devops.project.api.service.ServiceProjectResource
import org.jooq.DSLContext
import org.jooq.impl.DSL
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Service
import java.util.concurrent.Executors
Expand Down Expand Up @@ -107,23 +104,8 @@ class PipelineRepositoryVersionService(
val pipelineVersionLock = PipelineVersionLock(redisOperation, pipelineId, version)
try {
pipelineVersionLock.lock()
val count = pipelineBuildDao.countBuildNumByVersion(
dslContext = dslContext,
projectId = projectId,
pipelineId = pipelineId,
version = version
)
if (count > 0) {
throw ErrorCodeException(
errorCode = ProcessMessageCode.ERROR_PIPELINE_CAN_NOT_DELETE_WHEN_HAVE_BUILD_RECORD
)
}
dslContext.transaction { t ->
val transactionContext = DSL.using(t)
// #8161 软删除数据,前端无法查询到该版本
pipelineResourceVersionDao.deleteByVersion(transactionContext, projectId, pipelineId, version)
// pipelineSettingVersionDao.deleteByVer(transactionContext, projectId, pipelineId, version)
}
// #8161 软删除数据,前端无法查询到该版本
pipelineResourceVersionDao.deleteByVersion(dslContext, projectId, pipelineId, version)
} finally {
pipelineVersionLock.unlock()
}
Expand Down Expand Up @@ -190,13 +172,12 @@ class PipelineRepositoryVersionService(
)
}

fun listPipelineVersion(
fun listPipelineReleaseVersion(
pipelineInfo: PipelineInfo?,
projectId: String,
pipelineId: String,
offset: Int,
limit: Int,
includeDraft: Boolean?,
excludeVersion: Int?,
versionName: String?,
creator: String?,
Expand All @@ -210,27 +191,12 @@ class PipelineRepositoryVersionService(
dslContext = dslContext,
projectId = projectId,
pipelineId = pipelineId,
includeDraft = includeDraft,
includeDraft = false,
versionName = versionName,
creator = creator,
description = description
)
// 草稿单独提出来放在第一页,其他版本后插入结果
val result = mutableListOf<PipelineVersionSimple>()
if (includeDraft != false && offset == 0) {
pipelineResourceVersionDao.getDraftVersionResource(
dslContext = dslContext,
projectId = projectId,
pipelineId = pipelineId
)?.toSimple()?.apply {
baseVersionName = baseVersion?.let {
pipelineResourceVersionDao.getPipelineVersionSimple(
dslContext, projectId, pipelineId, it
)?.versionName
}
}?.let { result.add(it) }
}
val others = pipelineResourceVersionDao.listPipelineVersion(
val result = pipelineResourceVersionDao.listPipelineVersion(
dslContext = dslContext,
projectId = projectId,
pipelineId = pipelineId,
Expand All @@ -242,8 +208,7 @@ class PipelineRepositoryVersionService(
excludeVersion = excludeVersion,
offset = offset,
limit = limit
)
result.addAll(others)
).toMutableList()

// #8161 当过滤草稿时查到空结果是正常的,只在不过滤草稿时兼容老数据的版本表无记录
val noSearch = versionName.isNullOrBlank() && creator.isNullOrBlank() && description.isNullOrBlank()
Expand Down
Loading

0 comments on commit d065486

Please sign in to comment.