-
Notifications
You must be signed in to change notification settings - Fork 505
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5902 from Tencent/r1724
v1.7.24
- Loading branch information
Showing
25 changed files
with
838 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
...s/src/main/kotlin/com/tencent/devops/process/api/template/UserPipelineTemplateResource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * 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.process.api.template | ||
|
|
||
| import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID | ||
| import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID_DEFAULT_VALUE | ||
| import com.tencent.devops.common.api.pojo.Result | ||
| import com.tencent.devops.process.pojo.template.TemplateListModel | ||
| import com.tencent.devops.process.pojo.template.TemplateModelDetail | ||
| import com.tencent.devops.process.pojo.template.TemplateType | ||
| import io.swagger.annotations.Api | ||
| import io.swagger.annotations.ApiOperation | ||
| import io.swagger.annotations.ApiParam | ||
| import javax.ws.rs.Consumes | ||
| import javax.ws.rs.GET | ||
| import javax.ws.rs.HeaderParam | ||
| import javax.ws.rs.Path | ||
| import javax.ws.rs.PathParam | ||
| import javax.ws.rs.Produces | ||
| import javax.ws.rs.QueryParam | ||
| import javax.ws.rs.core.MediaType | ||
|
|
||
| @Api(tags = ["USER_PIPELINE_TEMPLATE"], description = "用户-流水线-模板资源") | ||
| // @Path("/user/templatePipelines") | ||
| @Path("/user/template/pipelines") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @Consumes(MediaType.APPLICATION_JSON) | ||
| interface UserPipelineTemplateResource { | ||
|
|
||
| @ApiOperation("质量红线-获取模版列表") | ||
| @GET | ||
| @Path("/projects/{projectId}/listQualityViewTemplates") | ||
| fun listQualityViewTemplates( | ||
| @ApiParam(value = "用户ID", required = true, defaultValue = AUTH_HEADER_USER_ID_DEFAULT_VALUE) | ||
| @HeaderParam(AUTH_HEADER_USER_ID) | ||
| userId: String, | ||
| @ApiParam("项目ID", required = true) | ||
| @PathParam("projectId") | ||
| projectId: String, | ||
| @ApiParam("模版类型", required = false) | ||
| @QueryParam("templateType") | ||
| templateType: TemplateType?, | ||
| @ApiParam("是否已关联到store", required = false) | ||
| @QueryParam("storeFlag") | ||
| storeFlag: Boolean?, | ||
| @ApiParam("页码", required = false) | ||
| @QueryParam("page") | ||
| page: Int?, | ||
| @ApiParam("每页数量", required = false) | ||
| @QueryParam("pageSize") | ||
| pageSize: Int?, | ||
| @ApiParam("模板名称关键字", required = false) | ||
| @QueryParam("keywords") | ||
| keywords: String? | ||
| ): Result<TemplateListModel> | ||
|
|
||
| @ApiOperation("获取单个流水线信息接口") | ||
| @GET | ||
| @Path("/project/{projectId}/template/{templateId}/getTemplateInfo") | ||
| fun getTemplateInfo( | ||
| @ApiParam(value = "用户ID", required = true, defaultValue = AUTH_HEADER_USER_ID_DEFAULT_VALUE) | ||
| @HeaderParam(AUTH_HEADER_USER_ID) | ||
| userId: String, | ||
| @ApiParam("项目ID", required = true) | ||
| @PathParam("projectId") | ||
| projectId: String, | ||
| @ApiParam("模板ID", required = true) | ||
| @PathParam("templateId") | ||
| templateId: String | ||
| ): Result<TemplateModelDetail> | ||
| } |
87 changes: 87 additions & 0 deletions
87
...rocess/src/main/kotlin/com/tencent/devops/process/api/user/UserPipelineQualityResource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * 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.process.api.user | ||
|
|
||
| import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID | ||
| import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID_DEFAULT_VALUE | ||
| import com.tencent.devops.common.api.pojo.Result | ||
| import com.tencent.devops.common.pipeline.enums.ChannelCode | ||
| import com.tencent.devops.process.pojo.PipelineListRequest | ||
| import com.tencent.devops.process.engine.pojo.PipelineInfo | ||
| import com.tencent.devops.process.pojo.Pipeline | ||
| import io.swagger.annotations.Api | ||
| import io.swagger.annotations.ApiOperation | ||
| import io.swagger.annotations.ApiParam | ||
| import javax.ws.rs.Consumes | ||
| import javax.ws.rs.GET | ||
| import javax.ws.rs.HeaderParam | ||
| import javax.ws.rs.POST | ||
| import javax.ws.rs.Path | ||
| import javax.ws.rs.PathParam | ||
| import javax.ws.rs.Produces | ||
| import javax.ws.rs.QueryParam | ||
| import javax.ws.rs.core.MediaType | ||
|
|
||
| @Api(tags = ["USER_QUALITY_PIPELINE"], description = "用户-质量红线-流水线资源") | ||
| @Path("/user/pipeline/quality") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @Consumes(MediaType.APPLICATION_JSON) | ||
| interface UserPipelineQualityResource { | ||
|
|
||
| @ApiOperation("获取单个流水线信息接口") | ||
| @GET | ||
| @Path("/project/{projectId}/pipeline/{pipelineId}/getPipelineInfo") | ||
| fun getPipelineInfo( | ||
| @ApiParam(value = "用户ID", required = true, defaultValue = AUTH_HEADER_USER_ID_DEFAULT_VALUE) | ||
| @HeaderParam(AUTH_HEADER_USER_ID) | ||
| userId: String, | ||
| @ApiParam("项目ID", required = true) | ||
| @PathParam("projectId") | ||
| projectId: String, | ||
| @ApiParam("流水线ID", required = true) | ||
| @PathParam("pipelineId") | ||
| pipelineId: String, | ||
| @ApiParam("渠道号", required = false) | ||
| @QueryParam("channelCode") | ||
| channelCode: ChannelCode? | ||
| ): Result<PipelineInfo> | ||
|
|
||
| @ApiOperation("根据id列出流水线") | ||
| @POST | ||
| @Path("/{projectId}/") | ||
| fun list( | ||
| @ApiParam(value = "用户ID", required = true, defaultValue = AUTH_HEADER_USER_ID_DEFAULT_VALUE) | ||
| @HeaderParam(AUTH_HEADER_USER_ID) | ||
| userId: String, | ||
| @ApiParam("原子类型", required = true) | ||
| @PathParam("projectId") | ||
| projectId: String, | ||
| @ApiParam("流水线ID", required = true) | ||
| request: PipelineListRequest? | ||
| ): Result<List<Pipeline>> | ||
| } |
75 changes: 75 additions & 0 deletions
75
...i-process/src/main/kotlin/com/tencent/devops/process/api/user/UserQualityBuildResource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * 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.process.api.user | ||
|
|
||
| import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID | ||
| import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID_DEFAULT_VALUE | ||
| import com.tencent.devops.common.api.pojo.Result | ||
| import com.tencent.devops.common.pipeline.enums.ManualReviewAction | ||
| import io.swagger.annotations.Api | ||
| import io.swagger.annotations.ApiOperation | ||
| import io.swagger.annotations.ApiParam | ||
| import javax.ws.rs.Consumes | ||
| import javax.ws.rs.HeaderParam | ||
| import javax.ws.rs.POST | ||
| import javax.ws.rs.Path | ||
| import javax.ws.rs.PathParam | ||
| import javax.ws.rs.Produces | ||
| import javax.ws.rs.core.MediaType | ||
|
|
||
| @Api(tags = ["USER_QUALITY_BUILD"], description = "用户-构建红线") | ||
| @Path("/user/quality/builds") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @Consumes(MediaType.APPLICATION_JSON) | ||
| @Suppress("ALL") | ||
| interface UserQualityBuildResource { | ||
|
|
||
| @ApiOperation("质量红线人工审核") | ||
| @POST | ||
| @Path("/{projectId}/{pipelineId}/{buildId}/{elementId}/qualityGateReview/{action}") | ||
| fun manualQualityGateReview( | ||
| @ApiParam(value = "用户ID", required = true, defaultValue = AUTH_HEADER_USER_ID_DEFAULT_VALUE) | ||
| @HeaderParam(AUTH_HEADER_USER_ID) | ||
| userId: String, | ||
| @ApiParam("项目ID", required = true) | ||
| @PathParam("projectId") | ||
| projectId: String, | ||
| @ApiParam("流水线ID", required = true) | ||
| @PathParam("pipelineId") | ||
| pipelineId: String, | ||
| @ApiParam("构建ID", required = true) | ||
| @PathParam("buildId") | ||
| buildId: String, | ||
| @ApiParam("步骤Id", required = true) | ||
| @PathParam("elementId") | ||
| elementId: String, | ||
| @ApiParam("动作", required = true) | ||
| @PathParam("action") | ||
| action: ManualReviewAction | ||
| ): Result<Boolean> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.