diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index cdc0aa42843..75a8fc5c6fe 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -5,7 +5,7 @@ name: Frontend CI on: push: - branches: [master] + branches: ["*"] paths: - "src/frontend/**" pull_request: diff --git a/docs/overview/db/devops_ci_artifactory.md b/docs/overview/db/devops_ci_artifactory.md index aa233af1dff..b13839df9a4 100644 --- a/docs/overview/db/devops_ci_artifactory.md +++ b/docs/overview/db/devops_ci_artifactory.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_artifactory -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_artifactory 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_auth.md b/docs/overview/db/devops_ci_auth.md index a3b30e4d45c..ae8fd164cb8 100644 --- a/docs/overview/db/devops_ci_auth.md +++ b/docs/overview/db/devops_ci_auth.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_auth -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_auth 的数据库文档 | 表名 | 说明 | @@ -27,8 +27,12 @@ | T_AUTH_OAUTH2_SCOPE | 授权范围表 | | T_AUTH_OAUTH2_SCOPE_OPERATION | 授权操作信息表 | | T_AUTH_RESOURCE | 资源表 | +| T_AUTH_RESOURCE_AUTHORIZATION | 资源授权管理表 | | T_AUTH_RESOURCE_GROUP | 资源关联用户组表 | +| T_AUTH_RESOURCE_GROUP_APPLY | 用户组申请记录表 | | T_AUTH_RESOURCE_GROUP_CONFIG | 资源用户组配置表 | +| T_AUTH_RESOURCE_GROUP_MEMBER | 资源组成员 | +| T_AUTH_RESOURCE_SYNC | 同步 IAM 资源 | | T_AUTH_RESOURCE_TYPE | 权限资源类型表 | | T_AUTH_STRATEGY | 权限策略表 | | T_AUTH_TEMPORARY_VERIFY_RECORD | 迁移-鉴权记录表 | @@ -375,6 +379,25 @@ | 11 | CREATE_USER | varchar | 64 | 0 | N | N | | 创建者 | | 12 | UPDATE_USER | varchar | 64 | 0 | N | N | | 修改人 | +**表名：** T_AUTH_RESOURCE_AUTHORIZATION + +**说明：** 资源授权管理表 + +**数据列：** + +| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 | +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +| 1 | ID | bigint | 20 | 0 | N | Y | | 主键 ID | +| 2 | PROJECT_CODE | varchar | 32 | 0 | N | N | | 项目 ID | +| 3 | RESOURCE_TYPE | varchar | 32 | 0 | N | N | | 资源类型 | +| 4 | RESOURCE_CODE | varchar | 255 | 0 | N | N | | 资源 ID | +| 5 | RESOURCE_NAME | varchar | 255 | 0 | N | N | | 资源名 | +| 6 | HANDOVER_FROM | varchar | 64 | 0 | N | N | | 授予人 | +| 7 | HANDOVER_FROM_CN_NAME | varchar | 64 | 0 | N | N | | 授予人中文名称 | +| 8 | HANDOVER_TIME | timestamp | 19 | 0 | N | N | CURRENT_TIMESTAMP | 授予时间 | +| 9 | CREATE_TIME | timestamp | 19 | 0 | Y | N | CURRENT_TIMESTAMP | 创建时间 | +| 10 | UPDATE_TIME | timestamp | 19 | 0 | Y | N | CURRENT_TIMESTAMP | 更新时间 | + **表名：** T_AUTH_RESOURCE_GROUP **说明：** 资源关联用户组表 @@ -395,6 +418,25 @@ | 10 | RELATION_ID | varchar | 32 | 0 | N | N | | 关联的 IAM 组 ID | | 11 | CREATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 创建时间 | | 12 | UPDATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | +| 13 | DESCRIPTION | varchar | 512 | 0 | Y | N | | 用户组描述 | +| 14 | IAM_TEMPLATE_ID | int | 10 | 0 | Y | N | | 人员模板 ID | + +**表名：** T_AUTH_RESOURCE_GROUP_APPLY + +**说明：** 用户组申请记录表 + +**数据列：** + +| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 | +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +| 1 | ID | bigint | 20 | 0 | N | Y | | 主键 ID | +| 2 | PROJECT_CODE | varchar | 64 | 0 | N | N | | 项目 ID | +| 3 | MEMBER_ID | varchar | 64 | 0 | N | N | | 成员 ID | +| 4 | IAM_GROUP_ID | int | 10 | 0 | N | N | | IAM 组 ID | +| 5 | STATUS | int | 10 | 0 | Y | N | 0 | 状态,0-审批中,1-审批成功,2-审批超时 | +| 6 | NUMBER_OF_CHECKS | int | 10 | 0 | Y | N | 0 | 检查次数，用于同步组数据 | +| 7 | CREATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 创建时间 | +| 8 | UPDATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | **表名：** T_AUTH_RESOURCE_GROUP_CONFIG @@ -416,6 +458,42 @@ | 10 | CREATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 创建时间 | | 11 | UPDATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | +**表名：** T_AUTH_RESOURCE_GROUP_MEMBER + +**说明：** 资源组成员 + +**数据列：** + +| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 | +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +| 1 | ID | bigint | 20 | 0 | N | Y | | 主键 ID | +| 2 | PROJECT_CODE | varchar | 64 | 0 | N | N | | 项目 ID | +| 3 | RESOURCE_TYPE | varchar | 32 | 0 | N | N | | 资源类型 | +| 4 | RESOURCE_CODE | varchar | 255 | 0 | N | N | | 资源 ID | +| 5 | GROUP_CODE | varchar | 32 | 0 | N | N | | 用户组标识 | +| 6 | IAM_GROUP_ID | int | 10 | 0 | N | N | | IAM 组 ID | +| 7 | MEMBER_ID | varchar | 64 | 0 | N | N | | 成员 ID | +| 8 | MEMBER_NAME | varchar | 512 | 0 | N | N | | 成员名 | +| 9 | MEMBER_TYPE | varchar | 32 | 0 | N | N | | 成员类型,用户/组织/模板 | +| 10 | EXPIRED_TIME | datetime | 19 | 0 | N | N | | 过期时间 | +| 11 | CREATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 创建时间 | +| 12 | UPDATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | + +**表名：** T_AUTH_RESOURCE_SYNC + +**说明：** 同步 IAM 资源 + +**数据列：** + +| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 | +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +| 1 | PROJECT_CODE | varchar | 64 | 0 | N | Y | | 项目 ID | +| 2 | STATUS | int | 10 | 0 | Y | N | 0 | 迁移状态,0-同步中,1-同步成功,2-同步失败 | +| 3 | ERROR_MESSAGE | text | 65535 | 0 | Y | N | | 错误信息 | +| 4 | TOTAL_TIME | bigint | 20 | 0 | Y | N | | 总耗时 | +| 5 | CREATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 创建时间 | +| 6 | UPDATE_TIME | datetime | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | + **表名：** T_AUTH_RESOURCE_TYPE **说明：** 权限资源类型表 diff --git a/docs/overview/db/devops_ci_dispatch.md b/docs/overview/db/devops_ci_dispatch.md index 1f54524f78c..6d2b38941b0 100644 --- a/docs/overview/db/devops_ci_dispatch.md +++ b/docs/overview/db/devops_ci_dispatch.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_dispatch -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_dispatch 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_environment.md b/docs/overview/db/devops_ci_environment.md index f6f82037fee..ccd99671861 100644 --- a/docs/overview/db/devops_ci_environment.md +++ b/docs/overview/db/devops_ci_environment.md @@ -2,11 +2,12 @@ **数据库名：** devops_ci_environment -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_environment 的数据库文档 | 表名 | 说明 | | :---: | :---: | +| T_AGENT_BATCH_INSTALL_TOKEN | | | T_AGENT_FAILURE_NOTIFY_USER | | | T_AGENT_PIPELINE_REF | | | T_AGENT_SHARE_PROJECT | | @@ -21,6 +22,20 @@ | T_NODE | 节点信息表 | | T_PROJECT_CONFIG | | +**表名：** T_AGENT_BATCH_INSTALL_TOKEN + +**说明：** + +**数据列：** + +| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 | +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +| 1 | PROJECT_ID | varchar | 64 | 0 | N | Y | | 项目 ID | +| 2 | USER_ID | varchar | 64 | 0 | N | Y | | token 用户 | +| 3 | TOKEN | varchar | 64 | 0 | N | N | | Base64 编码后 TOKEN | +| 4 | CREATED_TIME | datetime | 19 | 0 | N | N | | 创建时间 | +| 5 | EXPIRED_TIME | datetime | 19 | 0 | N | N | | 过期时间 | + **表名：** T_AGENT_FAILURE_NOTIFY_USER **说明：** diff --git a/docs/overview/db/devops_ci_image.md b/docs/overview/db/devops_ci_image.md index 88dcb3cf826..026cda3dba6 100644 --- a/docs/overview/db/devops_ci_image.md +++ b/docs/overview/db/devops_ci_image.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_image -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_image 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_log.md b/docs/overview/db/devops_ci_log.md index 2cde1010584..3a8c4f23dfe 100644 --- a/docs/overview/db/devops_ci_log.md +++ b/docs/overview/db/devops_ci_log.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_log -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_log 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_notify.md b/docs/overview/db/devops_ci_notify.md index 23faa1c80be..342c4c6aaa8 100644 --- a/docs/overview/db/devops_ci_notify.md +++ b/docs/overview/db/devops_ci_notify.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_notify -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_notify 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_op.md b/docs/overview/db/devops_ci_op.md index 061645ae86c..a303de8b68d 100644 --- a/docs/overview/db/devops_ci_op.md +++ b/docs/overview/db/devops_ci_op.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_op -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_op 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_openapi.md b/docs/overview/db/devops_ci_openapi.md index ac602f24397..169895172c6 100644 --- a/docs/overview/db/devops_ci_openapi.md +++ b/docs/overview/db/devops_ci_openapi.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_openapi -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_openapi 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_plugin.md b/docs/overview/db/devops_ci_plugin.md index ecaacc564ae..ac496d2a91b 100644 --- a/docs/overview/db/devops_ci_plugin.md +++ b/docs/overview/db/devops_ci_plugin.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_plugin -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_plugin 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_process.md b/docs/overview/db/devops_ci_process.md index 82aba3c8d41..6a304b0b10d 100644 --- a/docs/overview/db/devops_ci_process.md +++ b/docs/overview/db/devops_ci_process.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_process -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_process 的数据库文档 | 表名 | 说明 | @@ -177,6 +177,7 @@ | 14 | CONTAINER_HASH_ID | varchar | 64 | 0 | Y | N | | 容器全局唯一 ID | | 15 | MATRIX_GROUP_FLAG | bit | 1 | 0 | Y | N | | 是否为构建矩阵 | | 16 | MATRIX_GROUP_ID | varchar | 64 | 0 | Y | N | | 所属的矩阵组 ID | +| 17 | JOB_ID | varchar | 128 | 0 | Y | N | | jobid | **表名：** T_PIPELINE_BUILD_DETAIL @@ -403,6 +404,7 @@ | 16 | START_TIME | datetime | 23 | 0 | Y | N | | 开始时间 | | 17 | END_TIME | datetime | 23 | 0 | Y | N | | 结束时间 | | 18 | TIMESTAMPS | text | 65535 | 0 | Y | N | | 运行中产生的时间戳集合 | +| 19 | ASYNC_STATUS | varchar | 32 | 0 | Y | N | | 插件异步执行状态 | **表名：** T_PIPELINE_BUILD_STAGE @@ -491,6 +493,7 @@ | 28 | PLATFORM_ERROR_CODE | int | 10 | 0 | Y | N | | 对接平台错误码 | | 29 | CONTAINER_HASH_ID | varchar | 64 | 0 | Y | N | | 构建 Job 唯一标识 | | 30 | STEP_ID | varchar | 64 | 0 | Y | N | | 标识上下文的自定义 ID | +| 31 | JOB_ID | varchar | 128 | 0 | Y | N | | jobid | **表名：** T_PIPELINE_BUILD_TEMPLATE_ACROSS_INFO @@ -595,6 +598,7 @@ | 16 | PIPELINE_NAME_PINYIN | varchar | 1300 | 0 | Y | N | | 流水线名称拼音 | | 17 | LATEST_START_TIME | datetime | 23 | 0 | Y | N | | 最近启动时间 | | 18 | LATEST_VERSION_STATUS | varchar | 64 | 0 | Y | N | | 最新分布版本状态 | +| 19 | LOCKED | bit | 1 | 0 | Y | N | b'0' | 是否锁定，PACv3.0 新增锁定，取代原来 setting 表中的 LOCK | **表名：** T_PIPELINE_JOB_MUTEX_GROUP @@ -775,7 +779,8 @@ | 18 | STATUS | varchar | 16 | 0 | Y | N | | 版本状态 | | 19 | BRANCH_ACTION | varchar | 32 | 0 | Y | N | | 分支状态 | | 20 | DESCRIPTION | text | 65535 | 0 | Y | N | | 版本变更说明 | -| 21 | UPDATE_TIME | timestamp | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | +| 21 | UPDATER | varchar | 64 | 0 | Y | N | | 最近更新人 | +| 22 | UPDATE_TIME | timestamp | 19 | 0 | N | N | CURRENT_TIMESTAMP | 更新时间 | **表名：** T_PIPELINE_RULE diff --git a/docs/overview/db/devops_ci_project.md b/docs/overview/db/devops_ci_project.md index 69eaef1ea59..a8be36ea8d3 100644 --- a/docs/overview/db/devops_ci_project.md +++ b/docs/overview/db/devops_ci_project.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_project -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_project 的数据库文档 | 表名 | 说明 | @@ -392,6 +392,7 @@ | 26 | new_window | bit | 1 | 0 | Y | N | b'0' | 是否打开新标签页 | | 27 | new_windowUrl | varchar | 200 | 0 | Y | N | | 新标签页地址 | | 28 | cluster_type | varchar | 32 | 0 | N | N | | 集群类型 | +| 29 | DOC_URL | varchar | 255 | 0 | N | N | | 文档链接 | **表名：** T_SERVICE_TYPE diff --git a/docs/overview/db/devops_ci_quality.md b/docs/overview/db/devops_ci_quality.md index 1d302f1919b..dc2183cf289 100644 --- a/docs/overview/db/devops_ci_quality.md +++ b/docs/overview/db/devops_ci_quality.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_quality -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_quality 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_repository.md b/docs/overview/db/devops_ci_repository.md index c567433a243..0779c6f3556 100644 --- a/docs/overview/db/devops_ci_repository.md +++ b/docs/overview/db/devops_ci_repository.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_repository -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_repository 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_sign.md b/docs/overview/db/devops_ci_sign.md index 681561a0748..590d3b62ee5 100644 --- a/docs/overview/db/devops_ci_sign.md +++ b/docs/overview/db/devops_ci_sign.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_sign -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_sign 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_store.md b/docs/overview/db/devops_ci_store.md index d4065da48ff..8b7ba6c3d78 100644 --- a/docs/overview/db/devops_ci_store.md +++ b/docs/overview/db/devops_ci_store.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_store -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_store 的数据库文档 | 表名 | 说明 | diff --git a/docs/overview/db/devops_ci_ticket.md b/docs/overview/db/devops_ci_ticket.md index be91dbe7aa7..14c3936daaf 100644 --- a/docs/overview/db/devops_ci_ticket.md +++ b/docs/overview/db/devops_ci_ticket.md @@ -2,7 +2,7 @@ **数据库名：** devops_ci_ticket -**文档版本：** 1.0.2 +**文档版本：** 1.0.4 **文档描述：** devops_ci_ticket 的数据库文档 | 表名 | 说明 | diff --git a/helm-charts/core/ci/Chart.lock b/helm-charts/core/ci/Chart.lock index 16713a585e1..a1070e53a50 100644 --- a/helm-charts/core/ci/Chart.lock +++ b/helm-charts/core/ci/Chart.lock @@ -27,4 +27,4 @@ dependencies: repository: file://./local_chart/kubernetes-management version: 0.0.45 digest: sha256:bb11b7ac0e3487504f5563cd2b170d04038fc8971aaecbaca3dc5ecdcb792a43 -generated: "2024-06-21T18:05:57.191350067+08:00" +generated: "2024-08-15T12:18:41.358254786+08:00" diff --git a/helm-charts/core/ci/base/values.yaml b/helm-charts/core/ci/base/values.yaml index 0094c6c3794..900c9f1e4d8 100644 --- a/helm-charts/core/ci/base/values.yaml +++ b/helm-charts/core/ci/base/values.yaml @@ -393,7 +393,7 @@ kubernetes-manager: targetCPU: 80 targetMemory: 80 # 使用的镜像 - image: bkci/bkci-kubernetes-manager:0.0.31 + image: bkci/bkci-kubernetes-manager:0.0.33 # 决定每次helm部署时的构建机所在的命名空间，同时dockerInitSh也在那里，为空时默认为 {{ .Release.Namespace }} builderNamespace: redis: @@ -412,11 +412,13 @@ kubernetes-manager: apiToken: key: Devops-Token value: landun - rsaPrivateKey: | + rsaPrivateKey: "" volumeMount: # 流水线构建工作空间和agent日志在容器内的挂载点 dataPath: /data/devops/workspace logPath: /data/devops/logs + docker: + enable: true dockerInit: # 是否使用当前chart的 dockerinit.sh useDockerInit: true diff --git a/helm-charts/core/ci/charts/kubernetes-manager-0.0.45.tgz b/helm-charts/core/ci/charts/kubernetes-manager-0.0.45.tgz index bf049c9fea9..510864f540d 100644 Binary files a/helm-charts/core/ci/charts/kubernetes-manager-0.0.45.tgz and b/helm-charts/core/ci/charts/kubernetes-manager-0.0.45.tgz differ diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/templates/deployment.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/templates/deployment.yaml index 3038bb8ebd8..26c681cde45 100644 --- a/helm-charts/core/ci/local_chart/kubernetes-management/templates/deployment.yaml +++ b/helm-charts/core/ci/local_chart/kubernetes-management/templates/deployment.yaml @@ -76,6 +76,14 @@ spec: value: {{ .Values.multiCluster.enabled | quote }} - name: DEFAULT_NAMESPACE value: {{ .Values.multiCluster.defaultNamespace }} + {{- if .Values.kubernetesManager.docker.enable }} + - name: DOCKER_HOST + value: tcp://localhost:2375 + {{- end}} + {{- if .Values.kubernetesManager.debug }} + - name: KUBERNETES_MANAGER_DEBUG_ENABLE + value: "true" + {{- end}} workingDir: /data/workspace/kubernetes-manager livenessProbe: tcpSocket: @@ -99,8 +107,22 @@ spec: mountPath: /data/workspace/kubernetes-manager/config readOnly: true {{- end}} - {{- if .Values.configmap.enabled}} + {{- if .Values.kubernetesManager.docker.enable }} + - name: kuberentes-manager-docker + image: {{ .Values.kubernetesManager.docker.image }} + command: ["dockerd", "--host", "tcp://localhost:2375"] + {{- if .Values.kubernetesManager.docker.resources }} + resources: {{- toYaml .Values.kubernetesManager.docker.resources | nindent 12 }} + {{- end }} + securityContext: + privileged: true + volumeMounts: + - name: docker-graph-storage + mountPath: /var/lib/docker + {{- end }} + volumes: + {{- if .Values.configmap.enabled}} - name: kubernetes-manager-config configMap: name: kubernetes-manager @@ -110,6 +132,10 @@ spec: {{- if .Values.kubeConfig.useKubeConfig}} - key: kubeConfig.yaml path: kubeConfig.yaml - {{- end}} + {{- end}} + {{- if .Values.kubernetesManager.docker.enable }} + - name: docker-graph-storage + emptyDir: {} + {{- end}} {{- end}} {{- end -}} diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml index a8dd052b646..c2a930b027a 100644 --- a/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml +++ b/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml @@ -135,6 +135,9 @@ data: rsaPrivateKey: | {{- .Values.kubernetesManager.apiserver.auth.rsaPrivateKey | nindent 10 }} + docker: + enable: {{ .Values.kubernetesManager.docker.enable }} + {{ if .Values.kubeConfig.useKubeConfig -}} kubeConfig.yaml: | {{- .Values.kubeConfig.content | nindent 4 }} diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml index c11f424f3c2..93aef6e5a23 100644 --- a/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml +++ b/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml @@ -94,6 +94,7 @@ service: # kubernetesManager Deployment kubernetesManager: enabled: true + debug: false replicas: 1 resources: requests: @@ -147,11 +148,23 @@ kubernetesManager: apiToken: key: Devops-Token value: landun - rsaPrivateKey: | + rsaPrivateKey: "" volumeMount: # 流水线构建工作空间和agent日志在容器内的挂载点 dataPath: /data/devops/workspace logPath: /data/devops/logs + # manager使用docker相关配置，会启用特权模式容器 + docker: + enable: false + image: docker:24.0.1-dind + resources: + requests: + cpu: 50m + memory: 512Mi + limits: + cpu: 100m + memory: 1024Mi + dockerInit: # 是否使用当前chart的 dockerinit.sh useDockerInit: true diff --git a/helm-charts/core/ci/templates/bklog.yaml b/helm-charts/core/ci/templates/bklog.yaml index 1754ea65616..e26e31b1e44 100644 --- a/helm-charts/core/ci/templates/bklog.yaml +++ b/helm-charts/core/ci/templates/bklog.yaml @@ -17,7 +17,7 @@ spec: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm path: - - /data/logs/*-.log + - /data/workspace/*/logs/service.log encoding: 'utf-8' multiline: pattern: '^[0-2][0-9][0-9][0-9].[0-1][0-9].[0-3][0-9]' diff --git a/helm-charts/core/ci/templates/gateway/deployment.yaml b/helm-charts/core/ci/templates/gateway/deployment.yaml index f1617fa095b..b5329e0cf51 100644 --- a/helm-charts/core/ci/templates/gateway/deployment.yaml +++ b/helm-charts/core/ci/templates/gateway/deployment.yaml @@ -63,8 +63,6 @@ spec: - "-c" - | cp -r /data/workspace/frontend/* /tmp/frontend/ - sysctl -w net.ipv4.tcp_tw_reuse=0 - sysctl -w net.ipv4.tcp_max_tw_buckets=16384 containers: - name: gateway image: {{ include "bkci-gateway.image" . }} diff --git a/helm-charts/core/ci/templates/init/init.bkrepo.yaml b/helm-charts/core/ci/templates/init/init.bkrepo.yaml index ef3035e3f68..9d16cb9dd4e 100644 --- a/helm-charts/core/ci/templates/init/init.bkrepo.yaml +++ b/helm-charts/core/ci/templates/init/init.bkrepo.yaml @@ -33,7 +33,7 @@ spec: REPO_CREATE_GENERIC_PATH="{{ .Values.config.bkRepoApiUrl }}/repository/api/repo/create" REPO_INIT_GENERIC_METADATA_PATH="{{ .Values.config.bkRepoApiUrl }}/generic/" create_repo_project_name_init_plugintransfer_project_generic (){ - for i in bk-store + for i in bk-store bkcdn do ret=0 echo "CI project is $i -------------------------------------------------->" diff --git a/helm-charts/core/ci/templates/init/init.iam-rbac.yaml b/helm-charts/core/ci/templates/init/init.iam-rbac.yaml index b802482e8a2..052741d1e3d 100644 --- a/helm-charts/core/ci/templates/init/init.iam-rbac.yaml +++ b/helm-charts/core/ci/templates/init/init.iam-rbac.yaml @@ -21,13 +21,13 @@ spec: - name: init-iam image: {{ include "bkci-backend.image" . }} imagePullPolicy: {{ .Values.backendImage.pullPolicy }} - workingDir: /data/workspace/support-files/ + workingDir: /data/workspace/support-files/bkiam-rbac command: - "/bin/bash" - "-c" - | # 修改auth链接 - sed -i 's/ci-auth.service.consul:21936/{{- .Values.config.bkCiHost -}}\/auth/g' bkiam-rbac/*.json + sed -i 's/ci-auth.service.consul:21936/{{- .Values.config.bkCiHost -}}\/auth/g' *.json # 导入模型 for i in $(find . -name '*.json'|sort) do @@ -47,9 +47,22 @@ spec: # 注册auth回调 echo "{{ include "bkci.names.fullname" . }}-auth is available"; - sed -i 's/bk-ci.service.consul/{{ include "bkci.names.fullname" . }}-gateway.{{ .Release.Namespace }}/g' ms-init/auth/iam-callback-resource-registere.conf - iam_json_file="ms-init/auth/iam-callback-resource-registere.conf" + sed -i 's/bk-ci.service.consul/{{ include "bkci.names.fullname" . }}-gateway.{{ .Release.Namespace }}/g' ../ms-init/auth/iam-callback-resource-registere.conf + iam_json_file="../ms-init/auth/iam-callback-resource-registere.conf" curl -X POST -H "Content-Type:application/json" -d "@$iam_json_file" "http://{{ include "bkci.names.fullname" . }}-auth.{{ .Release.Namespace }}.svc.cluster.local/api/op/auth/iam/callback/" + + # 迁移所有项目的特定资源类型资源 + curl -X 'POST' \ + 'http://{{ include "bkci.names.fullname" . }}-auth.{{ .Release.Namespace }}.svc.cluster.local/api/op/auth/migrate/migrateSpecificResourceOfAllProject' \ + -H 'accept: application/json' \ + -H 'Content-Type: application/json' \ + -d '{ + "resourceType": "pipeline", + "includeNullRouterTag": true, + "migrateProjectResource": true, + "migrateProjectDefaultGroup": true, + "migrateOtherResource": true + }' restartPolicy: OnFailure {{- end -}} {{- end -}} diff --git a/helm-charts/core/ci/templates/init/init.iam.yaml b/helm-charts/core/ci/templates/init/init.iam.yaml deleted file mode 100644 index 984171b3307..00000000000 --- a/helm-charts/core/ci/templates/init/init.iam.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# 初始化iam -{{ if .Values.init.iam }} -{{- if eq .Values.config.bkCiAuthProvider "bk_login_v3" -}} -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ include "bkci.names.fullname" . }}-init-iam - labels: {{- include "bkci.labels.standard" . | nindent 4 }} - app.kubernetes.io/component: init-iam - annotations: - "helm.sh/hook": post-install,post-upgrade - "helm.sh/hook-weight": "-4" - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded -spec: - template: - metadata: - labels: {{- include "bkci.labels.standard" . | nindent 8 }} - app.kubernetes.io/component: init-iam - spec: - containers: - - name: init-iam - image: {{ include "bkci-backend.image" . }} - imagePullPolicy: {{ .Values.backendImage.pullPolicy }} - workingDir: /data/workspace/support-files/ - {{ $mysqlData := split ":" (include "bkci.mysqlAddr" .) }} - command: - - "/bin/bash" - - "-c" - - | - # 修改auth链接 - sed -i 's/ci-auth.service.consul:21936/{{- .Values.config.bkCiHost -}}\/auth/g' bkiam/*.json - # 导入模型 - for i in $(find . -name '*.json'|sort) - do - python3 bkiam_do_migrate.py -t {{ .Values.config.bkIamPrivateUrl }} -a "{{ .Values.config.bkCiAppCode }}" -s "{{ .Values.config.bkCiAppToken }}" -f $i - done - - services="auth" - for service in $services - do - until curl --connect-timeout 3 -m 1 -s "http://{{ include "bkci.names.fullname" . }}-$service.{{ .Release.Namespace }}.svc.cluster.local" > nohup - do - echo "waiting for {{ include "bkci.names.fullname" . }}-$service"; - sleep 2; - done - echo "{{ include "bkci.names.fullname" . }}-$service is available"; - done - - # 注册auth回调 - echo "{{ include "bkci.names.fullname" . }}-auth is available"; - sed -i 's/bk-ci.service.consul/{{ include "bkci.names.fullname" . }}-gateway.{{ .Release.Namespace }}/g' ms-init/auth/iam-callback-resource-registere.conf - iam_json_file="ms-init/auth/iam-callback-resource-registere.conf" - curl -X POST -H "Content-Type:application/json" -d "@$iam_json_file" "http://{{ include "bkci.names.fullname" . }}-auth.{{ .Release.Namespace }}.svc.cluster.local/api/op/auth/iam/callback/" - restartPolicy: OnFailure -{{- end -}} -{{- end -}} diff --git a/src/agent/agent/src/pkg/agent/agent.go b/src/agent/agent/src/pkg/agent/agent.go index 3441a61318e..b980f4d4aa7 100644 --- a/src/agent/agent/src/pkg/agent/agent.go +++ b/src/agent/agent/src/pkg/agent/agent.go @@ -51,9 +51,19 @@ func Run(isDebug bool) { // 初始化国际化 i18n.InitAgentI18n() + // 启动 agent，需要等到上报启动成功才能继续 _, err := job.AgentStartup() if err != nil { - logs.Warn("agent startup failed: ", err.Error()) + logs.WithError(err).Error("agent startup failed") + for { + _, err = job.AgentStartup() + if err == nil { + break + } else { + logs.WithError(err).Error("agent startup failed") + time.Sleep(5 * time.Second) + } + } } // 数据采集 diff --git a/src/backend/ci/build.gradle.kts b/src/backend/ci/build.gradle.kts index 1ab5dc054c1..56d29d82890 100644 --- a/src/backend/ci/build.gradle.kts +++ b/src/backend/ci/build.gradle.kts @@ -1,3 +1,5 @@ +import java.net.URI + plugins { id("com.tencent.devops.boot") version "0.0.7" detektCheck @@ -24,6 +26,11 @@ allprojects { } } + // 新增maven 仓库 + repositories { + add(maven { url = URI("https://repo.jenkins-ci.org/releases") }) + } + // 版本管理 dependencyManagement { setApplyMavenExclusions(false) @@ -167,4 +174,8 @@ allprojects { } } } + configurations.all { + resolutionStrategy.cacheChangingModulesFor(0,"seconds") + resolutionStrategy.cacheDynamicVersionsFor(0,"seconds") + } } diff --git a/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt b/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt index 7f53a5dc377..ff146df41fc 100644 --- a/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt +++ b/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt @@ -46,7 +46,7 @@ object Versions { const val jjwt = "0.11.5" const val Okhttp = "4.9.0" const val jgit = "5.13.1.202206130422-r" - const val iam = "1.0.6" + const val iam = "1.0.7" const val disklrucache = "2.0.2" const val BkCrypto = "1.1.3" const val audit = "1.0.8" diff --git a/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt b/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt index b088d6229d8..a44a6b2057c 100644 --- a/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt +++ b/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt @@ -65,6 +65,7 @@ import com.tencent.devops.common.archive.util.MimeUtil import com.tencent.devops.common.auth.api.AuthPermission import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.service.utils.HomeHostUtil +import com.tencent.devops.process.api.service.ServicePipelineResource import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value @@ -94,11 +95,12 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( private val dockerRegistry: String? = null override fun show(userId: String, projectId: String, artifactoryType: ArtifactoryType, path: String): FileDetail { - val nodeDetail = bkRepoClient.getFileDetail(userId = userId, + val nodeDetail = bkRepoClient.getFileDetail( + userId = userId, projectId = projectId, repoName = BkRepoUtils.getRepoName(artifactoryType), - path = path) - ?: throw NotFoundException("file[$projectId|$artifactoryType|$path] not found") + path = path + ) ?: throw NotFoundException("file[$projectId|$artifactoryType|$path] not found") return nodeDetail.toFileDetail() } @@ -267,11 +269,15 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( page = page ?: 1, pageSize = pageSize ?: DEFAULT_PAGE_SIZE, totalPages = 1, - records = nodeList.map { buildFileInfo(it) } + records = nodeList.map { buildFileInfo(it, getPipelineNames(nodeList), getBuildNums(nodeList)) } ) } - private fun buildFileInfo(it: QueryNodeInfo): FileInfo { + private fun buildFileInfo( + it: QueryNodeInfo, + pipelineNameMap: Map, + buildNumMap: Map + ): FileInfo { return if (parseArtifactoryType(it.repoName) == ArtifactoryType.IMAGE) { val (imageName, version) = DefaultPathUtils.getImageNameAndVersion(it.fullPath) val packageVersion = bkRepoClient.getPackageVersionInfo( @@ -297,18 +303,22 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( ) } } else { - buildGenericFileInfo(it) + buildGenericFileInfo(it, pipelineNameMap, buildNumMap) } } - private fun buildGenericFileInfo(nodeInfo: QueryNodeInfo): FileInfo { + private fun buildGenericFileInfo( + nodeInfo: QueryNodeInfo, + pipelineNameMap: Map, + buildNumMap: Map + ): FileInfo { // 归档插件归档目录时，在目录多归档一个.bkci_pipeline文件, 记录归档目录的信息 return if (nodeInfo.name == ".bkci_pipeline") { FileInfo( name = nodeInfo.path.split("/").lastOrNull { it.isNotBlank() } ?: StringPool.ROOT, - fullName = nodeInfo.name, - path = nodeInfo.fullPath, - fullPath = nodeInfo.fullPath, + fullName = nodeInfo.path, + path = nodeInfo.path, + fullPath = nodeInfo.path, size = nodeInfo.size, folder = nodeInfo.folder, properties = nodeInfo.metadata?.map { m -> Property(m.key, m.value.toString()) }, @@ -319,7 +329,7 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( } else { FileInfo( name = nodeInfo.name, - fullName = nodeInfo.name, + fullName = getFullName(nodeInfo, pipelineNameMap, buildNumMap), path = nodeInfo.fullPath, fullPath = nodeInfo.fullPath, size = nodeInfo.size, @@ -332,6 +342,64 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( } } + private fun getPipelineNames(nodeList: List): Map { + val pipelineIds = mutableSetOf() + nodeList.filter { it.repoName == REPO_NAME_PIPELINE }.forEach { + val paths = it.fullPath.split("/") + if (paths.size < 3) { + logger.warn("illegal pipeline repo node fullPath: ${it.fullPath}") + return@forEach + } + pipelineIds.add(paths[1]) + } + if (pipelineIds.size == 0) { + return emptyMap() + } + return client.get(ServicePipelineResource::class) + .getPipelineNameByIds(nodeList.first().projectId, pipelineIds).data.orEmpty() + } + + private fun getBuildNums(nodeList: List): Map { + val buildIds = mutableSetOf() + nodeList.filter { it.repoName == REPO_NAME_PIPELINE }.forEach { + val paths = it.fullPath.split("/") + if (paths.size < 3) { + logger.warn("illegal pipeline repo node fullPath: ${it.fullPath}") + return@forEach + } + buildIds.add(paths[2]) + } + if (buildIds.size == 0) { + return emptyMap() + } + return client.get(ServicePipelineResource::class) + .getBuildNoByBuildIds(buildIds, nodeList.first().projectId).data.orEmpty() + } + + private fun getFullName( + nodeInfo: QueryNodeInfo, + pipelineNameMap: Map, + buildNumMap: Map + ): String { + if (nodeInfo.repoName != REPO_NAME_PIPELINE) { + return nodeInfo.fullPath + } + val paths = nodeInfo.fullPath.split("/") + if (paths.size < 3) { + logger.warn("illegal pipeline repo node fullPath: ${nodeInfo.fullPath}") + return nodeInfo.fullPath + } + val pipelineId = paths[1] + val buildId = paths[2] + val pipelineName = pipelineNameMap[pipelineId] + val buildNum = buildNumMap[buildId] + if (pipelineName.isNullOrEmpty() || buildNum.isNullOrEmpty()) { + logger.warn("illegal pipelineId or buildId: $pipelineId, $buildId") + return nodeInfo.fullPath + } + return nodeInfo.fullPath.replace("/$pipelineId/$buildId", "/$pipelineName/$buildNum") + } + override fun generateDestPath( fileType: FileTypeEnum, projectId: String, @@ -341,14 +409,18 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( ): String { val result = if (FileTypeEnum.BK_CUSTOM == fileType) { if (customFilePath.isNullOrBlank() || customFilePath.contains("..")) { - throw ErrorCodeException(errorCode = CommonMessageCode.PARAMETER_IS_NULL, - params = arrayOf("customFilePath")) + throw ErrorCodeException( + errorCode = CommonMessageCode.PARAMETER_IS_NULL, + params = arrayOf("customFilePath") + ) } customFilePath.removePrefix("/") } else { if (pipelineId.isNullOrBlank() || buildId.isNullOrBlank()) { - throw ErrorCodeException(errorCode = CommonMessageCode.PARAMETER_IS_NULL, - params = arrayOf("pipelineId or buildId")) + throw ErrorCodeException( + errorCode = CommonMessageCode.PARAMETER_IS_NULL, + params = arrayOf("pipelineId or buildId") + ) } val filePath = if (customFilePath.isNullOrBlank()) { "" @@ -383,7 +455,8 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( projectId = projectId, filePath = "/$filePath", artifactoryType = artifactoryType, - fileChannelType = fileChannelType, fullUrl = fullUrl) + fileChannelType = fileChannelType, fullUrl = fullUrl + ) } override fun getFileDownloadUrls( diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/migrate/OpAuthMigrateResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/migrate/OpAuthMigrateResource.kt index 47b9b4af4a5..1d380c079d9 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/migrate/OpAuthMigrateResource.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/migrate/OpAuthMigrateResource.kt @@ -140,4 +140,25 @@ interface OpAuthMigrateResource { @Parameter(description = "按条件迁移项目实体", required = true) projectConditionDTO: ProjectConditionDTO ): Result + + @POST + @Path("/migrateResourceAuthorization") + @Operation(summary = "迁移资源授权-按照项目") + fun migrateResourceAuthorization( + @Parameter(description = "迁移项目", required = true) + projectCodes: List + ): Result + + @POST + @Path("/migrateAllResourceAuthorization") + @Operation(summary = "迁移资源授权-全量") + fun migrateAllResourceAuthorization(): Result + + @POST + @Path("/fixResourceGroups") + @Operation(summary = "修复资源组") + fun fixResourceGroups( + @Parameter(description = "迁移项目", required = true) + projectCodes: List + ): Result } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/service/ServiceAuthAuthorizationResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/service/ServiceAuthAuthorizationResource.kt new file mode 100644 index 00000000000..fef73e0e366 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/service/ServiceAuthAuthorizationResource.kt @@ -0,0 +1,101 @@ +/* + * 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.auth.api.service + +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +import javax.ws.rs.GET +import javax.ws.rs.POST +import javax.ws.rs.PUT +import javax.ws.rs.Path +import javax.ws.rs.PathParam +import javax.ws.rs.Produces +import javax.ws.rs.core.MediaType + +@Tag(name = "SERVICE_RESOURCE_AUTHORIZATION", description = "权限-授权管理") +@Path("/service/auth/authorization/{projectId}") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface ServiceAuthAuthorizationResource { + @POST + @Path("/addResourceAuthorization") + @Operation(summary = "新增资源授权管理") + fun addResourceAuthorization( + @Parameter(description = "项目Id", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "资源授权实体", required = true) + resourceAuthorizationList: List + ): Result + + @GET + @Path("/{resourceType}/{resourceCode}/getResourceAuthorization") + @Operation(summary = "获取资源授予记录") + fun getResourceAuthorization( + @Parameter(description = "项目Id", required = true) + @PathParam("projectId") + projectId: String, + @PathParam("resourceType") + @Parameter(description = "资源类型", required = true) + resourceType: String, + @PathParam("resourceCode") + @Parameter(description = "资源code", required = true) + resourceCode: String + ): Result + + @POST + @Path("/listResourceAuthorization") + @Operation(summary = "获取资源授权管理") + fun listResourceAuthorization( + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "查询条件", required = true) + condition: ResourceAuthorizationConditionRequest + ): Result> + + @PUT + @Path("/batchModifyHandoverFrom") + @Operation(summary = "批量重置资源授权人") + fun batchModifyHandoverFrom( + @Parameter(description = "项目Id", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "重置资源授权请求体", required = true) + resourceAuthorizationHandoverList: List + ): Result +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/sync/OpAuthResourceGroupSyncResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/sync/OpAuthResourceGroupSyncResource.kt new file mode 100644 index 00000000000..a907ba8fb87 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/sync/OpAuthResourceGroupSyncResource.kt @@ -0,0 +1,108 @@ +/* + * 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.auth.api.sync + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +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 + +@Tag(name = "AUTH_SYNC", description = "权限-同步IAM") +@Path("/op/auth/resource/group/sync/") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface OpAuthResourceGroupSyncResource { + + @POST + @Path("/syncByCondition") + @Operation(summary = "按条件同步组和成员") + fun syncByCondition( + @Parameter(description = "按条件迁移项目实体", required = true) + projectConditionDTO: ProjectConditionDTO + ): Result + + @POST + @Path("/batchSyncGroupAndMember") + @Operation(summary = "批量同步所有用户组和成员") + fun batchSyncGroupAndMember( + @Parameter(description = "项目ID列表", required = true) + projectIds: List + ): Result + + @POST + @Path("/batchSyncProjectGroup") + @Operation(summary = "批量同步项目下用户组") + fun batchSyncProjectGroup( + @Parameter(description = "项目ID列表", required = true) + projectIds: List + ): Result + + @POST + @Path("/batchSyncAllMember") + @Operation(summary = "同步所有成员") + fun batchSyncAllMember( + @Parameter(description = "项目ID列表", required = true) + projectIds: List + ): Result + + @POST + @Path("/{projectId}/{resourceType}/{resourceCode}/syncResourceMember") + @Operation(summary = "同步资源下用户组") + fun syncResourceMember( + @Parameter(description = "项目ID", required = true) + @PathParam(value = "projectId") + projectId: String, + @Parameter(description = "资源类型", required = true) + @PathParam(value = "resourceType") + resourceType: String, + @Parameter(description = "资源ID", required = true) + @PathParam(value = "resourceCode") + resourceCode: String + ): Result + + @POST + @Path("/{projectId}/fixResourceGroupMember") + @Operation(summary = "修复用户组成员表") + fun fixResourceGroupMember( + @Parameter(description = "项目ID", required = true) + @PathParam(value = "projectId") + projectId: String + ): Result + + @POST + @Path("/syncIamGroupMembersOfApply") + @Operation(summary = "同步iam组成员--用户申请加入") + fun syncIamGroupMembersOfApply(): Result +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthAuthorizationResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthAuthorizationResource.kt new file mode 100644 index 00000000000..0f672983e72 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthAuthorizationResource.kt @@ -0,0 +1,141 @@ +/* + * 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.auth.api.user + +import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo +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.model.SQLPage +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResetAllResourceAuthorizationReq +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +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 + +@Tag(name = "USER_RESOURCE_AUTHORIZATION", description = "用户-权限-授权管理") +@Path("/user/auth/authorization/") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface UserAuthAuthorizationResource { + + @POST + @Path("/{projectId}/listResourceAuthorization") + @Operation(summary = "根据条件获取资源授权管理") + fun listResourceAuthorization( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "查询条件", required = true) + condition: ResourceAuthorizationConditionRequest + ): Result> + + @GET + @Path("/{projectId}/{resourceType}/getResourceAuthorization") + @Operation(summary = "获取资源授权管理") + fun getResourceAuthorization( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "资源类型", required = true) + @PathParam("resourceType") + resourceType: String, + @Parameter(description = "资源code", required = true) + @QueryParam("resourceCode") + resourceCode: String + ): Result + + @GET + @Path("/{projectId}/{resourceType}/checkAuthorizationWhenRemoveGroupMember") + @Operation(summary = "当移出用户组时做授权检查") + fun checkAuthorizationWhenRemoveGroupMember( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "资源类型", required = true) + @PathParam("resourceType") + resourceType: String, + @Parameter(description = "资源code", required = true) + @QueryParam("resourceCode") + resourceCode: String, + @Parameter(description = "成员ID", required = true) + @QueryParam("memberId") + memberId: String + ): Result + + @POST + @Path("/{projectId}/resetResourceAuthorization") + @Operation(summary = "重置资源授权管理") + fun resetResourceAuthorization( + @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 = "资源授权交接条件实体", required = true) + condition: ResourceAuthorizationHandoverConditionRequest + ): Result>> + + @POST + @Path("/{projectId}/resetAllResourceAuthorization") + @Operation(summary = "重置资源授权管理") + fun resetAllResourceAuthorization( + @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 = "资源授权交接条件实体", required = true) + condition: ResetAllResourceAuthorizationReq + ): Result> +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt index 9f3d3900624..50d7ce1996c 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt @@ -30,13 +30,15 @@ package com.tencent.devops.auth.api.user import com.tencent.devops.auth.pojo.dto.GroupMemberRenewalDTO import com.tencent.devops.auth.pojo.dto.RenameGroupDTO +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo import com.tencent.devops.auth.pojo.vo.IamGroupPoliciesVo import com.tencent.devops.common.api.annotation.BkInterfaceI18n import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID +import com.tencent.devops.common.api.model.SQLPage import com.tencent.devops.common.api.pojo.Result -import io.swagger.v3.oas.annotations.tags.Tag import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag import javax.ws.rs.Consumes import javax.ws.rs.DELETE import javax.ws.rs.GET @@ -45,12 +47,14 @@ import javax.ws.rs.PUT 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 @Tag(name = "AUTH_RESOURCE_GROUP", description = "用户态-iam用户组") @Path("/user/auth/resource/group/{projectId}/{resourceType}") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) +@Suppress("LongParameterList") interface UserAuthResourceGroupResource { @GET @@ -72,6 +76,30 @@ interface UserAuthResourceGroupResource { groupId: Int ): Result> + @GET + @Path("getMemberGroupsDetails") + @Operation(summary = "获取项目成员有权限的用户组详情") + fun getMemberGroupsDetails( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "资源类型") + @PathParam("resourceType") + resourceType: String, + @QueryParam("memberId") + @Parameter(description = "组织ID/成员ID") + memberId: String, + @Parameter(description = "起始位置,从0开始") + @QueryParam("start") + start: Int, + @Parameter(description = "每页多少条") + @QueryParam("limit") + limit: Int + ): Result> + @PUT @Path("{groupId}/member/renewal") @Operation(summary = "用户续期") diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserDeptResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupSyncResource.kt similarity index 51% rename from src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserDeptResource.kt rename to src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupSyncResource.kt index 1e575dd6958..92bd13e7273 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserDeptResource.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupSyncResource.kt @@ -27,92 +27,63 @@ package com.tencent.devops.auth.api.user -import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum -import com.tencent.devops.auth.pojo.vo.DeptInfoVo -import com.tencent.devops.auth.pojo.vo.UserAndDeptInfoVo -import com.tencent.devops.common.api.auth.AUTH_HEADER_DEVOPS_ACCESS_TOKEN +import com.tencent.devops.auth.pojo.enum.AuthMigrateStatus import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID import com.tencent.devops.common.api.pojo.Result -import io.swagger.v3.oas.annotations.tags.Tag import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag import javax.ws.rs.Consumes import javax.ws.rs.GET import javax.ws.rs.HeaderParam +import javax.ws.rs.PUT 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 -@Tag(name = "USER_DEPT", description = "组织架构") -@Path("/user/dept") +@Tag(name = "AUTH_RESOURCE_GROUP_SYNC", description = "用户态-iam用户组_同步") +@Path("/user/auth/resource/group/sync/{projectId}") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) -interface UserDeptResource { +interface UserAuthResourceGroupSyncResource { - @GET - @Path("/levels/{level}") - @Operation(summary = "按组织级别获取组织列表") - fun getDeptByLevel( + @PUT + @Path("syncGroupAndMember") + @Operation(summary = "同步IAM组和成员") + fun syncGroupAndMember( @Parameter(description = "用户名", required = true) @HeaderParam(AUTH_HEADER_USER_ID) userId: String, - @Parameter(description = "access_token") - @HeaderParam(AUTH_HEADER_DEVOPS_ACCESS_TOKEN) - accessToken: String?, - @PathParam("level") - @Parameter(description = "组织级别", required = true) - level: Int - ): Result + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String + ): Result - @GET - @Path("/parents/{parentId}") - @Operation(summary = "按组织级别获取组织列表") - fun getDeptByParent( - @Parameter(description = "用户名", required = true) - @HeaderParam(AUTH_HEADER_USER_ID) - userId: String, - @Parameter(description = "access_token") - @HeaderParam(AUTH_HEADER_DEVOPS_ACCESS_TOKEN) - accessToken: String?, - @PathParam("parentId") - @Parameter(description = "父组织Id", required = true) - parentId: Int, - @QueryParam("pageSize") - @Parameter(description = "父组织Id", required = false) - pageSize: Int? - ): Result - - @GET - @Path("/names/{name}") - @Operation(summary = "按组织级别获取组织列表") - fun getUserAndDeptByName( + @PUT + @Path("{groupId}/syncGroupMember") + @Operation(summary = "同步IAM") + fun syncGroupMember( @Parameter(description = "用户名", required = true) @HeaderParam(AUTH_HEADER_USER_ID) userId: String, - @Parameter(description = "access_token") - @HeaderParam(AUTH_HEADER_DEVOPS_ACCESS_TOKEN) - accessToken: String?, - @PathParam("name") - @Parameter(description = "模糊搜索名称", required = true) - name: String, - @QueryParam("type") - @Parameter(description = "搜索类型", required = true) - type: ManagerScopesEnum - ): Result> + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "用户组Id") + @PathParam("groupId") + groupId: Int + ): Result @GET - @Path("/{deptId}/users") - fun getDeptUsers( + @Path("/getStatusOfSync") + @Operation(summary = "获取同步状态") + fun getStatusOfSync( @Parameter(description = "用户名", required = true) @HeaderParam(AUTH_HEADER_USER_ID) userId: String, - @Parameter(description = "access_token") - @HeaderParam(AUTH_HEADER_DEVOPS_ACCESS_TOKEN) - accessToken: String?, - @PathParam("deptId") - @Parameter(description = "组织Id", required = true) - deptId: Int - ): Result?> + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String + ): Result } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceMemberResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceMemberResource.kt new file mode 100644 index 00000000000..8e0da2fd2f1 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceMemberResource.kt @@ -0,0 +1,182 @@ +package com.tencent.devops.auth.api.user + +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import com.tencent.devops.auth.pojo.enum.BatchOperateType +import com.tencent.devops.auth.pojo.request.GroupMemberCommonConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberHandoverConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberRenewalConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberSingleRenewalReq +import com.tencent.devops.auth.pojo.request.RemoveMemberFromProjectReq +import com.tencent.devops.auth.pojo.vo.BatchOperateGroupMemberCheckVo +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo +import com.tencent.devops.auth.pojo.vo.MemberGroupCountWithPermissionsVo +import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.api.pojo.Result +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +import javax.ws.rs.DELETE +import javax.ws.rs.GET +import javax.ws.rs.HeaderParam +import javax.ws.rs.POST +import javax.ws.rs.PUT +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 + +@Tag(name = "AUTH_RESOURCE_MEMBER", description = "用户态-iam用户") +@Path("/user/auth/resource/member/{projectId}/") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface UserAuthResourceMemberResource { + @GET + @Path("/listProjectMembers") + @Operation(summary = "获取项目下全体成员") + @Suppress("LongParameterList") + fun listProjectMembers( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "成员类型") + @QueryParam("memberType") + memberType: String?, + @Parameter(description = "用户名称搜索") + @QueryParam("userName") + userName: String?, + @Parameter(description = "组织搜索") + @QueryParam("deptName") + deptName: String?, + @Parameter(description = "是否展示离职标识") + @QueryParam("departedFlag") + departedFlag: Boolean?, + @Parameter(description = "第几页") + @QueryParam("page") + page: Int, + @Parameter(description = "每页多少条") + @QueryParam("pageSize") + pageSize: Int + ): Result> + + @PUT + @Path("/renewal") + @Operation(summary = "续期单个组成员权限--无需进行审批") + fun renewalGroupMember( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "续期成员请求实体") + renewalConditionReq: GroupMemberSingleRenewalReq + ): Result + + @PUT + @Path("/batch/renewal") + @Operation(summary = "批量续期组成员权限--无需进行审批") + fun batchRenewalGroupMembers( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "批量续期成员请求实体") + renewalConditionReq: GroupMemberRenewalConditionReq + ): Result + + @DELETE + @Path("/batch/remove") + @Operation(summary = "批量移除用户组成员") + fun batchRemoveGroupMembers( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "批量移除成员请求实体") + removeMemberDTO: GroupMemberCommonConditionReq + ): Result + + @PUT + @Path("/batch/handover") + @Operation(summary = "批量交接用户组成员") + fun batchHandoverGroupMembers( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "批量交接成员请求实体") + handoverMemberDTO: GroupMemberHandoverConditionReq + ): Result + + @POST + @Path("/batch/{batchOperateType}/check/") + @Operation(summary = "批量操作用户组检查") + fun batchOperateGroupMembersCheck( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "批量操作类型", required = true) + @PathParam("batchOperateType") + batchOperateType: BatchOperateType, + @Parameter(description = "批量操作成员检查请求体") + conditionReq: GroupMemberCommonConditionReq + ): Result + + @PUT + @Path("/removeMemberFromProject") + @Operation(summary = "将用户移出项目") + fun removeMemberFromProject( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "一键移出用户出项目") + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): Result> + + @POST + @Path("/removeMemberFromProjectCheck") + @Operation(summary = "将用户移出项目检查") + fun removeMemberFromProjectCheck( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "一键移出用户出项目") + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): Result + + @GET + @Path("/getMemberGroupCount") + @Operation(summary = "获取项目成员有权限的用户组数量--以资源类型进行分类") + fun getMemberGroupCount( + @Parameter(description = "用户名", required = true) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @QueryParam("memberId") + @Parameter(description = "组织ID/成员ID") + memberId: String + ): Result> +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceResource.kt index b9ade443a7d..aa0f259134d 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceResource.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceResource.kt @@ -106,6 +106,9 @@ interface UserAuthResourceResource { @Parameter(description = "资源ID") @PathParam("resourceCode") resourceCode: String, + @Parameter(description = "获取所有成员标识") + @QueryParam("allProjectMembersGroupFlag") + allProjectMembersGroupFlag: Boolean?, @Parameter(description = "第几页") @QueryParam("page") page: Int, diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthI18nConstants.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthI18nConstants.kt index 98e60fc1eb8..4be2b229dfc 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthI18nConstants.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthI18nConstants.kt @@ -10,6 +10,7 @@ object AuthI18nConstants { const val BK_YOU_AGREE_RENEW = "bkYouAgreeRenew" // 你已选择同意用户续期 const val BK_REFUSE_RENEW = "bkRefuseRenew" // 拒绝续期 const val BK_YOU_REFUSE_RENEW = "bkYouRefuseRenew" // 你已选择拒绝用户续期 + const val BK_ALL_PROJECT_MEMBERS_GROUP = "bkAllProjectMembersGroup" // 全部项目成员组 // **蓝盾超级管理员权限续期申请审批**\n申请人：{0}\n授权名称：{1}\n授权详情：{2}\n用户权限过期时间：{3}\n请选择是否同意用户续期权限\n const val BK_WEWORK_ROBOT_NOTIFY_MESSAGE = "bkWeworkRobotNotifyMessage" @@ -43,4 +44,7 @@ object AuthI18nConstants { const val BK_DEVOPS_NAME = "bkDevopsName" // 蓝盾名称 const val BK_MONITOR_NAME = "bkMonitorName" // 监控平台名称 const val BK_MONITOR_SPACE = "bkMonitorSpace" // 监控空间 + const val BK_MEMBER_EXPIRED_AT_DISPLAY_EXPIRED = "bkMemberExpiredAtDisplayExpired" // 有效期: 已过期 + const val BK_MEMBER_EXPIRED_AT_DISPLAY_NORMAL = "bkMemberExpiredAtDisplayNormal" // 有效期: {0}天 + const val BK_MEMBER_EXPIRED_AT_DISPLAY_PERMANENT = "bkMemberExpiredAtDisplayPermanent" // 有效期: 永久 } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthMessageCode.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthMessageCode.kt index 9e64cae5fed..4b66ce68fbb 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthMessageCode.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthMessageCode.kt @@ -133,4 +133,13 @@ object AuthMessageCode { const val ERROR_MOA_CREDENTIAL_KEY_VERIFY_FAIL = "2121082" // MOA票据校验失败 const val ERROR_USER_NOT_BELONG_TO_THE_PROJECT = "2121083" // 用户不属于项目 + + const val ERROR_RESOURCE_AUTHORIZATION_NOT_FOUND = "2121084" // 授权记录不存在 + const val ERROR_BATCH_RENEWAL_GROUP_MEMBERS = "2121085" // 批量续期用户组成员失败 + const val ERROR_GROUP_MEMBERS_NOT_EXIST = "2121086" // 用户组[{0}]下不存在成员[{1}] + const val ERROR_BATCH_OPERATE_GROUP_MEMBERS = "2121087" // 批量操作组成员失败 + const val INVALID_HANDOVER_TO = "2121088" // 目标对象和交接人不允许相同 + const val INVALID_EXPIRED_PERM_NOT_ALLOW_TO_HANDOVER = "2121089" // 已过期的权限不允许交接 + + const val ERROR_USER_INFORMATION_NOT_SYNCED = "2121090" // 请等待第二天用户信息同步后再尝试操作，因为新入职用户的信息尚未同步完成。 } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroup.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroup.kt new file mode 100644 index 00000000000..4d898e9533b --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroup.kt @@ -0,0 +1,62 @@ +/* + * 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.auth.pojo + +import io.swagger.v3.oas.annotations.media.Schema +import java.time.LocalDateTime + +@Schema(title = "资源用户组信息") +data class AuthResourceGroup( + val id: Long? = null, + @get:Schema(title = "项目ID", required = true) + val projectCode: String, + @get:Schema(title = "资源类型", required = true) + val resourceType: String, + @get:Schema(title = "资源ID", required = true) + val resourceCode: String, + @get:Schema(title = "资源名", required = true) + val resourceName: String, + @get:Schema(title = "IAM资源ID", required = true) + val iamResourceCode: String, + @get:Schema(title = "组编码, @See DefaultGroupType", required = true) + val groupCode: String, + @get:Schema(title = "用户组名, @See DefaultGroupType", required = true) + val groupName: String, + @get:Schema(title = "是否是默认组", required = true) + val defaultGroup: Boolean, + @get:Schema(title = "IAM 用户组ID, @See DefaultGroupType", required = true) + val relationId: Int, + @get:Schema(title = "创建时间", required = false) + val createTime: LocalDateTime? = null, + @get:Schema(title = "更新时间", required = false) + val updateTime: LocalDateTime? = null, + @get:Schema(title = "用户组描述", required = false) + val description: String? = null, + @get:Schema(title = "IAM人员模板ID", required = false) + val iamTemplateId: Int? = null +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroupMember.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroupMember.kt new file mode 100644 index 00000000000..a70919105c4 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroupMember.kt @@ -0,0 +1,54 @@ +/* + * 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.auth.pojo + +import io.swagger.v3.oas.annotations.media.Schema +import java.time.LocalDateTime + +@Schema(title = "资源用户组成员信息") +data class AuthResourceGroupMember( + val id: Long? = null, + @get:Schema(title = "项目ID", required = true) + val projectCode: String, + @get:Schema(title = "资源类型", required = true) + val resourceType: String, + @get:Schema(title = "资源ID", required = true) + val resourceCode: String, + @get:Schema(title = "资源ID", required = true) + val groupCode: String, + @get:Schema(title = "权限中心组ID", required = true) + val iamGroupId: Int, + @get:Schema(title = "成员ID, 用户: 英文名, 组织: 组织ID, 人员模板: 模板ID", required = true) + val memberId: String, + @get:Schema(title = "成员名", required = true) + val memberName: String, + @get:Schema(title = "成员类型, 用户/组织/人员模板", required = true) + val memberType: String, + @get:Schema(title = "过期时间", required = true) + val expiredTime: LocalDateTime +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/BkUserInfo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/BkUserInfo.kt index e2327421797..38ff6dbf65e 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/BkUserInfo.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/BkUserInfo.kt @@ -1,5 +1,6 @@ package com.tencent.devops.auth.pojo +import com.fasterxml.jackson.annotation.JsonProperty import io.swagger.v3.oas.annotations.media.Schema @Schema @@ -7,9 +8,13 @@ data class BkUserInfo( @get:Schema(title = "用户Id") val id: Int, @get:Schema(title = "用户名") - val username: String, + @JsonProperty("username") + val userName: String, + @get:Schema(title = "别名") + @JsonProperty("display_name") + val displayName: String, @get:Schema(title = "是否启用") - val enabled: Boolean, + val enabled: Boolean?, @get:Schema(title = "用户额外信息") val extras: BkUserExtras?, @get:Schema(title = "用户部门") diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/MemberInfo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/ResourceMemberInfo.kt similarity index 52% rename from src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/MemberInfo.kt rename to src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/ResourceMemberInfo.kt index 53f315d9223..892a06a845b 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/MemberInfo.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/ResourceMemberInfo.kt @@ -3,11 +3,13 @@ package com.tencent.devops.auth.pojo import io.swagger.v3.oas.annotations.media.Schema @Schema(title = "成员信息") -data class MemberInfo( +data class ResourceMemberInfo( @get:Schema(title = "成员id") val id: String, @get:Schema(title = "成员名称") - val name: String, - @get:Schema(title = "成员类别") - val type: String + val name: String? = null, + @get:Schema(title = "成员类型") + val type: String, + @get:Schema(title = "是否离职") + val departed: Boolean? = null ) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/GroupMemberRenewalDTO.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/GroupMemberRenewalDTO.kt index d0b85831b0a..352e41b892f 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/GroupMemberRenewalDTO.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/GroupMemberRenewalDTO.kt @@ -31,6 +31,6 @@ import io.swagger.v3.oas.annotations.media.Schema @Schema(title = "用户组成员续期") data class GroupMemberRenewalDTO( - @get:Schema(title = "过期时间戳(单位秒)，即用户或部门在 expired_at 后将不具有该用户组的相关权限") + @get:Schema(title = "过期时间戳(单位秒)") val expiredAt: Long ) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/ListGroupConditionDTO.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/ListGroupConditionDTO.kt new file mode 100644 index 00000000000..02472a7e360 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/ListGroupConditionDTO.kt @@ -0,0 +1,19 @@ +package com.tencent.devops.auth.pojo.dto + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "获取用户组列表条件") +data class ListGroupConditionDTO( + @get:Schema(title = "项目ID") + val projectId: String, + @get:Schema(title = "资源类型") + val resourceType: String, + @get:Schema(title = "资源CODE") + val resourceCode: String, + @get:Schema(title = "是否获取项目成员组，该字段仅在resourceType为project时生效") + val getAllProjectMembersGroup: Boolean = false, + @get:Schema(title = "页数") + val page: Int, + @get:Schema(title = "页大小") + val pageSize: Int +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/MigrateResourceDTO.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/MigrateResourceDTO.kt index e9b5bf3cd34..dc25af90f8a 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/MigrateResourceDTO.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/dto/MigrateResourceDTO.kt @@ -8,6 +8,8 @@ data class MigrateResourceDTO( val resourceType: String? = null, @get:Schema(title = "项目ID列表") val projectCodes: List? = null, + @get:Schema(title = "是否包含router_tag为null的项目") + val includeNullRouterTag: Boolean? = false, @get:Schema(title = "是否迁移项目级资源") val migrateProjectResource: Boolean? = false, @get:Schema(title = "是否迁移项目级默认用户组") diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/RepoService.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/ApplyToGroupStatus.kt similarity index 80% rename from src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/RepoService.kt rename to src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/ApplyToGroupStatus.kt index 1e0fa873f91..e1aa282decd 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/RepoService.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/ApplyToGroupStatus.kt @@ -23,23 +23,18 @@ * 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.worker.common.service +package com.tencent.devops.auth.pojo.enum -import com.tencent.bkrepo.repository.pojo.token.TokenType +enum class ApplyToGroupStatus(val value: Int) { + // 审批中 + PENDING(0), -interface RepoService { + // 审批成功 + SUCCEED(1), - /** - * 获取仓库token - */ - fun getRepoToken( - userId: String, - projectId: String, - repoName: String, - path: String, - type: TokenType, - expireSeconds: Long? - ): String? + // 审批超时 + TIME_OUT(2); } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/AuthMigrateStatus.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/AuthMigrateStatus.kt index c5baa506a9c..4c639452046 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/AuthMigrateStatus.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/AuthMigrateStatus.kt @@ -31,8 +31,10 @@ package com.tencent.devops.auth.pojo.enum enum class AuthMigrateStatus(val value: Int) { // 迁移中 PENDING(0), + // 迁移成功 SUCCEED(1), + // 迁移失败 FAILED(2); } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/BatchOperateType.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/BatchOperateType.kt new file mode 100644 index 00000000000..ad8504dc6e0 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/BatchOperateType.kt @@ -0,0 +1,34 @@ +/* + * 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.auth.pojo.enum + +enum class BatchOperateType { + RENEWAL, + REMOVE, + HANDOVER +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/JoinedType.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/JoinedType.kt new file mode 100644 index 00000000000..06b700c88bd --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/JoinedType.kt @@ -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.auth.pojo.enum + +enum class JoinedType { + // 直接加入 + DIRECT, + + // 通过模板加入 + TEMPLATE +} diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/SkipCiFilter.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/RemoveMemberButtonControl.kt similarity index 79% rename from src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/SkipCiFilter.kt rename to src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/RemoveMemberButtonControl.kt index dfbe1421ee3..fc06012edd1 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/SkipCiFilter.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/enum/RemoveMemberButtonControl.kt @@ -25,18 +25,18 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.tencent.devops.common.webhook.service.code.filter +package com.tencent.devops.auth.pojo.enum -class SkipCiFilter( - private val pipelineId: String, - private val triggerOnMessage: String? -) : WebhookFilter { +enum class RemoveMemberButtonControl { + // 唯一管理员，不允许移出组 + UNIQUE_MANAGER, - companion object { - private const val SKIP_CI = "[skip ci]" - } + // 唯一的拥有者,不允许移除组 + UNIQUE_OWNER, - override fun doFilter(response: WebhookFilterResponse): Boolean { - return triggerOnMessage?.contains(SKIP_CI) != true - } + // 通过模板加入，不允许移出组 + TEMPLATE, + + // 其他，允许移出组 + OTHER } diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberCommonConditionReq.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberCommonConditionReq.kt new file mode 100644 index 00000000000..db943b94c74 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberCommonConditionReq.kt @@ -0,0 +1,24 @@ +package com.tencent.devops.auth.pojo.request + +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "用户组成员处理公共请求体") +open class GroupMemberCommonConditionReq( + @get:Schema(title = "组IDs") + open val groupIds: List = emptyList(), + @get:Schema(title = "全选的资源类型") + open val resourceTypes: List = emptyList(), + @get:Schema(title = "全量选择") + open val allSelection: Boolean = false, + @get:Schema(title = "是否排除唯一管理员组") + open var excludedUniqueManagerGroup: Boolean = false, + @get:Schema(title = "目标对象") + open val targetMember: ResourceMemberInfo +) { + override fun toString(): String { + return "GroupMemberCommonConditionReq(groupIds=$groupIds,resourceTypes=$resourceTypes," + + "allSelection=$allSelection,excludedUniqueManagerGroup=$excludedUniqueManagerGroup," + + "targetMember=$targetMember)" + } +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberHandoverConditionReq.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberHandoverConditionReq.kt new file mode 100644 index 00000000000..dc0f85b0daa --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberHandoverConditionReq.kt @@ -0,0 +1,63 @@ +/* + * 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.auth.pojo.request + +import com.tencent.devops.auth.constant.AuthMessageCode.INVALID_HANDOVER_TO +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import com.tencent.devops.common.api.exception.ErrorCodeException +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "用户组成员交接条件请求体") +data class GroupMemberHandoverConditionReq( + @get:Schema(title = "组IDs") + override val groupIds: List = emptyList(), + @get:Schema(title = "全选的资源类型") + override val resourceTypes: List = emptyList(), + @get:Schema(title = "全量选择") + override val allSelection: Boolean = false, + @get:Schema(title = "是否排除唯一管理员组") + override var excludedUniqueManagerGroup: Boolean = false, + @get:Schema(title = "目标对象") + override val targetMember: ResourceMemberInfo, + @get:Schema(title = "授予人") + val handoverTo: ResourceMemberInfo +) : GroupMemberCommonConditionReq( + groupIds = groupIds, + resourceTypes = resourceTypes, + allSelection = allSelection, + excludedUniqueManagerGroup = excludedUniqueManagerGroup, + targetMember = targetMember +) { + fun checkHandoverTo() { + if (handoverTo.id == targetMember.id) { + throw ErrorCodeException( + errorCode = INVALID_HANDOVER_TO + ) + } + } +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberRenewalConditionReq.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberRenewalConditionReq.kt new file mode 100644 index 00000000000..b8b6ce8598c --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberRenewalConditionReq.kt @@ -0,0 +1,53 @@ +/* + * 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.auth.pojo.request + +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "用户组成员续期") +data class GroupMemberRenewalConditionReq( + @get:Schema(title = "组IDs") + override val groupIds: List, + @get:Schema(title = "全选某种资源类型下的用户组") + override val resourceTypes: List = emptyList(), + @get:Schema(title = "全量选择") + override val allSelection: Boolean = false, + @get:Schema(title = "是否排除唯一管理员组") + override var excludedUniqueManagerGroup: Boolean = false, + @get:Schema(title = "目标对象") + override val targetMember: ResourceMemberInfo, + @get:Schema(title = "续期时长(天)") + val renewalDuration: Int +) : GroupMemberCommonConditionReq( + groupIds = groupIds, + resourceTypes = resourceTypes, + allSelection = allSelection, + excludedUniqueManagerGroup = excludedUniqueManagerGroup, + targetMember = targetMember +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberSingleRenewalReq.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberSingleRenewalReq.kt new file mode 100644 index 00000000000..f765549d7ab --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/GroupMemberSingleRenewalReq.kt @@ -0,0 +1,41 @@ +/* + * 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.auth.pojo.request + +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "用户组成员单条续期") +data class GroupMemberSingleRenewalReq( + @get:Schema(title = "组ID") + val groupId: Int, + @get:Schema(title = "目标对象") + val targetMember: ResourceMemberInfo, + @get:Schema(title = "续期时长(天)") + val renewalDuration: Int +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/RemoveMemberFromProjectReq.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/RemoveMemberFromProjectReq.kt new file mode 100644 index 00000000000..b2a211530ab --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/request/RemoveMemberFromProjectReq.kt @@ -0,0 +1,22 @@ +package com.tencent.devops.auth.pojo.request + +import com.tencent.devops.auth.constant.AuthMessageCode.INVALID_HANDOVER_TO +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import com.tencent.devops.common.api.exception.ErrorCodeException +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "一键移出用户出项目") +data class RemoveMemberFromProjectReq( + @get:Schema(title = "目标对象") + val targetMember: ResourceMemberInfo, + @get:Schema(title = "授予人") + val handoverTo: ResourceMemberInfo? +) { + fun checkHandoverTo() { + if (handoverTo != null && handoverTo.id == targetMember.id) { + throw ErrorCodeException( + errorCode = INVALID_HANDOVER_TO + ) + } + } +} diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/BatchOperateGroupMemberCheckVo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/BatchOperateGroupMemberCheckVo.kt new file mode 100644 index 00000000000..501eb12299c --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/BatchOperateGroupMemberCheckVo.kt @@ -0,0 +1,11 @@ +package com.tencent.devops.auth.pojo.vo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "批量续期/删除/交接/组成员检查") +data class BatchOperateGroupMemberCheckVo( + @get:Schema(title = "总数") + val totalCount: Int, + @get:Schema(title = "无法操作的数量") + val inoperableCount: Int? = null +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/GroupDetailsInfoVo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/GroupDetailsInfoVo.kt new file mode 100644 index 00000000000..26bd35b3aff --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/GroupDetailsInfoVo.kt @@ -0,0 +1,33 @@ +package com.tencent.devops.auth.pojo.vo + +import com.tencent.devops.auth.pojo.enum.JoinedType +import com.tencent.devops.auth.pojo.enum.RemoveMemberButtonControl +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "用户组详细信息") +data class GroupDetailsInfoVo( + @get:Schema(title = "资源实例code") + val resourceCode: String, + @get:Schema(title = "资源实例名称") + val resourceName: String, + @get:Schema(title = "资源类型") + val resourceType: String, + @get:Schema(title = "用户组ID") + val groupId: Int, + @get:Schema(title = "用户组名称") + val groupName: String, + @get:Schema(title = "用户组描述") + val groupDesc: String? = null, + @get:Schema(title = "有效期，天") + val expiredAtDisplay: String, + @get:Schema(title = "过期时间戳，秒") + val expiredAt: Long, + @get:Schema(title = "加入时间") + val joinedTime: Long, + @get:Schema(title = "移除成员按钮控制") + val removeMemberButtonControl: RemoveMemberButtonControl, + @get:Schema(title = "加入方式") + val joinedType: JoinedType, + @get:Schema(title = "操作人") + val operator: String +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/IamGroupInfoVo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/IamGroupInfoVo.kt index 0bb72a20556..96ad44c2f53 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/IamGroupInfoVo.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/IamGroupInfoVo.kt @@ -17,5 +17,9 @@ data class IamGroupInfoVo( @get:Schema(title = "用户组人数") val userCount: Int, @get:Schema(title = "用户组部门数") - val departmentCount: Int = 0 + val departmentCount: Int = 0, + @get:Schema(title = "用户组模板数") + val templateCount: Int? = 0, + @get:Schema(title = "是否为项目成员组") + val projectMemberGroup: Boolean? = null ) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/MemberGroupCountWithPermissionsVo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/MemberGroupCountWithPermissionsVo.kt new file mode 100644 index 00000000000..293d3646046 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/MemberGroupCountWithPermissionsVo.kt @@ -0,0 +1,13 @@ +package com.tencent.devops.auth.pojo.vo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "用户有权限的用户组数量") +data class MemberGroupCountWithPermissionsVo( + @get:Schema(title = "资源类型") + val resourceType: String, + @get:Schema(title = "资源类型名") + val resourceTypeName: String, + @get:Schema(title = "数量") + val count: Long +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ProjectMembersVO.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ProjectMembersVO.kt index ef84c49a360..a8c65055f27 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ProjectMembersVO.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ProjectMembersVO.kt @@ -1,6 +1,6 @@ package com.tencent.devops.auth.pojo.vo -import com.tencent.devops.auth.pojo.MemberInfo +import com.tencent.devops.auth.pojo.ResourceMemberInfo import io.swagger.v3.oas.annotations.media.Schema @Schema(title = "项目成员列表返回") @@ -8,5 +8,5 @@ data class ProjectMembersVO( @get:Schema(title = "数量") val count: Int, @get:Schema(title = "成员信息列表") - val results: Set + val results: Set ) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceMemberCountVO.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceMemberCountVO.kt new file mode 100644 index 00000000000..b533a9310d9 --- /dev/null +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceMemberCountVO.kt @@ -0,0 +1,11 @@ +package com.tencent.devops.auth.pojo.vo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源成员数量") +data class ResourceMemberCountVO( + @get:Schema(title = "用户组人数") + val userCount: Int, + @get:Schema(title = "用户组部门数") + val departmentCount: Int +) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceTypeInfoVo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceTypeInfoVo.kt index da485f5b3fa..a04974367e6 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceTypeInfoVo.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/ResourceTypeInfoVo.kt @@ -6,14 +6,14 @@ import io.swagger.v3.oas.annotations.media.Schema @Schema(title = "资源类型") data class ResourceTypeInfoVo( @get:Schema(title = "ID") - val id: Int, + val id: Int = 0, @get:Schema(title = "资源类型") val resourceType: String, @get:Schema(title = "资源类型名") @BkFieldI18n(keyPrefixName = "resourceType") val name: String, @get:Schema(title = "父类资源") - val parent: String, + val parent: String = "", @get:Schema(title = "所属系统") - val system: String + val system: String = "" ) diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/UserAndDeptInfoVo.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/UserAndDeptInfoVo.kt index 4bfea2cb17b..c03a529358d 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/UserAndDeptInfoVo.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/UserAndDeptInfoVo.kt @@ -11,6 +11,8 @@ data class UserAndDeptInfoVo( val id: Int, @get:Schema(title = "名称") val name: String, + @get:Schema(title = "别名") + val displayName: String, @get:Schema(title = "信息类型") val type: ManagerScopesEnum, @get:Schema(title = "是否拥有子级") diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/aspect/BkManagerCheckAspect.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/aspect/BkManagerCheckAspect.kt new file mode 100644 index 00000000000..f751e972faa --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/aspect/BkManagerCheckAspect.kt @@ -0,0 +1,99 @@ +/* + * 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.auth.aspect + +import com.tencent.devops.auth.constant.AuthMessageCode +import com.tencent.devops.auth.service.iam.PermissionProjectService +import com.tencent.devops.common.api.constant.CommonMessageCode.PARAMETER_IS_INVALID +import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.api.exception.PermissionForbiddenException +import com.tencent.devops.common.web.utils.I18nUtil +import org.aspectj.lang.JoinPoint +import org.aspectj.lang.annotation.Aspect +import org.aspectj.lang.annotation.Before +import org.aspectj.lang.annotation.Pointcut +import org.aspectj.lang.reflect.MethodSignature +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Component + +@Aspect +@Component +class BkManagerCheckAspect constructor( + private val permissionProjectService: PermissionProjectService +) { + @Pointcut("@annotation(com.tencent.devops.common.auth.api.BkManagerCheck)") + fun pointCut() = Unit + + /** + * Before advice: Executed before the target method + * + * @param jp ProceedingJoinPoint + */ + @Before("pointCut()") + fun checkManager(jp: JoinPoint) { + val parameterValue = jp.args + val parameterNames = (jp.signature as MethodSignature).parameterNames + if (PROJECT_ID !in parameterNames || USER_ID !in parameterNames) { + logger.warn("The request parameters for this method are incorrect: $parameterValue|$parameterNames") + throw ErrorCodeException( + errorCode = PARAMETER_IS_INVALID, + defaultMessage = "The request parameters for this method are incorrect." + + "projectId and userId are required." + ) + } + var projectId: String? = null + var userId: String? = null + parameterNames.forEachIndexed { index, name -> + when (name) { + PROJECT_ID -> projectId = parameterValue[index].toString() + USER_ID -> userId = parameterValue[index].toString() + } + } + if (userId.isNullOrEmpty() || projectId.isNullOrEmpty()) { + throw ErrorCodeException( + errorCode = PARAMETER_IS_INVALID, + defaultMessage = "projectId or userId cannot be empty or null!" + ) + } + val hasProjectManagePermission = permissionProjectService.checkProjectManager( + userId = userId!!, + projectCode = projectId!! + ) + if (!hasProjectManagePermission) { + throw PermissionForbiddenException( + message = I18nUtil.getCodeLanMessage(AuthMessageCode.ERROR_AUTH_NO_MANAGE_PERMISSION) + ) + } + } + + companion object { + private val logger = LoggerFactory.getLogger(BkManagerCheckAspect::class.java) + private const val PROJECT_ID = "projectId" + private const val USER_ID = "userId" + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/common/Constants.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/common/Constants.kt index 9140e08e58b..dd56d40fc8e 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/common/Constants.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/common/Constants.kt @@ -30,9 +30,11 @@ package com.tencent.devops.auth.common object Constants { const val SUPER_MANAGER = -1 const val DEPT_LABEL = "id,name,parent,enabled,has_children" - const val USER_LABLE = "id,username,enabled,departments,extras" + const val USER_LABEL = "id,username,display_name,enabled,departments,extras" + const val USER_NAME_AND_DISPLAY_NAME_LABEL = "id,username,display_name" const val LEVEL = "level" const val PARENT = "parent" + const val ID = "id" const val NAME = "name" const val USERNAME = "username" const val ALL_ACTION = "all_action" diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/cron/AuthCronSyncGroupAndMember.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/cron/AuthCronSyncGroupAndMember.kt new file mode 100644 index 00000000000..774607c5e2b --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/cron/AuthCronSyncGroupAndMember.kt @@ -0,0 +1,66 @@ +package com.tencent.devops.auth.cron + +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO +import com.tencent.devops.common.redis.RedisLock +import com.tencent.devops.common.redis.RedisOperation +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Value +import org.springframework.scheduling.annotation.Scheduled +import org.springframework.stereotype.Component + +@Component +class AuthCronSyncGroupAndMember( + private val redisOperation: RedisOperation, + private val permissionResourceGroupSyncService: PermissionResourceGroupSyncService +) { + @Value("\${sync.cron.enabled:#{false}}") + private var enable: Boolean = false + + private val redisLock = RedisLock(redisOperation, SYNC_CRON_KEY, 10) + + companion object { + private const val SYNC_CRON_KEY = "sync_cron_key" + private val logger = LoggerFactory.getLogger(AuthCronSyncGroupAndMember::class.java) + } + + @Scheduled(cron = "0 0 0 ? * SAT") + fun syncGroupAndMemberRegularly() { + if (!enable) { + return + } + try { + logger.info("sync group and member regularly |start") + val lockSuccess = redisLock.tryLock() + if (lockSuccess) { + permissionResourceGroupSyncService.syncByCondition( + ProjectConditionDTO(enabled = true) + ) + logger.info("sync group and member regularly |finish") + } else { + logger.info("sync group and member regularly |running") + } + } catch (e: Exception) { + logger.warn("sync group and member regularly |error", e) + } + } + + @Scheduled(cron = "0 0 8,16 * * ?") + fun syncIamGroupMembersOfApplyRegularly() { + if (!enable) { + return + } + try { + logger.info("sync members of apply regularly | start") + val lockSuccess = redisLock.tryLock() + if (lockSuccess) { + permissionResourceGroupSyncService.syncIamGroupMembersOfApply() + logger.info("sync members of apply regularly | finish") + } else { + logger.info("sync members of apply regularly | running") + } + } catch (e: Exception) { + logger.warn("sync members of apply regularly | error", e) + } + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthAuthorizationDao.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthAuthorizationDao.kt new file mode 100644 index 00000000000..ef94562a6fc --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthAuthorizationDao.kt @@ -0,0 +1,219 @@ +package com.tencent.devops.auth.dao + +import com.tencent.devops.common.api.util.timestampmilli +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import com.tencent.devops.model.auth.tables.TAuthResourceAuthorization +import com.tencent.devops.model.auth.tables.records.TAuthResourceAuthorizationRecord +import org.jooq.Condition +import org.jooq.DSLContext +import org.springframework.stereotype.Repository +import java.sql.Timestamp +import java.time.LocalDateTime + +@Repository +class AuthAuthorizationDao { + fun batchAdd( + dslContext: DSLContext, + resourceAuthorizationList: List + ) { + with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.batch( + resourceAuthorizationList.map { resourceAuthorizationDto -> + val handoverDateTime = Timestamp(resourceAuthorizationDto.handoverTime!!).toLocalDateTime() + dslContext.insertInto( + this, + PROJECT_CODE, + RESOURCE_TYPE, + RESOURCE_CODE, + RESOURCE_NAME, + HANDOVER_FROM, + HANDOVER_FROM_CN_NAME, + HANDOVER_TIME + ).values( + resourceAuthorizationDto.projectCode, + resourceAuthorizationDto.resourceType, + resourceAuthorizationDto.resourceCode, + resourceAuthorizationDto.resourceName, + resourceAuthorizationDto.handoverFrom, + resourceAuthorizationDto.handoverFromCnName, + handoverDateTime + ) + } + ).execute() + } + } + + fun migrate( + dslContext: DSLContext, + resourceAuthorizationList: List + ) { + with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.batch( + resourceAuthorizationList.map { resourceAuthorizationDto -> + val handoverDateTime = Timestamp(resourceAuthorizationDto.handoverTime!!).toLocalDateTime() + dslContext.insertInto( + this, + PROJECT_CODE, + RESOURCE_TYPE, + RESOURCE_CODE, + RESOURCE_NAME, + HANDOVER_FROM, + HANDOVER_FROM_CN_NAME, + HANDOVER_TIME + ).values( + resourceAuthorizationDto.projectCode, + resourceAuthorizationDto.resourceType, + resourceAuthorizationDto.resourceCode, + resourceAuthorizationDto.resourceName, + resourceAuthorizationDto.handoverFrom, + resourceAuthorizationDto.handoverFromCnName, + handoverDateTime + ).onDuplicateKeyUpdate() + .set(HANDOVER_FROM, resourceAuthorizationDto.handoverFrom) + .set(HANDOVER_FROM_CN_NAME, resourceAuthorizationDto.handoverFromCnName) + .set(RESOURCE_NAME, resourceAuthorizationDto.resourceName) + .set(HANDOVER_TIME, handoverDateTime) + .where(CREATE_TIME.eq(UPDATE_TIME)) + } + ).execute() + } + } + + fun batchUpdate( + dslContext: DSLContext, + resourceAuthorizationHandoverList: List + ) { + with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.batch( + resourceAuthorizationHandoverList.map { resourceAuthorizationDto -> + dslContext.update(this) + .let { + if (resourceAuthorizationDto is ResourceAuthorizationHandoverDTO) { + it.set(HANDOVER_FROM, resourceAuthorizationDto.handoverTo) + .set(HANDOVER_FROM_CN_NAME, resourceAuthorizationDto.handoverToCnName) + .set(HANDOVER_TIME, LocalDateTime.now()) + } else { + it + } + } + .set(RESOURCE_NAME, resourceAuthorizationDto.resourceName) + .set(UPDATE_TIME, LocalDateTime.now()) + .where(PROJECT_CODE.eq(resourceAuthorizationDto.projectCode)) + .and(RESOURCE_TYPE.eq(resourceAuthorizationDto.resourceType)) + .and(RESOURCE_CODE.eq(resourceAuthorizationDto.resourceCode)) + } + ).execute() + } + } + + fun delete( + dslContext: DSLContext, + projectCode: String, + resourceType: String, + resourceCode: String + ) { + with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.deleteFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(RESOURCE_TYPE.eq(resourceType)) + .and(RESOURCE_CODE.eq(resourceCode)) + .execute() + } + } + + fun delete( + dslContext: DSLContext, + projectCode: String, + resourceType: String, + resourceCodes: List + ) { + with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.deleteFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(RESOURCE_TYPE.eq(resourceType)) + .and(RESOURCE_CODE.notIn(resourceCodes)) + .execute() + } + } + + fun get( + dslContext: DSLContext, + projectCode: String, + resourceType: String, + resourceCode: String + ): ResourceAuthorizationResponse? { + return with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.selectFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(RESOURCE_TYPE.eq(resourceType)) + .and(RESOURCE_CODE.eq(resourceCode)) + .fetchAny()?.convert() + } + } + + fun list( + dslContext: DSLContext, + condition: ResourceAuthorizationConditionRequest + ): List { + return with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.selectFrom(this) + .where(buildQueryCondition(condition)) + .let { + if (condition.page != null && condition.pageSize != null) { + it.limit((condition.page!! - 1) * condition.pageSize!!, condition.pageSize) + } else it + } + .fetch().map { it.convert() } + } + } + + fun count( + dslContext: DSLContext, + condition: ResourceAuthorizationConditionRequest + ): Int { + return with(TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION) { + dslContext.selectCount() + .from(this) + .where(buildQueryCondition(condition)) + .fetchOne(0, Int::class.java)!! + } + } + + fun TAuthResourceAuthorization.buildQueryCondition( + conditionReq: ResourceAuthorizationConditionRequest + ): MutableList { + val conditions = mutableListOf() + with(conditionReq) { + conditions.add(PROJECT_CODE.eq(projectCode)) + if (resourceType != null) { + conditions.add(RESOURCE_TYPE.eq(resourceType)) + } + if (resourceName != null) { + conditions.add(RESOURCE_NAME.like("%$resourceName%")) + } + if (handoverFrom != null) { + conditions.add(HANDOVER_FROM.eq(handoverFrom)) + } + if (greaterThanHandoverTime != null && lessThanHandoverTime != null) { + conditions.add(HANDOVER_TIME.ge(Timestamp(greaterThanHandoverTime!!).toLocalDateTime())) + conditions.add(HANDOVER_TIME.le(Timestamp(lessThanHandoverTime!!).toLocalDateTime())) + } + } + return conditions + } + + fun TAuthResourceAuthorizationRecord.convert(): ResourceAuthorizationResponse { + return ResourceAuthorizationResponse( + projectCode = projectCode, + resourceType = resourceType, + resourceName = resourceName, + resourceCode = resourceCode, + handoverTime = handoverTime.timestampmilli(), + handoverFrom = handoverFrom, + handoverFromCnName = handoverFromCnName + ) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupApplyDao.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupApplyDao.kt new file mode 100644 index 00000000000..82fd8c51918 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupApplyDao.kt @@ -0,0 +1,64 @@ +package com.tencent.devops.auth.dao + +import com.tencent.devops.auth.pojo.ApplyJoinGroupInfo +import com.tencent.devops.auth.pojo.enum.ApplyToGroupStatus +import com.tencent.devops.model.auth.tables.TAuthResourceGroupApply +import com.tencent.devops.model.auth.tables.records.TAuthResourceGroupApplyRecord +import org.jooq.DSLContext +import org.jooq.Result +import org.springframework.stereotype.Repository +import java.time.LocalDateTime + +@Repository +class AuthResourceGroupApplyDao { + fun list( + dslContext: DSLContext, + limit: Int, + offset: Int + ): Result { + return with(TAuthResourceGroupApply.T_AUTH_RESOURCE_GROUP_APPLY) { + dslContext.selectFrom(this) + .where(STATUS.eq(ApplyToGroupStatus.PENDING.value)) + .orderBy(CREATE_TIME.asc()) + .offset(offset) + .limit(limit) + .fetch() + } + } + + fun batchUpdate( + dslContext: DSLContext, + ids: List, + applyToGroupStatus: ApplyToGroupStatus + ) { + with(TAuthResourceGroupApply.T_AUTH_RESOURCE_GROUP_APPLY) { + dslContext.batch( + ids.map { id -> + dslContext.update(this) + .set(STATUS, applyToGroupStatus.value) + .set(NUMBER_OF_CHECKS, NUMBER_OF_CHECKS + 1) + .set(UPDATE_TIME, LocalDateTime.now()) + .where(ID.eq(id)) + } + ).execute() + } + } + + fun batchCreate( + dslContext: DSLContext, + applyJoinGroupInfo: ApplyJoinGroupInfo + ) { + with(TAuthResourceGroupApply.T_AUTH_RESOURCE_GROUP_APPLY) { + dslContext.batch( + applyJoinGroupInfo.groupIds.map { groupId -> + dslContext.insertInto(this) + .set(PROJECT_CODE, applyJoinGroupInfo.projectCode) + .set(MEMBER_ID, applyJoinGroupInfo.applicant) + .set(IAM_GROUP_ID, groupId) + .set(STATUS, ApplyToGroupStatus.PENDING.value) + .set(NUMBER_OF_CHECKS, 0) + } + ).execute() + } + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupDao.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupDao.kt index 415fa087084..49efc0066bd 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupDao.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupDao.kt @@ -28,10 +28,12 @@ package com.tencent.devops.auth.dao +import com.tencent.devops.auth.pojo.AuthResourceGroup import com.tencent.devops.model.auth.tables.TAuthResourceGroup import com.tencent.devops.model.auth.tables.records.TAuthResourceGroupRecord import org.jooq.DSLContext import org.jooq.Result +import org.slf4j.LoggerFactory import org.springframework.stereotype.Repository import java.time.LocalDateTime @@ -83,6 +85,49 @@ class AuthResourceGroupDao { } } + fun batchCreate( + dslContext: DSLContext, + authResourceGroups: List + ) { + val now = LocalDateTime.now() + with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { + dslContext.batch(authResourceGroups.map { + dslContext.insertInto( + this, + PROJECT_CODE, + RESOURCE_TYPE, + RESOURCE_CODE, + RESOURCE_NAME, + IAM_RESOURCE_CODE, + GROUP_CODE, + GROUP_NAME, + DEFAULT_GROUP, + RELATION_ID, + CREATE_TIME, + UPDATE_TIME, + DESCRIPTION, + IAM_TEMPLATE_ID + ).values( + it.projectCode, + it.resourceType, + it.resourceCode, + it.resourceName, + it.iamResourceCode, + it.groupCode, + it.groupName, + it.defaultGroup, + it.relationId.toString(), + now, + now, + it.description, + it.iamTemplateId + ).onDuplicateKeyUpdate() + .set(GROUP_NAME, it.groupName) + .set(UPDATE_TIME, now) + }).execute() + } + } + fun update( dslContext: DSLContext, projectCode: String, @@ -90,13 +135,15 @@ class AuthResourceGroupDao { resourceCode: String, resourceName: String, groupCode: String, - groupName: String + groupName: String, + relationId: String? = null ): Int { val now = LocalDateTime.now() return with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { dslContext.update(this) .set(GROUP_NAME, groupName) .set(RESOURCE_NAME, resourceName) + .let { if (relationId != null) it.set(RELATION_ID, relationId) else it } .set(UPDATE_TIME, now) .where(PROJECT_CODE.eq(projectCode)) .and(RESOURCE_CODE.eq(resourceCode)) @@ -106,6 +153,24 @@ class AuthResourceGroupDao { } } + fun batchUpdate( + dslContext: DSLContext, + authResourceGroups: List + ) { + val now = LocalDateTime.now() + with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { + dslContext.batch(authResourceGroups.map { + dslContext.update(this) + .set(GROUP_NAME, it.groupName) + .set(DESCRIPTION, it.description) + .set(IAM_TEMPLATE_ID, it.iamTemplateId) + .set(UPDATE_TIME, now) + .where(PROJECT_CODE.eq(it.projectCode)) + .and(ID.eq(it.id!!)) + }).execute() + } + } + fun get( dslContext: DSLContext, projectCode: String, @@ -184,6 +249,19 @@ class AuthResourceGroupDao { } } + fun listIamGroupIdsByConditions( + dslContext: DSLContext, + projectCode: String, + iamGroupIds: List + ): List { + return with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { + dslContext.select(RELATION_ID).from(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(RELATION_ID.`in`(iamGroupIds)) + .fetch().map { it.value1().toInt() } + } + } + fun getByGroupName( dslContext: DSLContext, projectCode: String, @@ -205,11 +283,29 @@ class AuthResourceGroupDao { projectCode: String, resourceType: String, resourceCode: String - ): List { + ): List { return with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { + val result = mutableListOf() dslContext.selectFrom(this).where(PROJECT_CODE.eq(projectCode)) .and(RESOURCE_CODE.eq(resourceCode)) .and(RESOURCE_TYPE.eq(resourceType)) + .fetch().forEach { + val authResourceGroup = convert(it) + if (authResourceGroup != null) { + result.add(authResourceGroup) + } + } + result + } + } + + fun listRecordsOfNeedToFix( + dslContext: DSLContext, + projectCode: String + ): Result { + return with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { + dslContext.selectFrom(this).where(PROJECT_CODE.eq(projectCode)) + .and(RELATION_ID.eq("null")) .fetch() } } @@ -241,4 +337,60 @@ class AuthResourceGroupDao { .fetchOne(0, Int::class.java)!! } } + + fun listGroupByResourceType( + dslContext: DSLContext, + projectCode: String, + resourceType: String, + offset: Int, + limit: Int + ): List { + return with(TAuthResourceGroup.T_AUTH_RESOURCE_GROUP) { + val records = dslContext.selectFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(RESOURCE_TYPE.eq(resourceType)) + .offset(offset) + .limit(limit) + .fetch() + val result = mutableListOf() + records.forEach { + val authResourceGroup = convert(it) + if (authResourceGroup != null) { + result.add(authResourceGroup) + } + } + result + } + } + + fun convert(record: TAuthResourceGroupRecord): AuthResourceGroup? { + // 同步iam数据时，可能会出现relationId为null的情况，此时转Int类型，会有异常 + with(record) { + return try { + AuthResourceGroup( + id = id, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + resourceName = resourceName, + iamResourceCode = iamResourceCode, + groupCode = groupCode, + groupName = groupName, + defaultGroup = defaultGroup, + relationId = relationId.toInt(), + createTime = createTime, + updateTime = updateTime + ) + } catch (ignore: Exception) { + logger.warn( + "convert Group Record failed!|$projectCode|$resourceType|$resourceCode", ignore + ) + null + } + } + } + + companion object { + private val logger = LoggerFactory.getLogger(AuthResourceGroupDao::class.java) + } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupMemberDao.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupMemberDao.kt new file mode 100644 index 00000000000..1d95eb1b2f8 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupMemberDao.kt @@ -0,0 +1,600 @@ +/* + * 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.auth.dao + +import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum +import com.tencent.devops.auth.pojo.AuthResourceGroupMember +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import com.tencent.devops.common.auth.api.pojo.BkAuthGroup +import com.tencent.devops.model.auth.tables.TAuthResourceAuthorization +import com.tencent.devops.model.auth.tables.TAuthResourceGroupMember +import com.tencent.devops.model.auth.tables.records.TAuthResourceGroupMemberRecord +import org.jooq.Condition +import org.jooq.DSLContext +import org.jooq.Table +import org.jooq.impl.DSL.count +import org.jooq.impl.DSL.countDistinct +import org.jooq.impl.DSL.field +import org.jooq.impl.DSL.inline +import org.springframework.stereotype.Repository +import java.time.LocalDateTime + +@Repository +@Suppress("LongParameterList") +class AuthResourceGroupMemberDao { + fun create( + dslContext: DSLContext, + projectCode: String, + resourceType: String, + resourceCode: String, + groupCode: String, + iamGroupId: Int, + memberId: String, + memberName: String, + memberType: String, + expiredTime: LocalDateTime + ) { + val now = LocalDateTime.now() + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.insertInto( + this, + PROJECT_CODE, + RESOURCE_TYPE, + RESOURCE_CODE, + GROUP_CODE, + IAM_GROUP_ID, + MEMBER_ID, + MEMBER_NAME, + MEMBER_TYPE, + EXPIRED_TIME, + CREATE_TIME, + UPDATE_TIME + ).values( + projectCode, + resourceType, + resourceCode, + groupCode, + iamGroupId, + memberId, + memberName, + memberType, + expiredTime, + now, + now + ).onDuplicateKeyUpdate() + .set(MEMBER_NAME, memberName) + .set(EXPIRED_TIME, expiredTime) + .execute() + } + } + + fun update( + dslContext: DSLContext, + projectCode: String, + iamGroupId: Int, + memberId: String, + memberName: String? = null, + expiredTime: LocalDateTime + ) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.update(this) + .let { if (memberName != null) it.set(MEMBER_NAME, memberName) else it } + .set(EXPIRED_TIME, expiredTime) + .set(UPDATE_TIME, LocalDateTime.now()) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.eq(iamGroupId)) + .and(MEMBER_ID.eq(memberId)) + .execute() + } + } + + fun batchCreate(dslContext: DSLContext, groupMembers: List) { + val now = LocalDateTime.now() + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.batch(groupMembers.map { + dslContext.insertInto( + this, + PROJECT_CODE, + RESOURCE_TYPE, + RESOURCE_CODE, + GROUP_CODE, + IAM_GROUP_ID, + MEMBER_ID, + MEMBER_NAME, + MEMBER_TYPE, + EXPIRED_TIME, + CREATE_TIME, + UPDATE_TIME + ).values( + it.projectCode, + it.resourceType, + it.resourceCode, + it.groupCode, + it.iamGroupId, + it.memberId, + it.memberName, + it.memberType, + it.expiredTime, + now, + now + ).onDuplicateKeyUpdate() + .set(MEMBER_NAME, it.memberName) + .set(EXPIRED_TIME, it.expiredTime) + }).execute() + } + } + + fun batchUpdate(dslContext: DSLContext, groupMembers: List) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.batch(groupMembers.map { + dslContext.update(this) + .set(MEMBER_NAME, it.memberName) + .set(EXPIRED_TIME, it.expiredTime) + .set(UPDATE_TIME, LocalDateTime.now()) + .where(PROJECT_CODE.eq(it.projectCode)) + .and(IAM_GROUP_ID.eq(it.iamGroupId)) + .and(MEMBER_ID.eq(it.memberId)) + }).execute() + } + } + + fun batchDelete(dslContext: DSLContext, ids: Set) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.delete(this) + .where(ID.`in`(ids)) + .execute() + } + } + + fun batchDeleteGroupMembers( + dslContext: DSLContext, + projectCode: String, + iamGroupId: Int, + memberIds: List + ) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.delete(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.eq(iamGroupId)) + .and(MEMBER_ID.`in`(memberIds)) + .execute() + } + } + + fun deleteByIamGroupId( + dslContext: DSLContext, + projectCode: String, + iamGroupId: Int + ) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.delete(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.eq(iamGroupId)) + .execute() + } + } + + fun deleteByIamGroupIds( + dslContext: DSLContext, + projectCode: String, + iamGroupIds: List + ) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.delete(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.`in`(iamGroupIds)) + .execute() + } + } + + fun deleteByResource( + dslContext: DSLContext, + projectCode: String, + resourceType: String, + resourceCode: String + ) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.delete(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(RESOURCE_TYPE.eq(resourceType)) + .and(RESOURCE_CODE.eq(resourceCode)) + .execute() + } + } + + fun isMemberInGroup( + dslContext: DSLContext, + projectCode: String, + iamGroupId: Int, + memberId: String + ): Boolean { + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.selectCount() + .from(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.eq(iamGroupId)) + .and(MEMBER_ID.eq(memberId)) + .fetchOne(0, Int::class.java) != 0 + } + } + + fun isMembersInProject( + dslContext: DSLContext, + projectCode: String, + memberNames: List, + memberType: String + ): List { + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.select(MEMBER_ID, MEMBER_NAME, MEMBER_TYPE) + .from(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(MEMBER_NAME.`in`(memberNames)) + .and(MEMBER_TYPE.eq(memberType)) + .groupBy(MEMBER_NAME, MEMBER_ID, MEMBER_TYPE) + .fetch().map { + ResourceMemberInfo( + id = it.value1(), + name = it.value2(), + type = it.value3() + ) + } + } + } + + fun handoverGroupMembers( + dslContext: DSLContext, + projectCode: String, + iamGroupId: Int, + handoverFrom: ResourceMemberInfo, + handoverTo: ResourceMemberInfo, + expiredTime: LocalDateTime + ) { + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.update(this) + .set(MEMBER_ID, handoverTo.id) + .set(MEMBER_NAME, handoverTo.name) + .set(MEMBER_TYPE, handoverTo.type) + .set(EXPIRED_TIME, expiredTime) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.eq(iamGroupId)) + .and(MEMBER_ID.eq(handoverFrom.id)) + .execute() + } + } + + fun listResourceGroupMember( + dslContext: DSLContext, + projectCode: String, + resourceType: String? = null, + memberId: String? = null, + memberName: String? = null, + memberType: String? = null, + iamGroupId: Int? = null + ): List { + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + val select = dslContext.selectFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + resourceType?.let { select.and(RESOURCE_TYPE.eq(resourceType)) } + memberId?.let { select.and(MEMBER_ID.eq(memberId)) } + memberName?.let { select.and(MEMBER_NAME.eq(memberName)) } + memberType?.let { select.and(MEMBER_TYPE.eq(memberType)) } + iamGroupId?.let { select.and(IAM_GROUP_ID.eq(iamGroupId)) } + select.fetch().map { convert(it) } + } + } + + fun listProjectGroups( + dslContext: DSLContext, + projectCode: String, + offset: Int, + limit: Int + ): List { + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.select(IAM_GROUP_ID).from(this) + .where(PROJECT_CODE.eq(projectCode)) + .groupBy(IAM_GROUP_ID) + .orderBy(CREATE_TIME.desc()) + .offset(offset).limit(limit) + .fetch().map { it.value1() } + } + } + + fun listProjectMember( + dslContext: DSLContext, + projectCode: String, + memberType: String?, + userName: String?, + deptName: String?, + offset: Int, + limit: Int + ): List { + val resourceMemberUnionAuthorizationMember = createResourceMemberUnionAuthorizationMember( + dslContext = dslContext, + projectCode = projectCode + ) + + return dslContext + .select( + field(MEMBER_ID, String::class.java), + field(MEMBER_NAME, String::class.java), + field(MEMBER_TYPE, String::class.java) + ) + .from(resourceMemberUnionAuthorizationMember) + .where( + buildResourceMemberConditions( + memberType = memberType, + userName = userName, + deptName = deptName + ) + ) + .groupBy( + field(MEMBER_ID) + ) + .orderBy(field(MEMBER_ID)) + .offset(offset).limit(limit) + .fetch().map { + ResourceMemberInfo(id = it.value1(), name = it.value2(), type = it.value3()) + } + } + + fun countProjectMember( + dslContext: DSLContext, + projectCode: String + ): Map { + val resourceMemberUnionAuthorizationMember = createResourceMemberUnionAuthorizationMember( + dslContext = dslContext, + projectCode = projectCode + ) + + return dslContext.select( + field(MEMBER_TYPE, String::class.java), + countDistinct(field(MEMBER_ID, Long::class.java)) + ).from(resourceMemberUnionAuthorizationMember) + .groupBy(field(MEMBER_TYPE, Long::class.java)) + .fetch().map { Pair(it.value1(), it.value2()) }.toMap() + } + + fun countProjectMember( + dslContext: DSLContext, + projectCode: String, + memberType: String?, + userName: String?, + deptName: String? + ): Long { + val resourceMemberUnionAuthorizationMember = createResourceMemberUnionAuthorizationMember( + dslContext = dslContext, + projectCode = projectCode + ) + return dslContext + .select(countDistinct(field(MEMBER_ID, Long::class.java))) + .from(resourceMemberUnionAuthorizationMember) + .where( + buildResourceMemberConditions( + memberType = memberType, + userName = userName, + deptName = deptName + ) + ) + .fetchOne(0, Long::class.java) ?: 0L + } + + fun createResourceMemberUnionAuthorizationMember(dslContext: DSLContext, projectCode: String): Table<*> { + val tResourceGroupMember = TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER + val tResourceAuthorization = TAuthResourceAuthorization.T_AUTH_RESOURCE_AUTHORIZATION + + return dslContext + .select( + tResourceGroupMember.MEMBER_ID, + tResourceGroupMember.MEMBER_NAME, + tResourceGroupMember.MEMBER_TYPE + ) + .from(tResourceGroupMember) + .where(tResourceGroupMember.PROJECT_CODE.eq(projectCode)) + .and(tResourceGroupMember.MEMBER_TYPE.notEqual(ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE))) + .unionAll( + dslContext.select( + tResourceAuthorization.HANDOVER_FROM.`as`("MEMBER_ID"), + tResourceAuthorization.HANDOVER_FROM_CN_NAME.`as`("MEMBER_NAME"), + inline("user").`as`("MEMBER_TYPE") + ) + .from(tResourceAuthorization) + .where(tResourceAuthorization.PROJECT_CODE.eq(projectCode)) + ) + .asTable(TABLE_NAME) + } + + fun buildResourceMemberConditions( + memberType: String?, + userName: String?, + deptName: String? + ): MutableList { + val conditions = mutableListOf() + val memberId = field(MEMBER_ID, String::class.java) + val memberTypeField = field(MEMBER_TYPE, String::class.java) + val memberName = field(MEMBER_NAME, String::class.java) + + if (memberType != null) { + conditions.add(memberTypeField.eq(memberType)) + } + if (userName != null) { + conditions.add(memberTypeField.eq(ManagerScopesEnum.getType(ManagerScopesEnum.USER))) + conditions.add(memberId.like("%$userName%").or(memberName.like("%$userName%"))) + } + if (deptName != null) { + conditions.add(memberTypeField.eq(ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT))) + conditions.add(memberName.like("%$deptName%")) + } + return conditions + } + + /** + * 查询组下所有成员 + */ + fun listGroupMember( + dslContext: DSLContext, + projectCode: String, + iamGroupId: Int + ): List { + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.selectFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(IAM_GROUP_ID.eq(iamGroupId)) + .fetch().map { + convert(it) + } + } + } + + /** + * 获取成员按资源类型分组数量 + */ + fun countMemberGroup( + dslContext: DSLContext, + projectCode: String, + memberId: String, + iamTemplateIds: List, + resourceType: String? = null, + iamGroupIds: List? = null + ): Map { + val conditions = buildMemberGroupCondition( + projectCode = projectCode, + memberId = memberId, + iamTemplateIds = iamTemplateIds, + resourceType = resourceType, + iamGroupIds = iamGroupIds + ) + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + val select = dslContext.select(RESOURCE_TYPE, count()) + .from(this) + .where(conditions) + select.groupBy(RESOURCE_TYPE) + select.fetch().map { Pair(it.value1(), it.value2().toLong()) }.toMap() + } + } + + /** + * 获取成员下用户组列表 + */ + fun listMemberGroupDetail( + dslContext: DSLContext, + projectCode: String, + memberId: String, + iamTemplateIds: List, + resourceType: String? = null, + iamGroupIds: List? = null, + offset: Int? = null, + limit: Int? = null + ): List { + val conditions = buildMemberGroupCondition( + projectCode = projectCode, + memberId = memberId, + iamTemplateIds = iamTemplateIds, + resourceType = resourceType, + iamGroupIds = iamGroupIds + ) + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.selectFrom(this) + .where(conditions) + .orderBy(IAM_GROUP_ID.desc()) + .let { if (offset != null && limit != null) it.offset(offset).limit(limit) else it } + .fetch() + .map { convert(it) } + } + } + + private fun buildMemberGroupCondition( + projectCode: String, + memberId: String, + iamTemplateIds: List, + resourceType: String? = null, + iamGroupIds: List? = null + ): MutableList { + val conditions = mutableListOf() + with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + conditions.add(PROJECT_CODE.eq(projectCode)) + conditions.add( + (MEMBER_ID.eq(memberId).and( + MEMBER_TYPE.`in`( + listOf( + ManagerScopesEnum.getType(ManagerScopesEnum.USER), + ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT) + ) + ) + )) + .or( + MEMBER_ID.`in`(iamTemplateIds) + .and(MEMBER_TYPE.eq(ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE))) + ) + ) + resourceType?.let { conditions.add(RESOURCE_TYPE.eq(resourceType)) } + iamGroupIds?.let { conditions.add(IAM_GROUP_ID.`in`(iamGroupIds)) } + } + return conditions + } + + fun listProjectUniqueManagerGroups( + dslContext: DSLContext, + projectCode: String, + iamGroupIds: List + ): List { + return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) { + dslContext.select(IAM_GROUP_ID) + .from(this) + .where(PROJECT_CODE.eq(projectCode)) + .and(GROUP_CODE.eq(BkAuthGroup.MANAGER.value)) + .and(IAM_GROUP_ID.`in`(iamGroupIds)) + .groupBy(IAM_GROUP_ID) + .having(count(MEMBER_ID).eq(1)) + .fetch().map { it.value1() } + } + } + + fun convert(record: TAuthResourceGroupMemberRecord): AuthResourceGroupMember { + return with(record) { + AuthResourceGroupMember( + id = id, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = groupCode, + iamGroupId = iamGroupId, + memberId = memberId, + memberName = memberName, + memberType = memberType, + expiredTime = expiredTime + ) + } + } + + companion object { + private const val TABLE_NAME = "resourceMemberUnionAuthorizationMember" + private const val MEMBER_ID = "$TABLE_NAME.MEMBER_ID" + private const val MEMBER_NAME = "$TABLE_NAME.MEMBER_NAME" + private const val MEMBER_TYPE = "$TABLE_NAME.MEMBER_TYPE" + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceSyncDao.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceSyncDao.kt new file mode 100644 index 00000000000..182fe21ef1f --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceSyncDao.kt @@ -0,0 +1,97 @@ +/* + * 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.auth.dao + +import com.tencent.devops.model.auth.tables.TAuthResourceSync +import com.tencent.devops.model.auth.tables.records.TAuthResourceSyncRecord +import org.jooq.DSLContext +import org.springframework.stereotype.Repository +import java.time.LocalDateTime + +@Repository +class AuthResourceSyncDao { + + fun createOrUpdate( + dslContext: DSLContext, + projectCode: String, + status: Int + ) { + val now = LocalDateTime.now() + with(TAuthResourceSync.T_AUTH_RESOURCE_SYNC) { + dslContext.insertInto( + this, + PROJECT_CODE, + STATUS, + CREATE_TIME, + UPDATE_TIME + ).values( + projectCode, + status, + now, + now + ).onDuplicateKeyUpdate() + .set(STATUS, status) + .set(ERROR_MESSAGE, "") + .set(UPDATE_TIME, now) + .execute() + } + } + + fun updateStatus( + dslContext: DSLContext, + projectCode: String, + status: Int, + errorMessage: String? = null, + totalTime: Long? + ) { + with(TAuthResourceSync.T_AUTH_RESOURCE_SYNC) { + val update = dslContext.update(this) + .set(STATUS, status) + .set(UPDATE_TIME, LocalDateTime.now()) + if (totalTime != null) { + update.set(TOTAL_TIME, totalTime) + } + if (errorMessage != null) { + update.set(ERROR_MESSAGE, errorMessage) + } + update.where(PROJECT_CODE.eq(projectCode)).execute() + } + } + + fun get( + dslContext: DSLContext, + projectCode: String + ): TAuthResourceSyncRecord? { + with(TAuthResourceSync.T_AUTH_RESOURCE_SYNC) { + return dslContext.selectFrom(this) + .where(PROJECT_CODE.eq(projectCode)) + .fetchOne() + } + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceTypeDao.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceTypeDao.kt index 756f2e3c6bd..4bb7a6de6f1 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceTypeDao.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceTypeDao.kt @@ -1,5 +1,6 @@ package com.tencent.devops.auth.dao +import com.tencent.devops.common.db.utils.skipCheck import com.tencent.devops.model.auth.tables.TAuthResourceType import com.tencent.devops.model.auth.tables.records.TAuthResourceTypeRecord import org.jooq.DSLContext @@ -10,7 +11,11 @@ import org.springframework.stereotype.Repository class AuthResourceTypeDao { fun list(dslContext: DSLContext): Result { return with(TAuthResourceType.T_AUTH_RESOURCE_TYPE) { - dslContext.selectFrom(this).where(DELETE.eq(false)).orderBy(ID.asc()).fetch() + dslContext.selectFrom(this) + .where(DELETE.eq(false)) + .orderBy(ID.asc()) + .skipCheck() + .fetch() } } @@ -23,6 +28,7 @@ class AuthResourceTypeDao { dslContext.selectFrom(this) .orderBy(CREATE_TIME.desc(), RESOURCE_TYPE) .limit(pageSize).offset((page - 1) * pageSize) + .skipCheck() .fetch() } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacAuthConfiguration.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacAuthConfiguration.kt index e7d3d85424c..f6dc9dd7779 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacAuthConfiguration.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacAuthConfiguration.kt @@ -44,8 +44,11 @@ import com.tencent.bk.sdk.iam.service.v2.impl.V2ManagerServiceImpl import com.tencent.bk.sdk.iam.service.v2.impl.V2PolicyServiceImpl import com.tencent.devops.auth.dao.AuthMigrationDao import com.tencent.devops.auth.dao.AuthMonitorSpaceDao +import com.tencent.devops.auth.dao.AuthResourceGroupApplyDao import com.tencent.devops.auth.dao.AuthResourceGroupConfigDao import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.dao.AuthResourceGroupMemberDao +import com.tencent.devops.auth.dao.AuthResourceSyncDao import com.tencent.devops.auth.provider.rbac.service.AuthResourceCodeConverter import com.tencent.devops.auth.provider.rbac.service.AuthResourceService import com.tencent.devops.auth.provider.rbac.service.ItsmService @@ -61,6 +64,7 @@ import com.tencent.devops.auth.provider.rbac.service.RbacPermissionItsmCallbackS import com.tencent.devops.auth.provider.rbac.service.RbacPermissionProjectService import com.tencent.devops.auth.provider.rbac.service.RbacPermissionResourceCallbackService import com.tencent.devops.auth.provider.rbac.service.RbacPermissionResourceGroupService +import com.tencent.devops.auth.provider.rbac.service.RbacPermissionResourceGroupSyncService import com.tencent.devops.auth.provider.rbac.service.RbacPermissionResourceMemberService import com.tencent.devops.auth.provider.rbac.service.RbacPermissionResourceService import com.tencent.devops.auth.provider.rbac.service.RbacPermissionResourceValidateService @@ -68,7 +72,9 @@ import com.tencent.devops.auth.provider.rbac.service.RbacPermissionService import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateCreatorFixServiceImpl import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateIamApiService import com.tencent.devops.auth.provider.rbac.service.migrate.MigratePermissionHandoverService +import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResourceAuthorizationService import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResourceCodeConverter +import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResourceGroupService import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResourceService import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResultService import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateV0PolicyService @@ -78,12 +84,14 @@ import com.tencent.devops.auth.service.AuthMonitorSpaceService import com.tencent.devops.auth.service.AuthProjectUserMetricsService import com.tencent.devops.auth.service.AuthVerifyRecordService import com.tencent.devops.auth.service.DeptService +import com.tencent.devops.auth.service.PermissionAuthorizationService import com.tencent.devops.auth.service.ResourceService import com.tencent.devops.auth.service.SuperManagerService import com.tencent.devops.auth.service.iam.MigrateCreatorFixService -import com.tencent.devops.auth.service.iam.PermissionProjectService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.auth.service.iam.PermissionResourceMemberService import com.tencent.devops.auth.service.iam.PermissionResourceService +import com.tencent.devops.auth.service.iam.PermissionResourceValidateService import com.tencent.devops.auth.service.iam.PermissionService import com.tencent.devops.common.auth.api.AuthTokenApi import com.tencent.devops.common.auth.code.ProjectAuthServiceCode @@ -142,21 +150,19 @@ class RbacAuthConfiguration { permissionGradeManagerService: PermissionGradeManagerService, permissionSubsetManagerService: PermissionSubsetManagerService, authResourceCodeConverter: AuthResourceCodeConverter, - permissionService: PermissionService, - permissionProjectService: PermissionProjectService, traceEventDispatcher: TraceEventDispatcher, iamV2ManagerService: V2ManagerService, - client: Client + permissionAuthorizationService: PermissionAuthorizationService, + permissionResourceValidateService: PermissionResourceValidateService ) = RbacPermissionResourceService( authResourceService = authResourceService, permissionGradeManagerService = permissionGradeManagerService, permissionSubsetManagerService = permissionSubsetManagerService, authResourceCodeConverter = authResourceCodeConverter, - permissionService = permissionService, - permissionProjectService = permissionProjectService, traceEventDispatcher = traceEventDispatcher, iamV2ManagerService = iamV2ManagerService, - client = client + permissionAuthorizationService = permissionAuthorizationService, + permissionResourceValidateService = permissionResourceValidateService ) @Bean @@ -165,26 +171,26 @@ class RbacAuthConfiguration { iamV2ManagerService: V2ManagerService, authResourceService: AuthResourceService, permissionSubsetManagerService: PermissionSubsetManagerService, - permissionProjectService: PermissionProjectService, permissionGroupPoliciesService: PermissionGroupPoliciesService, authResourceGroupDao: AuthResourceGroupDao, dslContext: DSLContext, v2ManagerService: V2ManagerService, rbacCacheService: RbacCacheService, monitorSpaceService: AuthMonitorSpaceService, - authResourceGroupConfigDao: AuthResourceGroupConfigDao + authResourceGroupConfigDao: AuthResourceGroupConfigDao, + authResourceGroupMemberDao: AuthResourceGroupMemberDao ) = RbacPermissionResourceGroupService( iamV2ManagerService = iamV2ManagerService, authResourceService = authResourceService, permissionSubsetManagerService = permissionSubsetManagerService, - permissionProjectService = permissionProjectService, permissionGroupPoliciesService = permissionGroupPoliciesService, authResourceGroupDao = authResourceGroupDao, dslContext = dslContext, v2ManagerService = v2ManagerService, rbacCacheService = rbacCacheService, monitorSpaceService = monitorSpaceService, - authResourceGroupConfigDao = authResourceGroupConfigDao + authResourceGroupConfigDao = authResourceGroupConfigDao, + authResourceGroupMemberDao = authResourceGroupMemberDao ) @Bean @@ -192,14 +198,22 @@ class RbacAuthConfiguration { authResourceService: AuthResourceService, iamV2ManagerService: V2ManagerService, authResourceGroupDao: AuthResourceGroupDao, + authResourceGroupMemberDao: AuthResourceGroupMemberDao, dslContext: DSLContext, - deptService: DeptService + deptService: DeptService, + rbacCacheService: RbacCacheService, + permissionAuthorizationService: PermissionAuthorizationService, + syncIamGroupMemberService: PermissionResourceGroupSyncService ) = RbacPermissionResourceMemberService( authResourceService = authResourceService, iamV2ManagerService = iamV2ManagerService, authResourceGroupDao = authResourceGroupDao, + authResourceGroupMemberDao = authResourceGroupMemberDao, dslContext = dslContext, - deptService = deptService + deptService = deptService, + rbacCacheService = rbacCacheService, + permissionAuthorizationService = permissionAuthorizationService, + syncIamGroupMemberService = syncIamGroupMemberService ) @Bean @@ -291,7 +305,9 @@ class RbacAuthConfiguration { client: Client, authResourceCodeConverter: AuthResourceCodeConverter, permissionService: PermissionService, - itsmService: ItsmService + itsmService: ItsmService, + deptService: DeptService, + authResourceGroupApplyDao: AuthResourceGroupApplyDao ) = RbacPermissionApplyService( dslContext = dslContext, v2ManagerService = v2ManagerService, @@ -303,17 +319,21 @@ class RbacAuthConfiguration { client = client, authResourceCodeConverter = authResourceCodeConverter, permissionService = permissionService, - itsmService = itsmService + itsmService = itsmService, + deptService = deptService, + authResourceGroupApplyDao = authResourceGroupApplyDao ) @Bean @Primary fun rbacPermissionResourceValidateService( permissionService: PermissionService, - rbacCacheService: RbacCacheService + rbacCacheService: RbacCacheService, + client: Client ) = RbacPermissionResourceValidateService( permissionService = permissionService, - rbacCacheService = rbacCacheService + rbacCacheService = rbacCacheService, + client = client ) @Bean @@ -356,6 +376,19 @@ class RbacAuthConfiguration { authResourceGroupDao = authResourceGroupDao ) + @Bean + fun migrateResourceGroupService( + authResourceService: AuthResourceService, + dslContext: DSLContext, + authResourceGroupDao: AuthResourceGroupDao, + iamV2ManagerService: V2ManagerService + ) = MigrateResourceGroupService( + authResourceService = authResourceService, + dslContext = dslContext, + authResourceGroupDao = authResourceGroupDao, + iamV2ManagerService = iamV2ManagerService + ) + @Bean fun migrateIamApiService() = MigrateIamApiService() @@ -469,7 +502,9 @@ class RbacAuthConfiguration { authMigrationDao: AuthMigrationDao, authMonitorSpaceDao: AuthMonitorSpaceDao, cacheService: RbacCacheService, - permissionResourceMemberService: RbacPermissionResourceMemberService + permissionResourceMemberService: RbacPermissionResourceMemberService, + migrateResourceAuthorizationService: MigrateResourceAuthorizationService, + migrateResourceGroupService: MigrateResourceGroupService ) = RbacPermissionMigrateService( client = client, migrateResourceService = migrateResourceService, @@ -485,7 +520,9 @@ class RbacAuthConfiguration { authMigrationDao = authMigrationDao, authMonitorSpaceDao = authMonitorSpaceDao, cacheService = cacheService, - permissionResourceMemberService = permissionResourceMemberService + permissionResourceMemberService = permissionResourceMemberService, + migrateResourceAuthorizationService = migrateResourceAuthorizationService, + migrateResourceGroupService = migrateResourceGroupService ) @Bean @@ -533,4 +570,29 @@ class RbacAuthConfiguration { objectMapper = objectMapper, systemService = systemService ) + + @Bean + fun permissionResourceGroupSyncService( + client: Client, + dslContext: DSLContext, + authResourceService: AuthResourceService, + authResourceGroupDao: AuthResourceGroupDao, + iamV2ManagerService: V2ManagerService, + authResourceGroupMemberDao: AuthResourceGroupMemberDao, + rbacCacheService: RbacCacheService, + redisOperation: RedisOperation, + authResourceSyncDao: AuthResourceSyncDao, + authResourceGroupApplyDao: AuthResourceGroupApplyDao + ) = RbacPermissionResourceGroupSyncService( + client = client, + dslContext = dslContext, + authResourceService = authResourceService, + authResourceGroupDao = authResourceGroupDao, + iamV2ManagerService = iamV2ManagerService, + authResourceGroupMemberDao = authResourceGroupMemberDao, + rbacCacheService = rbacCacheService, + redisOperation = redisOperation, + authResourceSyncDao = authResourceSyncDao, + authResourceGroupApplyDao = authResourceGroupApplyDao + ) } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacMQConfiguration.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacMQConfiguration.kt index ea3e33d5493..d4476144f65 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacMQConfiguration.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacMQConfiguration.kt @@ -32,8 +32,10 @@ import com.tencent.devops.auth.dao.AuthItsmCallbackDao import com.tencent.devops.auth.provider.rbac.listener.AuthItsmCallbackListener import com.tencent.devops.auth.provider.rbac.listener.AuthResourceGroupCreateListener import com.tencent.devops.auth.provider.rbac.listener.AuthResourceGroupModifyListener +import com.tencent.devops.auth.provider.rbac.listener.SyncGroupAndMemberListener import com.tencent.devops.auth.provider.rbac.service.PermissionGradeManagerService import com.tencent.devops.auth.provider.rbac.service.PermissionSubsetManagerService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.common.client.Client import com.tencent.devops.common.event.dispatcher.pipeline.mq.MQ import com.tencent.devops.common.event.dispatcher.pipeline.mq.Tools @@ -42,6 +44,7 @@ import org.jooq.DSLContext import org.springframework.amqp.core.Binding import org.springframework.amqp.core.BindingBuilder import org.springframework.amqp.core.DirectExchange +import org.springframework.amqp.core.FanoutExchange import org.springframework.amqp.core.Queue import org.springframework.amqp.rabbit.connection.ConnectionFactory import org.springframework.amqp.rabbit.core.RabbitAdmin @@ -62,6 +65,55 @@ class RbacMQConfiguration { @Bean fun traceEventDispatcher(rabbitTemplate: RabbitTemplate) = TraceEventDispatcher(rabbitTemplate) + @Bean + fun projectEnableExchange(): FanoutExchange { + val fanoutExchange = FanoutExchange(MQ.EXCHANGE_PROJECT_ENABLE_FANOUT, true, false) + fanoutExchange.isDelayed = true + return fanoutExchange + } + + @Bean + fun syncWhenEnabledProjectQueue(): Queue { + return Queue(MQ.QUEUE_PROJECT_ENABLED_SYNC_GROUP_AND_MEMBER, true) + } + + @Bean + fun syncWhenEnabledProjectBind( + @Autowired syncWhenEnabledProjectQueue: Queue, + @Autowired projectEnableExchange: FanoutExchange + ): Binding { + return BindingBuilder.bind(syncWhenEnabledProjectQueue).to(projectEnableExchange) + } + + @Bean + fun syncGroupAndMemberListener( + permissionResourceGroupSyncService: PermissionResourceGroupSyncService + ) = SyncGroupAndMemberListener( + permissionResourceGroupSyncService = permissionResourceGroupSyncService + ) + + @Bean + fun syncEventListenerContainer( + @Autowired connectionFactory: ConnectionFactory, + @Autowired syncWhenEnabledProjectQueue: Queue, + @Autowired rabbitAdmin: RabbitAdmin, + @Autowired syncGroupAndMemberListener: SyncGroupAndMemberListener, + @Autowired messageConverter: Jackson2JsonMessageConverter + ): SimpleMessageListenerContainer { + val adapter = MessageListenerAdapter(syncGroupAndMemberListener, syncGroupAndMemberListener::execute.name) + adapter.setMessageConverter(messageConverter) + return Tools.createSimpleMessageListenerContainerByAdapter( + connectionFactory = connectionFactory, + queue = syncWhenEnabledProjectQueue, + rabbitAdmin = rabbitAdmin, + adapter = adapter, + startConsumerMinInterval = 5000, + consecutiveActiveTrigger = 5, + concurrency = 10, + maxConcurrency = 20 + ) + } + @Bean fun authRbacExchange(): DirectExchange { val directExchange = DirectExchange(MQ.EXCHANGE_AUTH_RBAC_LISTENER_EXCHANGE, true, false) diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacServiceConfiguration.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacServiceConfiguration.kt index d620b8c2d0a..1869a641a90 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacServiceConfiguration.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/config/RbacServiceConfiguration.kt @@ -37,6 +37,7 @@ import com.tencent.devops.auth.dao.AuthMonitorSpaceDao import com.tencent.devops.auth.dao.AuthResourceDao import com.tencent.devops.auth.dao.AuthResourceGroupConfigDao import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.dao.AuthResourceGroupMemberDao import com.tencent.devops.auth.dao.AuthResourceTypeDao import com.tencent.devops.auth.provider.rbac.service.AuthResourceCodeConverter import com.tencent.devops.auth.provider.rbac.service.AuthResourceNameConverter @@ -50,6 +51,7 @@ import com.tencent.devops.auth.service.AuthAuthorizationScopesService import com.tencent.devops.auth.service.AuthProjectUserMetricsService import com.tencent.devops.auth.service.BkHttpRequestService import com.tencent.devops.auth.service.iam.PermissionResourceGroupService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.common.client.Client import com.tencent.devops.common.event.dispatcher.trace.TraceEventDispatcher import org.jooq.DSLContext @@ -88,7 +90,8 @@ class RbacServiceConfiguration { dslContext: DSLContext, authResourceGroupDao: AuthResourceGroupDao, authResourceGroupConfigDao: AuthResourceGroupConfigDao, - authResourceNameConverter: AuthResourceNameConverter + authResourceNameConverter: AuthResourceNameConverter, + resourceGroupSyncService: PermissionResourceGroupSyncService ) = PermissionSubsetManagerService( permissionGroupPoliciesService = permissionGroupPoliciesService, authAuthorizationScopesService = authAuthorizationScopesService, @@ -96,7 +99,8 @@ class RbacServiceConfiguration { dslContext = dslContext, authResourceGroupDao = authResourceGroupDao, authResourceGroupConfigDao = authResourceGroupConfigDao, - authResourceNameConverter = authResourceNameConverter + authResourceNameConverter = authResourceNameConverter, + resourceGroupSyncService = resourceGroupSyncService ) @Bean @@ -113,7 +117,8 @@ class RbacServiceConfiguration { traceEventDispatcher: TraceEventDispatcher, itsmService: ItsmService, authAuthorizationScopesService: AuthAuthorizationScopesService, - permissionResourceGroupService: PermissionResourceGroupService + permissionResourceGroupService: PermissionResourceGroupService, + resourceGroupSyncService: PermissionResourceGroupSyncService ) = PermissionGradeManagerService( client = client, iamV2ManagerService = iamV2ManagerService, @@ -127,7 +132,8 @@ class RbacServiceConfiguration { traceEventDispatcher = traceEventDispatcher, itsmService = itsmService, authAuthorizationScopesService = authAuthorizationScopesService, - permissionResourceGroupService = permissionResourceGroupService + permissionResourceGroupService = permissionResourceGroupService, + resourceGroupSyncService = resourceGroupSyncService ) @Bean @@ -156,11 +162,13 @@ class RbacServiceConfiguration { fun authResourceService( dslContext: DSLContext, authResourceDao: AuthResourceDao, - authResourceGroupDao: AuthResourceGroupDao + authResourceGroupDao: AuthResourceGroupDao, + authResourceGroupMemberDao: AuthResourceGroupMemberDao ) = AuthResourceService( dslContext = dslContext, authResourceDao = authResourceDao, - authResourceGroupDao = authResourceGroupDao + authResourceGroupDao = authResourceGroupDao, + authResourceGroupMemberDao = authResourceGroupMemberDao ) @Bean diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/listener/SyncGroupAndMemberListener.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/listener/SyncGroupAndMemberListener.kt new file mode 100644 index 00000000000..f8f142e02e0 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/listener/SyncGroupAndMemberListener.kt @@ -0,0 +1,51 @@ +/* + * 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.auth.provider.rbac.listener + +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService +import com.tencent.devops.common.event.listener.Listener +import com.tencent.devops.project.pojo.mq.ProjectEnableStatusBroadCastEvent +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired + +class SyncGroupAndMemberListener @Autowired constructor( + private val permissionResourceGroupSyncService: PermissionResourceGroupSyncService +) : Listener { + + override fun execute(event: ProjectEnableStatusBroadCastEvent) { + logger.info("sync group and member when enabled project $event") + if (event.enabled) { + permissionResourceGroupSyncService.syncGroupAndMember(projectCode = event.projectId) + } + } + + companion object { + private val logger = LoggerFactory.getLogger(SyncGroupAndMemberListener::class.java) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/AuthResourceService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/AuthResourceService.kt index 364c1edc35d..bad925ae680 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/AuthResourceService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/AuthResourceService.kt @@ -31,6 +31,7 @@ package com.tencent.devops.auth.provider.rbac.service import com.tencent.devops.auth.constant.AuthMessageCode import com.tencent.devops.auth.dao.AuthResourceDao import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.dao.AuthResourceGroupMemberDao import com.tencent.devops.auth.pojo.AuthResourceInfo import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.auth.api.pojo.DefaultGroupType @@ -45,7 +46,8 @@ import java.time.ZoneId class AuthResourceService @Autowired constructor( private val dslContext: DSLContext, private val authResourceDao: AuthResourceDao, - private val authResourceGroupDao: AuthResourceGroupDao + private val authResourceGroupDao: AuthResourceGroupDao, + private val authResourceGroupMemberDao: AuthResourceGroupMemberDao ) { companion object { @@ -111,6 +113,12 @@ class AuthResourceService @Autowired constructor( resourceType = resourceType, resourceCode = resourceCode ) + authResourceGroupMemberDao.deleteByResource( + dslContext = transactionContext, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode + ) } } @@ -174,7 +182,7 @@ class AuthResourceService @Autowired constructor( resourceCode = resourceCode ).filter { it.groupCode != DefaultGroupType.MANAGER.value - }.map { it.id } + }.map { it.id!! } dslContext.transaction { configuration -> val transactionContext = DSL.using(configuration) authResourceDao.disable( diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionGradeManagerService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionGradeManagerService.kt index 2b1bf267987..cd5ac421c25 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionGradeManagerService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionGradeManagerService.kt @@ -50,6 +50,7 @@ import com.tencent.devops.auth.provider.rbac.pojo.event.AuthResourceGroupCreateE import com.tencent.devops.auth.provider.rbac.pojo.event.AuthResourceGroupModifyEvent import com.tencent.devops.auth.service.AuthAuthorizationScopesService import com.tencent.devops.auth.service.iam.PermissionResourceGroupService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.util.PageUtil import com.tencent.devops.common.api.util.UUIDUtil @@ -87,7 +88,8 @@ class PermissionGradeManagerService @Autowired constructor( private val traceEventDispatcher: TraceEventDispatcher, private val itsmService: ItsmService, private val authAuthorizationScopesService: AuthAuthorizationScopesService, - private val permissionResourceGroupService: PermissionResourceGroupService + private val permissionResourceGroupService: PermissionResourceGroupService, + private val resourceGroupSyncService: PermissionResourceGroupSyncService ) { companion object { @@ -422,6 +424,8 @@ class PermissionGradeManagerService @Autowired constructor( groupCode = groupConfig.groupCode ) } + // 分级管理员创建后,需要同步下组、成员和分级管理员 + resourceGroupSyncService.syncGroupAndMember(projectCode = projectCode) } fun modifyGradeDefaultGroup( diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionSubsetManagerService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionSubsetManagerService.kt index d21766e46b8..2b26f9d4fef 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionSubsetManagerService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/PermissionSubsetManagerService.kt @@ -39,6 +39,7 @@ import com.tencent.devops.auth.dao.AuthResourceGroupConfigDao import com.tencent.devops.auth.dao.AuthResourceGroupDao import com.tencent.devops.auth.provider.rbac.pojo.enums.AuthGroupCreateMode import com.tencent.devops.auth.service.AuthAuthorizationScopesService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.util.PageUtil import com.tencent.devops.common.auth.api.AuthResourceType @@ -54,7 +55,8 @@ class PermissionSubsetManagerService @Autowired constructor( private val dslContext: DSLContext, private val authResourceGroupDao: AuthResourceGroupDao, private val authResourceGroupConfigDao: AuthResourceGroupConfigDao, - private val authResourceNameConverter: AuthResourceNameConverter + private val authResourceNameConverter: AuthResourceNameConverter, + private val resourceGroupSyncService: PermissionResourceGroupSyncService ) { companion object { @@ -265,6 +267,8 @@ class PermissionSubsetManagerService @Autowired constructor( resourceName = resourceName, iamGroupId = iamGroupId ) + // 这里做个兜底，刚创建的组应该是没有成员 + resourceGroupSyncService.syncIamGroupMember(projectCode = projectCode, iamGroupId = iamGroupId) } } @@ -308,6 +312,8 @@ class PermissionSubsetManagerService @Autowired constructor( defaultGroup = true, relationId = iamGroupInfo.id.toString() ) + // 同步拥有者组里面的成员 + resourceGroupSyncService.syncIamGroupMember(projectCode = projectCode, iamGroupId = iamGroupInfo.id) } } @@ -351,7 +357,7 @@ class PermissionSubsetManagerService @Autowired constructor( it.groupCode != DefaultGroupType.MANAGER.value }.forEach { logger.info("delete subset manage default group|$subsetManagerId|${it.relationId}") - iamV2ManagerService.deleteRoleGroupV2(it.relationId.toInt()) + iamV2ManagerService.deleteRoleGroupV2(it.relationId) } } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionApplyService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionApplyService.kt index a0cd0e7ea2b..7e670bf6409 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionApplyService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionApplyService.kt @@ -11,6 +11,7 @@ import com.tencent.devops.auth.constant.AuthI18nConstants import com.tencent.devops.auth.constant.AuthI18nConstants.ACTION_NAME_SUFFIX import com.tencent.devops.auth.constant.AuthI18nConstants.AUTH_RESOURCE_GROUP_CONFIG_GROUP_NAME_SUFFIX import com.tencent.devops.auth.constant.AuthMessageCode +import com.tencent.devops.auth.dao.AuthResourceGroupApplyDao import com.tencent.devops.auth.dao.AuthResourceGroupConfigDao import com.tencent.devops.auth.dao.AuthResourceGroupDao import com.tencent.devops.auth.pojo.ApplyJoinGroupFormDataInfo @@ -25,6 +26,7 @@ import com.tencent.devops.auth.pojo.vo.AuthApplyRedirectInfoVo import com.tencent.devops.auth.pojo.vo.AuthRedirectGroupInfoVo import com.tencent.devops.auth.pojo.vo.ManagerRoleGroupVO import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo +import com.tencent.devops.auth.service.DeptService import com.tencent.devops.auth.service.GroupUserService import com.tencent.devops.auth.service.iam.PermissionApplyService import com.tencent.devops.auth.service.iam.PermissionService @@ -62,7 +64,9 @@ class RbacPermissionApplyService @Autowired constructor( val client: Client, val authResourceCodeConverter: AuthResourceCodeConverter, val permissionService: PermissionService, - val itsmService: ItsmService + val itsmService: ItsmService, + val deptService: DeptService, + val authResourceGroupApplyDao: AuthResourceGroupApplyDao ) : PermissionApplyService { @Value("\${auth.iamSystem:}") private val systemId = "" @@ -89,7 +93,8 @@ class RbacPermissionApplyService @Autowired constructor( ): ManagerRoleGroupVO { logger.info("RbacPermissionApplyService|listGroups:searchGroupInfo=$searchGroupInfo") verifyProjectRouterTag(projectId) - + // 校验新用户信息是否同步完成 + isUserExists(userId) val projectInfo = authResourceService.get( projectCode = projectId, resourceType = AuthResourceType.PROJECT.value, @@ -147,6 +152,17 @@ class RbacPermissionApplyService @Autowired constructor( ) } + private fun isUserExists(userId: String) { + // 校验新用户信息是否同步完成 + val userExists = deptService.getUserInfo(userId = "admin", name = userId) != null + if (!userExists) { + logger.warn("user($userId) does not exist") + throw ErrorCodeException( + errorCode = AuthMessageCode.ERROR_USER_INFORMATION_NOT_SYNCED + ) + } + } + private fun buildBkIamPath( userId: String, resourceType: String?, @@ -334,6 +350,11 @@ class RbacPermissionApplyService @Autowired constructor( .reason(applyJoinGroupInfo.reason).build() logger.info("apply to join group: iamApplicationDTO=$iamApplicationDTO") v2ManagerService.createRoleGroupApplicationV2(iamApplicationDTO) + // 记录单据，用于同步用户组 + authResourceGroupApplyDao.batchCreate( + dslContext = dslContext, + applyJoinGroupInfo = applyJoinGroupInfo + ) } catch (e: Exception) { throw ErrorCodeException( errorCode = AuthMessageCode.APPLY_TO_JOIN_GROUP_FAIL, diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupService.kt index 3fe23381ab8..62e0309f4e4 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupService.kt @@ -28,6 +28,7 @@ package com.tencent.devops.auth.provider.rbac.service +import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum import com.tencent.bk.sdk.iam.dto.InstancesDTO import com.tencent.bk.sdk.iam.dto.V2PageInfoDTO import com.tencent.bk.sdk.iam.dto.manager.ManagerRoleGroup @@ -44,8 +45,10 @@ import com.tencent.devops.auth.constant.AuthMessageCode.ERROR_GROUP_NAME_TO_SHOR import com.tencent.devops.auth.constant.AuthMessageCode.GROUP_EXIST import com.tencent.devops.auth.dao.AuthResourceGroupConfigDao import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.dao.AuthResourceGroupMemberDao import com.tencent.devops.auth.pojo.RelatedResourceInfo import com.tencent.devops.auth.pojo.dto.GroupAddDTO +import com.tencent.devops.auth.pojo.dto.ListGroupConditionDTO import com.tencent.devops.auth.pojo.dto.RenameGroupDTO import com.tencent.devops.auth.pojo.enum.GroupMemberStatus import com.tencent.devops.auth.pojo.vo.GroupPermissionDetailVo @@ -53,33 +56,33 @@ import com.tencent.devops.auth.pojo.vo.IamGroupInfoVo import com.tencent.devops.auth.pojo.vo.IamGroupMemberInfoVo import com.tencent.devops.auth.pojo.vo.IamGroupPoliciesVo import com.tencent.devops.auth.service.AuthMonitorSpaceService -import com.tencent.devops.auth.service.iam.PermissionProjectService import com.tencent.devops.auth.service.iam.PermissionResourceGroupService import com.tencent.devops.common.api.exception.ErrorCodeException -import com.tencent.devops.common.api.exception.PermissionForbiddenException import com.tencent.devops.common.api.pojo.Pagination import com.tencent.devops.common.api.util.DateTimeUtil +import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.common.api.util.PageUtil import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.web.utils.I18nUtil import org.jooq.DSLContext +import org.jooq.impl.DSL import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value -@Suppress("LongParameterList") +@Suppress("LongParameterList", "IMPLICIT_CAST_TO_ANY") class RbacPermissionResourceGroupService @Autowired constructor( private val iamV2ManagerService: V2ManagerService, private val authResourceService: AuthResourceService, private val permissionSubsetManagerService: PermissionSubsetManagerService, - private val permissionProjectService: PermissionProjectService, private val permissionGroupPoliciesService: PermissionGroupPoliciesService, private val dslContext: DSLContext, private val authResourceGroupDao: AuthResourceGroupDao, private val v2ManagerService: V2ManagerService, private val rbacCacheService: RbacCacheService, private val monitorSpaceService: AuthMonitorSpaceService, - private val authResourceGroupConfigDao: AuthResourceGroupConfigDao + private val authResourceGroupConfigDao: AuthResourceGroupConfigDao, + private val authResourceGroupMemberDao: AuthResourceGroupMemberDao ) : PermissionResourceGroupService { @Value("\${auth.iamSystem:}") private val systemId = "" @@ -94,76 +97,116 @@ class RbacPermissionResourceGroupService @Autowired constructor( private val logger = LoggerFactory.getLogger(RbacPermissionResourceGroupService::class.java) private const val MAX_GROUP_NAME_LENGTH = 32 private const val MIN_GROUP_NAME_LENGTH = 5 - - // 毫秒转换 - private const val MILLISECOND = 1000 + private const val FIRST_PAGE = 1 } override fun listGroup( - projectId: String, - resourceType: String, - resourceCode: String, - page: Int, - pageSize: Int + userId: String, + listGroupConditionDTO: ListGroupConditionDTO ): Pagination { - val resourceInfo = authResourceService.get( - projectCode = projectId, - resourceType = resourceType, - resourceCode = resourceCode - ) - val validPage = PageUtil.getValidPage(page) - val validPageSize = PageUtil.getValidPageSize(pageSize) - val iamGroupInfoList = if (resourceType == AuthResourceType.PROJECT.value) { - val searchGroupDTO = SearchGroupDTO.builder().inherit(false).build() - val pageInfoDTO = V2PageInfoDTO() - pageInfoDTO.page = page - pageInfoDTO.pageSize = pageSize - val iamGroupInfoList = iamV2ManagerService.getGradeManagerRoleGroupV2( - resourceInfo.relationId, - searchGroupDTO, - pageInfoDTO - ) - iamGroupInfoList.results - } else { - permissionSubsetManagerService.listGroup( - subsetManagerId = resourceInfo.relationId, - page = validPage, - pageSize = validPageSize + with(listGroupConditionDTO) { + val resourceInfo = authResourceService.get( + projectCode = projectId, + resourceType = resourceType, + resourceCode = resourceCode ) - } - val resourceGroupMap = authResourceGroupDao.getByResourceCode( - dslContext = dslContext, - projectCode = projectId, - resourceType = resourceType, - resourceCode = resourceCode - ).associateBy { it.relationId.toInt() } - val iamGroupInfoVoList = iamGroupInfoList.map { - val resourceGroup = resourceGroupMap[it.id] - val defaultGroup = resourceGroup?.defaultGroup ?: false - // 默认组名需要支持国际化 - val groupName = if (defaultGroup) { - I18nUtil.getCodeLanMessage( - messageCode = "${resourceGroup!!.resourceType}.${resourceGroup.groupCode}" + - AuthI18nConstants.AUTH_RESOURCE_GROUP_CONFIG_GROUP_NAME_SUFFIX, - defaultMessage = resourceGroup.groupName + val validPage = PageUtil.getValidPage(page) + val validPageSize = PageUtil.getValidPageSize(pageSize) + val iamGroupInfoList = if (resourceType == AuthResourceType.PROJECT.value) { + val searchGroupDTO = SearchGroupDTO.builder().inherit(false).build() + val pageInfoDTO = V2PageInfoDTO() + pageInfoDTO.page = page + pageInfoDTO.pageSize = pageSize + val iamGroupInfoList = iamV2ManagerService.getGradeManagerRoleGroupV2( + resourceInfo.relationId, + searchGroupDTO, + pageInfoDTO ) + iamGroupInfoList.results } else { - it.name + permissionSubsetManagerService.listGroup( + subsetManagerId = resourceInfo.relationId, + page = validPage, + pageSize = validPageSize + ) } - IamGroupInfoVo( + val resourceGroupMap = authResourceGroupDao.getByResourceCode( + dslContext = dslContext, + projectCode = projectId, + resourceType = resourceType, + resourceCode = resourceCode + ).associateBy { it.relationId } + val iamGroupInfoVoList = iamGroupInfoList.map { + val resourceGroup = resourceGroupMap[it.id] + val defaultGroup = resourceGroup?.defaultGroup ?: false + // 默认组名需要支持国际化 + val groupName = if (defaultGroup) { + I18nUtil.getCodeLanMessage( + messageCode = "${resourceGroup!!.resourceType}.${resourceGroup.groupCode}" + + AuthI18nConstants.AUTH_RESOURCE_GROUP_CONFIG_GROUP_NAME_SUFFIX, + defaultMessage = resourceGroup.groupName + ) + } else { + it.name + } + IamGroupInfoVo( + managerId = resourceInfo.relationId.toInt(), + defaultGroup = defaultGroup, + groupId = it.id, + name = groupName, + displayName = it.name, + userCount = it.userCount, + departmentCount = it.departmentCount, + templateCount = it.templateCount + ) + }.toMutableList().plusAllProjectMemberGroup( + userId = userId, managerId = resourceInfo.relationId.toInt(), - defaultGroup = defaultGroup, - groupId = it.id, - name = groupName, - displayName = it.name, - userCount = it.userCount, - departmentCount = it.departmentCount + condition = listGroupConditionDTO + ).sortedBy { it.groupId } + return Pagination( + hasNext = iamGroupInfoVoList.size == pageSize, + records = iamGroupInfoVoList ) - }.sortedBy { it.groupId } - return Pagination( - hasNext = iamGroupInfoVoList.size == pageSize, - records = iamGroupInfoVoList - ) + } + } + + private fun MutableList.plusAllProjectMemberGroup( + userId: String, + managerId: Int, + condition: ListGroupConditionDTO + ): List { + val shouldPlusAllProjectMemberGroup = + condition.page == FIRST_PAGE && + condition.resourceType == AuthResourceType.PROJECT.value && + condition.getAllProjectMembersGroup + + if (shouldPlusAllProjectMemberGroup) { + val projectMemberCount = authResourceGroupMemberDao.countProjectMember( + dslContext = dslContext, + projectCode = condition.projectId + ) + val userCount = projectMemberCount[ManagerScopesEnum.getType(ManagerScopesEnum.USER)] ?: 0 + val departmentCount = projectMemberCount[ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT)] ?: 0 + val allProjectMemberGroup = IamGroupInfoVo( + managerId = managerId, + defaultGroup = true, + groupId = 0, + name = MessageUtil.getMessageByLocale( + AuthI18nConstants.BK_ALL_PROJECT_MEMBERS_GROUP, + I18nUtil.getLanguage(userId) + ), + displayName = MessageUtil.getMessageByLocale( + AuthI18nConstants.BK_ALL_PROJECT_MEMBERS_GROUP, + I18nUtil.getLanguage(userId) + ), + userCount = userCount, + departmentCount = departmentCount, + projectMemberGroup = true + ) + this.add(0, allProjectMemberGroup) + } + return this } override fun listUserBelongGroup( @@ -199,8 +242,7 @@ class RbacPermissionResourceGroupService @Autowired constructor( Pair( GroupMemberStatus.EXPIRED.name, I18nUtil.getCodeLanMessage( - AUTH_GROUP_MEMBER_EXPIRED_DESC, - "expired" + AUTH_GROUP_MEMBER_EXPIRED_DESC ) ) } else { @@ -253,12 +295,6 @@ class RbacPermissionResourceGroupService @Autowired constructor( groupId: Int ): Boolean { logger.info("delete group|$userId|$projectId|$resourceType|$groupId") - if (userId != null) { - checkProjectManager( - userId = userId, - projectId = projectId - ) - } val authResourceGroup = authResourceGroupDao.getByRelationId( dslContext = dslContext, projectCode = projectId, @@ -273,29 +309,22 @@ class RbacPermissionResourceGroupService @Autowired constructor( iamV2ManagerService.deleteRoleGroupV2(groupId) // 迁移的用户组,非默认的也会保存,删除时也应该删除 if (authResourceGroup != null) { - authResourceGroupDao.deleteByIds( - dslContext = dslContext, - ids = listOf(authResourceGroup.id) - ) + dslContext.transaction { configuration -> + val context = DSL.using(configuration) + authResourceGroupDao.deleteByIds( + dslContext = context, + ids = listOf(authResourceGroup.id) + ) + authResourceGroupMemberDao.deleteByIamGroupId( + dslContext = context, + projectCode = projectId, + iamGroupId = groupId + ) + } } return true } - private fun checkProjectManager( - userId: String, - projectId: String - ) { - val hasProjectManagePermission = permissionProjectService.checkProjectManager( - userId = userId, - projectCode = projectId - ) - if (!hasProjectManagePermission) { - throw PermissionForbiddenException( - message = I18nUtil.getCodeLanMessage(AuthMessageCode.ERROR_AUTH_NO_MANAGE_PERMISSION) - ) - } - } - override fun createGroup( projectId: String, groupAddDTO: GroupAddDTO @@ -367,10 +396,6 @@ class RbacPermissionResourceGroupService @Autowired constructor( defaultMessage = "group name cannot be less than 5 characters" ) } - checkProjectManager( - userId = userId, - projectId = projectId - ) val authResourceGroup = authResourceGroupDao.getByRelationId( dslContext = dslContext, projectCode = projectId, diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupSyncService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupSyncService.kt new file mode 100644 index 00000000000..6a2a651e8ee --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceGroupSyncService.kt @@ -0,0 +1,678 @@ +/* + * 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.auth.provider.rbac.service + +import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum +import com.tencent.bk.sdk.iam.dto.V2PageInfoDTO +import com.tencent.bk.sdk.iam.dto.manager.dto.SearchGroupDTO +import com.tencent.bk.sdk.iam.exception.IamException +import com.tencent.bk.sdk.iam.service.v2.V2ManagerService +import com.tencent.devops.auth.dao.AuthResourceGroupApplyDao +import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.dao.AuthResourceGroupMemberDao +import com.tencent.devops.auth.dao.AuthResourceSyncDao +import com.tencent.devops.auth.pojo.AuthResourceGroup +import com.tencent.devops.auth.pojo.AuthResourceGroupMember +import com.tencent.devops.auth.pojo.enum.ApplyToGroupStatus +import com.tencent.devops.auth.pojo.enum.AuthMigrateStatus +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService +import com.tencent.devops.auth.service.lock.SyncGroupAndMemberLock +import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.api.util.DateTimeUtil +import com.tencent.devops.common.api.util.PageUtil +import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.api.pojo.DefaultGroupType +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO +import com.tencent.devops.common.client.Client +import com.tencent.devops.common.redis.RedisOperation +import com.tencent.devops.common.service.trace.TraceTag +import com.tencent.devops.model.auth.tables.records.TAuthResourceGroupApplyRecord +import com.tencent.devops.project.api.service.ServiceProjectResource +import org.jooq.DSLContext +import org.jooq.impl.DSL +import org.slf4j.LoggerFactory +import org.slf4j.MDC +import org.springframework.beans.factory.annotation.Autowired +import java.util.concurrent.CompletableFuture +import java.util.concurrent.CompletionException +import java.util.concurrent.Executors + +@Suppress("LongParameterList") +class RbacPermissionResourceGroupSyncService @Autowired constructor( + private val client: Client, + private val dslContext: DSLContext, + private val authResourceService: AuthResourceService, + private val authResourceGroupDao: AuthResourceGroupDao, + private val iamV2ManagerService: V2ManagerService, + private val authResourceGroupMemberDao: AuthResourceGroupMemberDao, + private val rbacCacheService: RbacCacheService, + private val redisOperation: RedisOperation, + private val authResourceSyncDao: AuthResourceSyncDao, + private val authResourceGroupApplyDao: AuthResourceGroupApplyDao +) : PermissionResourceGroupSyncService { + companion object { + private val logger = LoggerFactory.getLogger(RbacPermissionResourceGroupSyncService::class.java) + private val syncExecutorService = Executors.newFixedThreadPool(5) + private val syncProjectsExecutorService = Executors.newFixedThreadPool(10) + private val syncResourceMemberExecutorService = Executors.newFixedThreadPool(50) + private const val MAX_NUMBER_OF_CHECKS = 120 + } + + override fun syncByCondition(projectConditionDTO: ProjectConditionDTO) { + logger.info("start to migrate project by condition|$projectConditionDTO") + val traceId = MDC.get(TraceTag.BIZID) + syncExecutorService.submit { + MDC.put(TraceTag.BIZID, traceId) + var offset = 0 + val limit = PageUtil.MAX_PAGE_SIZE / 2 + do { + val projectCodes = client.get(ServiceProjectResource::class).listProjectsByCondition( + projectConditionDTO = projectConditionDTO, + limit = limit, + offset = offset + ).data ?: break + batchSyncGroupAndMember(projectCodes = projectCodes.map { it.englishName }) + offset += limit + } while (projectCodes.size == limit) + } + } + + override fun batchSyncGroupAndMember(projectCodes: List) { + logger.info("sync all group and member|$projectCodes") + if (projectCodes.isEmpty()) return + projectCodes.forEach { projectCode -> + syncGroupAndMember(projectCode = projectCode) + } + } + + override fun batchSyncProjectGroup(projectCodes: List) { + logger.info("sync all group|$projectCodes") + if (projectCodes.isEmpty()) return + val traceId = MDC.get(TraceTag.BIZID) + projectCodes.forEach { projectCode -> + syncProjectsExecutorService.submit { + MDC.put(TraceTag.BIZID, traceId) + syncProjectGroup(projectCode = projectCode) + } + } + } + + override fun batchSyncAllMember(projectCodes: List) { + logger.info("sync all member|$projectCodes") + if (projectCodes.isEmpty()) return + val traceId = MDC.get(TraceTag.BIZID) + projectCodes.forEach { projectCode -> + syncProjectsExecutorService.submit { + MDC.put(TraceTag.BIZID, traceId) + syncResourceGroupMember(projectCode = projectCode) + } + } + } + + override fun syncResourceMember(projectCode: String, resourceType: String, resourceCode: String) { + logger.info("sync resource member|$projectCode|$resourceType|$resourceCode") + val resourceGroups = authResourceGroupDao.getByResourceCode( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode + ) + resourceGroups.forEach { resourceGroup -> + syncResourceGroupMember( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = resourceGroup.groupCode, + iamGroupId = resourceGroup.relationId + ) + } + } + + override fun syncIamGroupMember(projectCode: String, iamGroupId: Int) { + logger.info("sync resource member|$projectCode|$iamGroupId") + val resourceGroup = authResourceGroupDao.getByRelationId( + dslContext = dslContext, + projectCode = projectCode, + iamGroupId = iamGroupId.toString() + ) ?: return + syncResourceGroupMember( + projectCode = projectCode, + resourceType = resourceGroup.resourceType, + resourceCode = resourceGroup.resourceCode, + groupCode = resourceGroup.groupCode, + iamGroupId = iamGroupId + ) + } + + override fun syncIamGroupMembersOfApply() { + val traceId = MDC.get(TraceTag.BIZID) + syncExecutorService.submit { + MDC.put(TraceTag.BIZID, traceId) + val limit = 100 + var offset = 0 + val startEpoch = System.currentTimeMillis() + val finalRecordIdsOfTimeOut = mutableListOf() + val finalRecordsOfPending = mutableListOf() + val finalRecordsOfSuccess = mutableListOf() + do { + logger.info("sync members of apply | start") + val records = authResourceGroupApplyDao.list( + dslContext = dslContext, + limit = limit, + offset = offset + ) + val recordIdsOfTimeOut = records.filter { it.numberOfChecks >= MAX_NUMBER_OF_CHECKS }.map { it.id } + val (recordsOfSuccess, recordsOfPending) = records.filterNot { + recordIdsOfTimeOut.contains(it.id) + }.partition { + try { + val isMemberJoinedToGroup = iamV2ManagerService.verifyGroupValidMember( + it.memberId, + it.iamGroupId.toString() + )[it.iamGroupId]?.belong == true + isMemberJoinedToGroup + } catch (ignore: Exception) { + logger.warn("verify group valid member failed,${it.memberId}|${it.iamGroupId}", ignore) + false + } + } + finalRecordIdsOfTimeOut.addAll(recordIdsOfTimeOut) + finalRecordsOfPending.addAll(recordsOfPending) + finalRecordsOfSuccess.addAll(recordsOfSuccess) + offset += limit + } while (records.size == limit) + if (finalRecordIdsOfTimeOut.isNotEmpty()) { + authResourceGroupApplyDao.batchUpdate( + dslContext = dslContext, + ids = finalRecordIdsOfTimeOut, + applyToGroupStatus = ApplyToGroupStatus.TIME_OUT + ) + } + if (finalRecordsOfPending.isNotEmpty()) { + authResourceGroupApplyDao.batchUpdate( + dslContext = dslContext, + ids = finalRecordsOfPending.map { it.id }, + applyToGroupStatus = ApplyToGroupStatus.PENDING + ) + } + if (finalRecordsOfSuccess.isNotEmpty()) { + finalRecordsOfSuccess.forEach { + syncIamGroupMember( + projectCode = it.projectCode, + iamGroupId = it.iamGroupId + ) + } + authResourceGroupApplyDao.batchUpdate( + dslContext = dslContext, + ids = finalRecordsOfSuccess.map { it.id }, + applyToGroupStatus = ApplyToGroupStatus.SUCCEED + ) + } + logger.info("It take(${System.currentTimeMillis() - startEpoch})ms to sync members of apply") + } + } + + override fun syncGroupAndMember(projectCode: String) { + val traceId = MDC.get(TraceTag.BIZID) + syncProjectsExecutorService.submit { + MDC.put(TraceTag.BIZID, traceId) + SyncGroupAndMemberLock(redisOperation, projectCode).use { lock -> + if (!lock.tryLock()) { + logger.info("sync group and member|running:$projectCode") + return@use + } + val startEpoch = System.currentTimeMillis() + try { + logger.info("sync group and member|start:$projectCode") + authResourceSyncDao.createOrUpdate( + dslContext = dslContext, + projectCode = projectCode, + status = AuthMigrateStatus.PENDING.value + ) + // 同步项目下的组信息 + syncProjectGroup(projectCode = projectCode) + // 同步组成员 + syncResourceGroupMember(projectCode = projectCode) + // 防止出现用户组表的数据已经删了，但是用户组成员表的数据未删除，导致出现不同步，调用iam接口报错问题。 + fixResourceGroupMember(projectCode = projectCode) + // 记录完成状态 + authResourceSyncDao.updateStatus( + dslContext = dslContext, + projectCode = projectCode, + status = AuthMigrateStatus.SUCCEED.value, + totalTime = System.currentTimeMillis() - startEpoch + ) + logger.info( + "It take(${System.currentTimeMillis() - startEpoch})ms to sync " + + "project group and members $projectCode" + ) + } catch (ex: Exception) { + handleException( + exception = ex, + projectCode = projectCode, + totalTime = System.currentTimeMillis() - startEpoch + ) + } + } + } + } + + override fun getStatusOfSync(projectCode: String): AuthMigrateStatus { + val syncRecord = authResourceSyncDao.get( + dslContext = dslContext, + projectCode = projectCode + ) ?: return AuthMigrateStatus.SUCCEED + return AuthMigrateStatus.values().first { it.value == syncRecord.status } + } + + private fun handleException( + totalTime: Long, + exception: Exception, + projectCode: String + ) { + val errorMessage = when (exception) { + is IamException -> { + exception.errorMsg + } + is ErrorCodeException -> { + exception.defaultMessage + } + is CompletionException -> { + exception.cause?.message ?: exception.message + } + else -> { + exception.toString() + } + } + logger.warn("sync group and member error! $projectCode", errorMessage) + authResourceSyncDao.updateStatus( + dslContext = dslContext, + projectCode = projectCode, + status = AuthMigrateStatus.FAILED.value, + errorMessage = errorMessage, + totalTime = totalTime + ) + } + + @Suppress("NestedBlockDepth") + private fun syncProjectGroup(projectCode: String) { + val startEpoch = System.currentTimeMillis() + logger.info("start to sync project group :$projectCode") + try { + val projectInfo = authResourceService.get( + projectCode = projectCode, + resourceType = AuthResourceType.PROJECT.value, + resourceCode = projectCode + ) + + val projectGroupMap = authResourceGroupDao.getByResourceCode( + dslContext = dslContext, + projectCode = projectCode, + resourceType = AuthResourceType.PROJECT.value, + resourceCode = projectCode + ).associateBy { it.relationId } + + // 查询项目下用户组列表 + val searchGroupDTO = SearchGroupDTO.builder().inherit(false).build() + val pageInfoDTO = V2PageInfoDTO().apply { + page = 1 + pageSize = 1000 + } + val iamGroupList = iamV2ManagerService.getGradeManagerRoleGroupV2( + projectInfo.relationId, + searchGroupDTO, + pageInfoDTO + ).results + + // 查询人员模板列表 + val templatePageInfoDTO = V2PageInfoDTO().apply { + page = 1 + pageSize = 500 + } + val templateMap = iamV2ManagerService.getGradeManagerRoleTemplate( + projectInfo.relationId, + null, + templatePageInfoDTO + ).results.associateBy { it.sourceGroupId } + + val iamGroupMap = iamGroupList.associateBy { it.id } + val toDeleteGroups = projectGroupMap.filterKeys { !iamGroupMap.contains(it) }.values + val toUpdateGroups = mutableListOf() + val toAddGroups = mutableListOf() + if (toDeleteGroups.isNotEmpty()) { + logger.info("sync project group|delete group|${toDeleteGroups.map { it.groupName }}") + } + + iamGroupList.forEach { iamGroupInfo -> + val templateId = templateMap[iamGroupInfo.id]?.id + if (projectGroupMap.contains(iamGroupInfo.id)) { + val projectGroup = projectGroupMap[iamGroupInfo.id]!! + // 用户组只有名称和描述可能会修改 + if (projectGroup.groupName != iamGroupInfo.name || + projectGroup.description != iamGroupInfo.description || + projectGroup.iamTemplateId != templateId + ) { + toUpdateGroups.add( + projectGroup.copy( + groupName = iamGroupInfo.name, + description = iamGroupInfo.description, + iamTemplateId = templateId + ) + ) + } + } else { + toAddGroups.add( + AuthResourceGroup( + projectCode = projectCode, + resourceType = AuthResourceType.PROJECT.value, + resourceCode = projectCode, + resourceName = projectInfo.resourceName, + iamResourceCode = projectCode, + groupCode = DefaultGroupType.CUSTOM.value, + groupName = iamGroupInfo.name, + defaultGroup = false, + relationId = iamGroupInfo.id, + description = iamGroupInfo.description, + iamTemplateId = templateId + ) + ) + } + } + dslContext.transaction { configuration -> + val transactionContext = DSL.using(configuration) + authResourceGroupDao.deleteByIds(transactionContext, toDeleteGroups.map { it.id!! }) + authResourceGroupDao.batchCreate(transactionContext, toAddGroups) + authResourceGroupDao.batchUpdate(transactionContext, toUpdateGroups) + } + } finally { + logger.info( + "It take(${System.currentTimeMillis() - startEpoch})ms to sync project group $projectCode" + ) + } + } + + @Suppress("SpreadOperator") + private fun syncResourceGroupMember(projectCode: String) { + val startEpoch = System.currentTimeMillis() + logger.info("start to sync resource group member:$projectCode") + try { + val resourceTypes = rbacCacheService.listResourceTypes().map { it.resourceType } + val traceId = MDC.get(TraceTag.BIZID) + val resourceTypeFuture = resourceTypes.map { resourceType -> + CompletableFuture.supplyAsync( + { + MDC.put(TraceTag.BIZID, traceId) + syncResourceGroupMember( + projectCode = projectCode, + resourceType = resourceType + ) + }, + syncResourceMemberExecutorService + ) + } + CompletableFuture.allOf(*resourceTypeFuture.toTypedArray()).join() + } finally { + logger.info( + "It take(${System.currentTimeMillis() - startEpoch})ms to sync resource group member $projectCode" + ) + } + } + + override fun fixResourceGroupMember(projectCode: String) { + val limit = 100 + var offset = 0 + val startEpoch = System.currentTimeMillis() + logger.info("start to fix resource group member|$projectCode") + try { + do { + val resourceMemberGroupIds = authResourceGroupMemberDao.listProjectGroups( + dslContext = dslContext, + projectCode = projectCode, + offset = offset, + limit = limit + ) + val resourceGroupIds = authResourceGroupDao.listIamGroupIdsByConditions( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = resourceMemberGroupIds.map { it.toString() } + ) + val unsyncGroupIds = resourceMemberGroupIds.filterNot { resourceGroupIds.contains(it) } + if (unsyncGroupIds.isNotEmpty()) { + authResourceGroupMemberDao.deleteByIamGroupIds( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = unsyncGroupIds + ) + } + offset += limit + } while (resourceMemberGroupIds.size == limit) + } catch (ignored: Exception) { + logger.error("Failed to fix resource group member|$projectCode", ignored) + throw ignored + } finally { + logger.info( + "It take(${System.currentTimeMillis() - startEpoch})ms to fix resource group member|$projectCode" + ) + } + } + + private fun syncResourceGroupMember(projectCode: String, resourceType: String) { + val limit = 100 + var offset = 0 + val startEpoch = System.currentTimeMillis() + logger.info("start to sync resource group member|$projectCode|$resourceType") + try { + do { + val authResourceGroups = authResourceGroupDao.listGroupByResourceType( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + offset = offset, + limit = limit + ) + authResourceGroups.forEach { authResourceGroup -> + try { + syncResourceGroupMember( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = authResourceGroup.resourceCode, + groupCode = authResourceGroup.groupCode, + iamGroupId = authResourceGroup.relationId + ) + } catch (ignore: Exception) { + logger.warn( + "sync resource group member failed!" + + "|$projectCode|${authResourceGroup.relationId}|$ignore" + ) + } + } + offset += limit + } while (authResourceGroups.size == limit) + } catch (ignored: Exception) { + logger.error("Failed to sync resource group member|$projectCode|$resourceType", ignored) + throw ignored + } finally { + logger.info( + "It take(${System.currentTimeMillis() - startEpoch})ms to migrate resource|$projectCode|$resourceType" + ) + } + } + + private fun syncResourceGroupMember( + projectCode: String, + resourceType: String, + resourceCode: String, + groupCode: String, + iamGroupId: Int + ) { + val resourceGroupMembers = authResourceGroupMemberDao.listResourceGroupMember( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + iamGroupId = iamGroupId + ) + val toDeleteMembers = mutableListOf() + val toUpdateMembers = mutableListOf() + val toAddMembers = mutableListOf() + syncIamGroupMember( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = groupCode, + iamGroupId = iamGroupId, + resourceGroupMembers = resourceGroupMembers, + toDeleteMembers = toDeleteMembers, + toUpdateMembers = toUpdateMembers, + toAddMembers = toAddMembers + ) + syncIamGroupTemplate( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = groupCode, + iamGroupId = iamGroupId, + resourceGroupMembers = resourceGroupMembers, + toDeleteMembers = toDeleteMembers, + toUpdateMembers = toUpdateMembers, + toAddMembers = toAddMembers + ) + if (toDeleteMembers.isNotEmpty()) { + logger.info("sync resource group member|delete group|${toDeleteMembers.map { it.memberId }}") + } + + dslContext.transaction { configuration -> + val transactionContext = DSL.using(configuration) + authResourceGroupMemberDao.batchDelete(transactionContext, toDeleteMembers.map { it.id!! }.toSet()) + authResourceGroupMemberDao.batchCreate(transactionContext, toAddMembers) + authResourceGroupMemberDao.batchUpdate(transactionContext, toUpdateMembers) + } + } + + /** + * 同步IAM用户组成员/组织 + */ + private fun syncIamGroupMember( + projectCode: String, + resourceType: String, + resourceCode: String, + groupCode: String, + iamGroupId: Int, + resourceGroupMembers: List, + toDeleteMembers: MutableList, + toUpdateMembers: MutableList, + toAddMembers: MutableList + ) { + val resourceGroupMemberMap = resourceGroupMembers.filter { + it.memberType != ManagerScopesEnum.TEMPLATE.name + }.associateBy { it.memberId } + + val pageInfoDTO = V2PageInfoDTO().apply { + pageSize = 1000 + page = 1 + } + val iamGroupMemberList = iamV2ManagerService.getRoleGroupMemberV2(iamGroupId, pageInfoDTO).results + val iamGroupMemberMap = iamGroupMemberList.associateBy { it.id } + + toDeleteMembers.addAll(resourceGroupMemberMap.filterKeys { !iamGroupMemberMap.contains(it) }.values) + iamGroupMemberList.forEach { iamGroupMember -> + val expiredTime = DateTimeUtil.convertTimestampToLocalDateTime(iamGroupMember.expiredAt) + if (resourceGroupMemberMap.contains(iamGroupMember.id)) { + val resourceGroupMember = resourceGroupMemberMap[iamGroupMember.id]!! + if (expiredTime != resourceGroupMember.expiredTime) { + toUpdateMembers.add(resourceGroupMember.copy(expiredTime = expiredTime)) + } + } else { + toAddMembers.add( + AuthResourceGroupMember( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = groupCode, + iamGroupId = iamGroupId, + memberId = iamGroupMember.id, + memberName = iamGroupMember.name, + memberType = iamGroupMember.type, + expiredTime = expiredTime + ) + ) + } + } + } + + /** + * 同步IAM用户组人员模板 + */ + private fun syncIamGroupTemplate( + projectCode: String, + resourceType: String, + resourceCode: String, + groupCode: String, + iamGroupId: Int, + resourceGroupMembers: List, + toDeleteMembers: MutableList, + toUpdateMembers: MutableList, + toAddMembers: MutableList + ) { + val resourceGroupMemberMap = resourceGroupMembers.filter { + it.memberType == ManagerScopesEnum.TEMPLATE.name + }.associateBy { it.memberId } + + val pageInfoDTO = V2PageInfoDTO().apply { + pageSize = 1000 + page = 1 + } + // 查询人员模板列表 + val iamGroupTemplateList = iamV2ManagerService.listRoleGroupTemplates(iamGroupId, pageInfoDTO).results + val iamGroupTemplateMap = iamGroupTemplateList.associateBy { it.id } + + toDeleteMembers.addAll(resourceGroupMemberMap.filterKeys { !iamGroupTemplateMap.contains(it) }.values) + iamGroupTemplateList.forEach { iamGroupTemplate -> + val expiredTime = DateTimeUtil.convertTimestampToLocalDateTime(iamGroupTemplate.expiredAt) + if (resourceGroupMemberMap.contains(iamGroupTemplate.id)) { + val resourceGroupMember = resourceGroupMemberMap[iamGroupTemplate.id]!! + if (expiredTime != resourceGroupMember.expiredTime) { + toUpdateMembers.add(resourceGroupMember.copy(expiredTime = expiredTime)) + } + } else { + toAddMembers.add( + AuthResourceGroupMember( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = groupCode, + iamGroupId = iamGroupId, + memberId = iamGroupTemplate.id, + memberName = iamGroupTemplate.name, + memberType = ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE), + expiredTime = expiredTime + ) + ) + } + } + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceMemberService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceMemberService.kt index 07d713b7c55..ee46893139b 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceMemberService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceMemberService.kt @@ -8,29 +8,64 @@ import com.tencent.bk.sdk.iam.dto.manager.V2ManagerRoleGroupInfo import com.tencent.bk.sdk.iam.dto.manager.dto.GroupMemberRenewApplicationDTO import com.tencent.bk.sdk.iam.dto.manager.dto.ManagerMemberGroupDTO import com.tencent.bk.sdk.iam.dto.manager.dto.SearchGroupDTO +import com.tencent.bk.sdk.iam.dto.response.MemberGroupDetailsResponse import com.tencent.bk.sdk.iam.service.v2.V2ManagerService +import com.tencent.devops.auth.constant.AuthI18nConstants import com.tencent.devops.auth.constant.AuthMessageCode import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.dao.AuthResourceGroupMemberDao +import com.tencent.devops.auth.pojo.AuthResourceGroupMember +import com.tencent.devops.auth.pojo.ResourceMemberInfo import com.tencent.devops.auth.pojo.dto.GroupMemberRenewalDTO +import com.tencent.devops.auth.pojo.enum.BatchOperateType +import com.tencent.devops.auth.pojo.enum.JoinedType +import com.tencent.devops.auth.pojo.enum.RemoveMemberButtonControl +import com.tencent.devops.auth.pojo.request.GroupMemberCommonConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberHandoverConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberRenewalConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberSingleRenewalReq +import com.tencent.devops.auth.pojo.request.RemoveMemberFromProjectReq +import com.tencent.devops.auth.pojo.vo.BatchOperateGroupMemberCheckVo +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo +import com.tencent.devops.auth.pojo.vo.MemberGroupCountWithPermissionsVo +import com.tencent.devops.auth.pojo.vo.ResourceMemberCountVO import com.tencent.devops.auth.service.DeptService +import com.tencent.devops.auth.service.PermissionAuthorizationService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.auth.service.iam.PermissionResourceMemberService import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.api.util.DateTimeUtil +import com.tencent.devops.common.api.util.PageUtil +import com.tencent.devops.common.api.util.timestamp +import com.tencent.devops.common.api.util.timestampmilli import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import com.tencent.devops.common.auth.api.pojo.BkAuthGroupAndUserList +import com.tencent.devops.common.auth.api.pojo.ResetAllResourceAuthorizationReq +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.service.utils.RetryUtils +import com.tencent.devops.common.web.utils.I18nUtil +import com.tencent.devops.model.auth.tables.records.TAuthResourceGroupRecord import com.tencent.devops.project.constant.ProjectMessageCode import org.apache.commons.lang3.RandomUtils import org.jooq.DSLContext import org.slf4j.LoggerFactory +import java.util.concurrent.CompletableFuture import java.util.concurrent.Executors import java.util.concurrent.TimeUnit +@Suppress("SpreadOperator", "LongParameterList") class RbacPermissionResourceMemberService constructor( private val authResourceService: AuthResourceService, private val iamV2ManagerService: V2ManagerService, private val authResourceGroupDao: AuthResourceGroupDao, + private val authResourceGroupMemberDao: AuthResourceGroupMemberDao, private val dslContext: DSLContext, - private val deptService: DeptService + private val deptService: DeptService, + private val rbacCacheService: RbacCacheService, + private val permissionAuthorizationService: PermissionAuthorizationService, + private val syncIamGroupMemberService: PermissionResourceGroupSyncService ) : PermissionResourceMemberService { override fun getResourceGroupMembers( projectCode: String, @@ -97,6 +132,196 @@ class RbacPermissionResourceMemberService constructor( }.map { it.get() } } + override fun getProjectMemberCount(projectCode: String): ResourceMemberCountVO { + val projectMemberCount = authResourceGroupMemberDao.countProjectMember( + dslContext = dslContext, + projectCode = projectCode + ) + return ResourceMemberCountVO( + userCount = projectMemberCount[ManagerScopesEnum.getType(ManagerScopesEnum.USER)] ?: 0, + departmentCount = projectMemberCount[ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT)] ?: 0 + ) + } + + override fun listProjectMembers( + projectCode: String, + memberType: String?, + userName: String?, + deptName: String?, + departedFlag: Boolean?, + page: Int, + pageSize: Int + ): SQLPage { + logger.info("list project members:$projectCode|$departedFlag|$memberType|$userName|$deptName") + if (!userName.isNullOrEmpty() && !deptName.isNullOrEmpty()) { + return SQLPage(count = 0, records = emptyList()) + } + + val limit = PageUtil.convertPageSizeToSQLLimit(page, pageSize) + val count = authResourceGroupMemberDao.countProjectMember( + dslContext = dslContext, + projectCode = projectCode, + memberType = memberType, + userName = userName, + deptName = deptName + ) + val records = authResourceGroupMemberDao.listProjectMember( + dslContext = dslContext, + projectCode = projectCode, + memberType = memberType, + userName = userName, + deptName = deptName, + offset = limit.offset, + limit = limit.limit + ) + + // 不查询离职相关信息，防止调用用户管理接口，响应慢 + if (departedFlag == false) { + return SQLPage(count = count, records = records) + } + + val userMembers = records.filter { + it.type == ManagerScopesEnum.getType(ManagerScopesEnum.USER) + }.map { it.id } + + val departedMembers = if (userMembers.isNotEmpty()) { + deptService.listDepartedMembers( + memberIds = userMembers + ) + } else { + return SQLPage(count = count, records = records) + } + + val recordsWithDepartedFlag = records.map { + if (it.type != ManagerScopesEnum.getType(ManagerScopesEnum.USER)) { + it.copy(departed = false) + } else { + it.copy(departed = departedMembers.contains(it.id)) + } + } + return SQLPage(count = count, records = recordsWithDepartedFlag) + } + + override fun getMemberGroupsCount( + projectCode: String, + memberId: String + ): List { + // 1. 查询项目下包含该成员的组列表 + val projectGroupIds = authResourceGroupMemberDao.listResourceGroupMember( + dslContext = dslContext, + projectCode = projectCode, + resourceType = AuthResourceType.PROJECT.value, + memberId = memberId + ).map { it.iamGroupId.toString() } + // 2. 通过项目组ID获取人员模板ID + val iamTemplateId = authResourceGroupDao.listByRelationId( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = projectGroupIds + ).filter { it.iamTemplateId != null } + .map { it.iamTemplateId.toString() } + // 3. 获取成员直接加入的组和通过模板加入的组 + val memberGroupCountMap = authResourceGroupMemberDao.countMemberGroup( + dslContext = dslContext, + projectCode = projectCode, + memberId = memberId, + iamTemplateIds = iamTemplateId + ) + val memberGroupCountList = mutableListOf() + // 项目排在第一位 + memberGroupCountMap[AuthResourceType.PROJECT.value]?.let { projectCount -> + memberGroupCountList.add( + MemberGroupCountWithPermissionsVo( + resourceType = AuthResourceType.PROJECT.value, + resourceTypeName = I18nUtil.getCodeLanMessage( + messageCode = AuthResourceType.PROJECT.value + AuthI18nConstants.RESOURCE_TYPE_NAME_SUFFIX + ), + count = projectCount + ) + ) + } + + rbacCacheService.listResourceTypes() + .filter { it.resourceType != AuthResourceType.PROJECT.value } + .forEach { resourceTypeInfoVo -> + memberGroupCountMap[resourceTypeInfoVo.resourceType]?.let { count -> + val memberGroupCount = MemberGroupCountWithPermissionsVo( + resourceType = resourceTypeInfoVo.resourceType, + resourceTypeName = I18nUtil.getCodeLanMessage( + messageCode = resourceTypeInfoVo.resourceType + AuthI18nConstants.RESOURCE_TYPE_NAME_SUFFIX, + defaultMessage = resourceTypeInfoVo.name + ), + count = count + ) + memberGroupCountList.add(memberGroupCount) + } + } + + return memberGroupCountList + } + + override fun addGroupMember( + projectCode: String, + memberId: String, + /*user 或 department*/ + memberType: String, + expiredAt: Long, + iamGroupId: Int + ): Boolean { + if (memberType == ManagerScopesEnum.getType(ManagerScopesEnum.USER) && + deptService.isUserDeparted(memberId)) { + return true + } + // 获取对应的资源组 + val authResourceGroup = authResourceGroupDao.get( + dslContext = dslContext, + projectCode = projectCode, + relationId = iamGroupId.toString() + ) ?: throw ErrorCodeException( + errorCode = AuthMessageCode.GROUP_NOT_EXIST + ) + val managerMember = ManagerMember(memberType, memberId) + addIamGroupMember( + groupId = iamGroupId, + members = listOf(managerMember), + expiredAt = expiredAt + ) + + val memberDetails = deptService.getMemberInfo( + memberId = memberId, + memberType = ManagerScopesEnum.valueOf(memberType.uppercase()) + ) + with(authResourceGroup) { + authResourceGroupMemberDao.create( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + groupCode = groupCode, + iamGroupId = relationId.toInt(), + memberId = memberId, + memberName = memberDetails.displayName, + memberType = memberType, + expiredTime = DateTimeUtil.convertTimestampToLocalDateTime(expiredAt) + ) + } + return true + } + + override fun addIamGroupMember( + groupId: Int, + members: List, + expiredAt: Long + ): Boolean { + val membersOfNeedToAdd = members.toMutableList().removeDepartedMembers() + if (membersOfNeedToAdd.isNotEmpty()) { + val managerMemberGroup = + ManagerMemberGroupDTO.builder().members(membersOfNeedToAdd).expiredAt(expiredAt).build() + iamV2ManagerService.createRoleGroupMemberV2(groupId, managerMemberGroup) + } + return true + } + override fun batchAddResourceGroupMembers( projectCode: String, iamGroupId: Int, @@ -121,27 +346,68 @@ class RbacPermissionResourceMemberService constructor( val groupDepartmentSet = groupMembers.filter { it.type == deptType }.map { it.id }.toSet() // 校验用户是否应该加入用户组 val iamMemberInfos = mutableListOf() - members?.forEach { - val shouldAddUserToGroup = shouldAddUserToGroup( - groupUserMap = groupUserMap, - groupDepartmentSet = groupDepartmentSet, - member = it + if (!members.isNullOrEmpty()) { + val departedMembers = deptService.listDepartedMembers( + memberIds = members ) - if (shouldAddUserToGroup) { - iamMemberInfos.add(ManagerMember(userType, it)) + members.filterNot { departedMembers.contains(it) }.forEach { + val shouldAddUserToGroup = shouldAddUserToGroup( + groupUserMap = groupUserMap, + groupDepartmentSet = groupDepartmentSet, + member = it + ) + if (shouldAddUserToGroup) { + iamMemberInfos.add(ManagerMember(userType, it)) + } } } - - departments?.forEach { - if (!groupDepartmentSet.contains(it)) { - iamMemberInfos.add(ManagerMember(deptType, it)) + if (!departments.isNullOrEmpty()) { + departments.forEach { + if (!groupDepartmentSet.contains(it)) { + iamMemberInfos.add(ManagerMember(deptType, it)) + } } } + logger.info("batch add project user:|$projectCode|$iamGroupId|$expiredTime|$iamMemberInfos") if (iamMemberInfos.isNotEmpty()) { - val managerMemberGroup = - ManagerMemberGroupDTO.builder().members(iamMemberInfos).expiredAt(expiredTime).build() - iamV2ManagerService.createRoleGroupMemberV2(iamGroupId, managerMemberGroup) + addIamGroupMember( + groupId = iamGroupId, + members = iamMemberInfos, + expiredAt = expiredTime + ) + // 获取对应的资源组 + val authResourceGroup = authResourceGroupDao.get( + dslContext = dslContext, + projectCode = projectCode, + relationId = iamGroupId.toString() + ) ?: throw ErrorCodeException( + errorCode = AuthMessageCode.GROUP_NOT_EXIST + ) + val groupMembersList = mutableListOf() + iamMemberInfos.forEach { + val memberDetails = deptService.getMemberInfo( + memberId = it.id, + memberType = ManagerScopesEnum.valueOf(it.type.uppercase()) + ) + groupMembersList.add( + AuthResourceGroupMember( + projectCode = projectCode, + resourceType = authResourceGroup.resourceType, + resourceCode = authResourceGroup.resourceCode, + groupCode = authResourceGroup.groupCode, + iamGroupId = authResourceGroup.relationId.toInt(), + memberId = it.id, + memberName = memberDetails.displayName, + memberType = it.type, + expiredTime = DateTimeUtil.convertTimestampToLocalDateTime(expiredTime) + ) + ) + } + authResourceGroupMemberDao.batchCreate( + dslContext = dslContext, + groupMembers = groupMembersList + ) } return true } @@ -207,12 +473,29 @@ class RbacPermissionResourceMemberService constructor( ) val userType = ManagerScopesEnum.getType(ManagerScopesEnum.USER) val deptType = ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT) + val allMemberIds = mutableListOf() if (!members.isNullOrEmpty()) { - iamV2ManagerService.deleteRoleGroupMemberV2(iamGroupId, userType, members.joinToString(",")) + deleteIamGroupMembers( + groupId = iamGroupId, + type = userType, + memberIds = members + ) + allMemberIds.addAll(members) } if (!departments.isNullOrEmpty()) { - iamV2ManagerService.deleteRoleGroupMemberV2(iamGroupId, deptType, departments.joinToString(",")) + deleteIamGroupMembers( + groupId = iamGroupId, + type = deptType, + memberIds = departments + ) + allMemberIds.addAll(departments) } + authResourceGroupMemberDao.batchDeleteGroupMembers( + dslContext = dslContext, + projectCode = projectCode, + iamGroupId = iamGroupId, + memberIds = allMemberIds + ) return true } @@ -335,12 +618,15 @@ class RbacPermissionResourceMemberService constructor( // 自动续期时间由半年+随机天数,防止同一时间同时过期 val expiredTime = currentTime + AUTO_RENEWAL_EXPIRED_AT + TimeUnit.DAYS.toSeconds(RandomUtils.nextLong(0, 180)) - val managerMemberGroup = - ManagerMemberGroupDTO.builder().members(listOf(ManagerMember(member.type, member.id))) - .expiredAt(expiredTime).build() autoRenewalMembers.add(member.id) try { - iamV2ManagerService.createRoleGroupMemberV2(iamGroupId, managerMemberGroup) + addGroupMember( + projectCode = projectCode, + memberId = member.id, + memberType = member.type, + expiredAt = expiredTime, + iamGroupId = iamGroupId + ) } catch (ignored: Exception) { // 用户不存在时,iam会抛异常 logger.error( @@ -372,37 +658,868 @@ class RbacPermissionResourceMemberService constructor( return true } - override fun deleteGroupMember( + override fun renewalGroupMember( userId: String, projectCode: String, - resourceType: String, - groupId: Int + renewalConditionReq: GroupMemberSingleRenewalReq + ): GroupDetailsInfoVo { + logger.info("renewal group member $userId|$projectCode|$renewalConditionReq") + val groupId = renewalConditionReq.groupId + batchOperateGroupMembers( + projectCode = projectCode, + conditionReq = GroupMemberRenewalConditionReq( + groupIds = listOf(groupId), + targetMember = renewalConditionReq.targetMember, + renewalDuration = renewalConditionReq.renewalDuration + ), + operateGroupMemberTask = ::renewalTask + ) + return getMemberGroupsDetails( + projectId = projectCode, + memberId = renewalConditionReq.targetMember.id, + iamGroupIds = listOf(groupId), + resourceType = null, + start = null, + limit = null + ).records.first { it.groupId == groupId } + } + + override fun renewalIamGroupMembers( + groupId: Int, + members: List, + expiredAt: Long + ): Boolean { + val membersOfNeedToRenewal = members.toMutableList().removeDepartedMembers() + if (membersOfNeedToRenewal.isNotEmpty()) { + iamV2ManagerService.renewalRoleGroupMemberV2( + groupId, + ManagerMemberGroupDTO.builder() + .members(membersOfNeedToRenewal) + .expiredAt(expiredAt) + .build() + ) + } + return true + } + + override fun batchRenewalGroupMembers( + userId: String, + projectCode: String, + renewalConditionReq: GroupMemberRenewalConditionReq ): Boolean { - logger.info("delete group member|$userId|$projectCode|$resourceType|$groupId") - iamV2ManagerService.deleteRoleGroupMemberV2( - groupId, - ManagerScopesEnum.getType(ManagerScopesEnum.USER), - userId + logger.info("batch renewal group member $userId|$projectCode|$renewalConditionReq") + batchOperateGroupMembers( + projectCode = projectCode, + conditionReq = renewalConditionReq, + operateGroupMemberTask = ::renewalTask ) return true } - override fun addGroupMember( + private fun renewalTask( + projectCode: String, + groupId: Int, + renewalConditionReq: GroupMemberRenewalConditionReq, + expiredAt: Long + ) { + logger.info("renewal group member ${renewalConditionReq.targetMember}|$projectCode|$groupId|$expiredAt") + val targetMember = renewalConditionReq.targetMember + if (targetMember.type == ManagerScopesEnum.getType(ManagerScopesEnum.USER) && + deptService.isUserDeparted(targetMember.id)) { + return + } + val secondsOfRenewalDuration = TimeUnit.DAYS.toSeconds(renewalConditionReq.renewalDuration.toLong()) + val secondsOfCurrentTime = System.currentTimeMillis() / 1000 + // 若权限已过期，则为当前时间+续期天数，若未过期，则为有效期+续期天数 + val finalExpiredAt = if (expiredAt < secondsOfCurrentTime) { + secondsOfCurrentTime + } else { + expiredAt + } + secondsOfRenewalDuration + if (!isNeedToRenewal(finalExpiredAt)) { + return + } + renewalIamGroupMembers( + groupId = groupId, + members = listOf(ManagerMember(targetMember.type, targetMember.id)), + expiredAt = finalExpiredAt + ) + authResourceGroupMemberDao.update( + dslContext = dslContext, + projectCode = projectCode, + iamGroupId = groupId, + expiredTime = DateTimeUtil.convertTimestampToLocalDateTime(expiredAt), + memberId = targetMember.id + ) + } + + private fun isNeedToRenewal(expiredAt: Long): Boolean { + return expiredAt < PERMANENT_EXPIRED_TIME + } + + override fun batchDeleteResourceGroupMembers( userId: String, - /*user 或 department*/ - memberType: String, - expiredAt: Long, - groupId: Int + projectCode: String, + removeMemberDTO: GroupMemberCommonConditionReq + ): Boolean { + logger.info("batch delete group members $userId|$projectCode|$removeMemberDTO") + removeMemberDTO.excludedUniqueManagerGroup = true + batchOperateGroupMembers( + projectCode = projectCode, + conditionReq = removeMemberDTO, + operateGroupMemberTask = ::deleteTask + ) + return true + } + + override fun deleteIamGroupMembers( + groupId: Int, + type: String, + memberIds: List + ): Boolean { + val membersOfNeedToDelete = if (type == ManagerScopesEnum.getType(ManagerScopesEnum.USER)) { + memberIds.filterNot { deptService.isUserDeparted(it) } + } else { + memberIds + } + if (membersOfNeedToDelete.isNotEmpty()) { + iamV2ManagerService.deleteRoleGroupMemberV2( + groupId, + type, + membersOfNeedToDelete.joinToString(",") + ) + } + return true + } + + private fun deleteTask( + projectCode: String, + groupId: Int, + removeMemberDTO: GroupMemberCommonConditionReq, + expiredAt: Long + ) { + val targetMember = removeMemberDTO.targetMember + logger.info("delete group member $projectCode|$groupId|$targetMember") + deleteIamGroupMembers( + groupId = groupId, + type = targetMember.type, + memberIds = listOf(targetMember.id) + ) + authResourceGroupMemberDao.batchDeleteGroupMembers( + dslContext = dslContext, + projectCode = projectCode, + iamGroupId = groupId, + memberIds = listOf(removeMemberDTO.targetMember.id) + ) + } + + override fun batchHandoverGroupMembers( + userId: String, + projectCode: String, + handoverMemberDTO: GroupMemberHandoverConditionReq ): Boolean { - val managerMember = ManagerMember(memberType, userId) - val managerMemberGroupDTO = ManagerMemberGroupDTO.builder() - .members(listOf(managerMember)) - .expiredAt(expiredAt) - .build() - iamV2ManagerService.createRoleGroupMemberV2(groupId, managerMemberGroupDTO) + logger.info("batch handover group members $userId|$projectCode|$handoverMemberDTO") + handoverMemberDTO.checkHandoverTo() + batchOperateGroupMembers( + projectCode = projectCode, + conditionReq = handoverMemberDTO, + operateGroupMemberTask = ::handoverTask + ) return true } + override fun batchOperateGroupMembersCheck( + userId: String, + projectCode: String, + batchOperateType: BatchOperateType, + conditionReq: GroupMemberCommonConditionReq + ): BatchOperateGroupMemberCheckVo { + logger.info("batch operate group member check|$userId|$projectCode|$batchOperateType|$conditionReq") + // 获取用户加入的用户组 + val (groupIdsOfDirectJoined, groupInfoIdsOfTemplateJoined) = getGroupIdsByCondition( + projectCode = projectCode, + commonCondition = conditionReq + ) + val totalCount = groupIdsOfDirectJoined.size + groupInfoIdsOfTemplateJoined.size + val groupCountOfTemplateJoined = groupInfoIdsOfTemplateJoined.size + + return when (batchOperateType) { + BatchOperateType.REMOVE -> { + val groupCountOfUniqueManager = authResourceGroupMemberDao.listProjectUniqueManagerGroups( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = groupIdsOfDirectJoined + ).size + BatchOperateGroupMemberCheckVo( + totalCount = totalCount, + inoperableCount = groupCountOfUniqueManager + groupCountOfTemplateJoined + ) + } + BatchOperateType.RENEWAL -> { + with(conditionReq) { + val isUserDeparted = targetMember.type == ManagerScopesEnum.getType(ManagerScopesEnum.USER) && + deptService.isUserDeparted(targetMember.id) + // 离职用户不允许续期 + if (isUserDeparted) { + BatchOperateGroupMemberCheckVo( + totalCount = totalCount, + inoperableCount = totalCount + ) + } else { + // 永久期限 不允许再续期 + val groupCountOfPermanentExpiredTime = listMemberGroupsDetails( + projectCode = projectCode, + memberId = targetMember.id, + memberType = targetMember.type, + groupIds = groupIdsOfDirectJoined + ).filter { + // iam用的是秒级时间戳 + it.expiredAt == PERMANENT_EXPIRED_TIME / 1000 + }.size + BatchOperateGroupMemberCheckVo( + totalCount = totalCount, + inoperableCount = groupCountOfPermanentExpiredTime + groupCountOfTemplateJoined + ) + } + } + } + BatchOperateType.HANDOVER -> { + // 已过期（除唯一管理员组）或通过模板加入的不允许移交 + with(conditionReq) { + val finalGroupIds = groupIdsOfDirectJoined.toMutableList() + val uniqueManagerGroupIds = authResourceGroupMemberDao.listProjectUniqueManagerGroups( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = groupIdsOfDirectJoined + ) + // 去除唯一管理员组 + if (uniqueManagerGroupIds.isNotEmpty()) { + finalGroupIds.removeAll(uniqueManagerGroupIds) + } + val groupCountOfExpired = listMemberGroupsDetails( + projectCode = projectCode, + memberId = targetMember.id, + memberType = targetMember.type, + groupIds = finalGroupIds + ).filter { + // iam用的是秒级时间戳 + it.expiredAt < System.currentTimeMillis() / 1000 + }.size + BatchOperateGroupMemberCheckVo( + totalCount = totalCount, + inoperableCount = groupCountOfTemplateJoined + groupCountOfExpired + ) + } + } + else -> { + BatchOperateGroupMemberCheckVo( + totalCount = totalCount, + inoperableCount = groupCountOfTemplateJoined + ) + } + } + } + + override fun removeMemberFromProject( + userId: String, + projectCode: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): List { + logger.info("remove member from project $userId|$projectCode|$removeMemberFromProjectReq") + return with(removeMemberFromProjectReq) { + val memberType = targetMember.type + val isNeedToHandover = handoverTo != null + if (memberType == ManagerScopesEnum.getType(ManagerScopesEnum.USER) && isNeedToHandover) { + removeMemberFromProjectReq.checkHandoverTo() + val handoverMemberDTO = GroupMemberHandoverConditionReq( + allSelection = true, + targetMember = targetMember, + handoverTo = handoverTo!! + ) + batchOperateGroupMembers( + projectCode = projectCode, + conditionReq = handoverMemberDTO, + operateGroupMemberTask = ::handoverTask + ) + permissionAuthorizationService.resetAllResourceAuthorization( + operator = userId, + projectCode = projectCode, + condition = ResetAllResourceAuthorizationReq( + projectCode = projectCode, + handoverFrom = removeMemberFromProjectReq.targetMember.id, + handoverTo = removeMemberFromProjectReq.handoverTo!!.id, + preCheck = false, + checkPermission = false + ) + ) + } else { + val removeMemberDTO = GroupMemberCommonConditionReq( + allSelection = true, + targetMember = targetMember + ) + batchOperateGroupMembers( + projectCode = projectCode, + conditionReq = removeMemberDTO, + operateGroupMemberTask = ::deleteTask + ) + } + + if (memberType == ManagerScopesEnum.getType(ManagerScopesEnum.USER)) { + // 查询用户还存在那些组织中 + val userDeptInfos = deptService.getUserInfo( + userId = "admin", + name = targetMember.id + )?.deptInfo?.map { it.name!! } + if (userDeptInfos != null) { + return authResourceGroupMemberDao.isMembersInProject( + dslContext = dslContext, + projectCode = projectCode, + memberNames = userDeptInfos, + memberType = ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT) + ) + } + } + return emptyList() + } + } + + override fun removeMemberFromProjectCheck( + userId: String, + projectCode: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): Boolean { + val targetMember = removeMemberFromProjectReq.targetMember + val isMemberHasNoPermission = batchOperateGroupMembersCheck( + userId = userId, + projectCode = projectCode, + batchOperateType = BatchOperateType.HANDOVER, + conditionReq = GroupMemberCommonConditionReq( + allSelection = true, + targetMember = removeMemberFromProjectReq.targetMember + ) + ).let { it.totalCount == it.inoperableCount } + + val isMemberHasNoAuthorizations = + if (targetMember.type == ManagerScopesEnum.getType(ManagerScopesEnum.USER)) { + permissionAuthorizationService.listResourceAuthorizations( + condition = ResourceAuthorizationConditionRequest( + projectCode = projectCode, + handoverFrom = targetMember.id + ) + ).count == 0L + } else { + true + } + return isMemberHasNoPermission && isMemberHasNoAuthorizations + } + + private fun handoverTask( + projectCode: String, + groupId: Int, + handoverMemberDTO: GroupMemberHandoverConditionReq, + expiredAt: Long + ) { + logger.info( + "handover group member $projectCode|$groupId|" + + "${handoverMemberDTO.targetMember}|${handoverMemberDTO.handoverTo}" + ) + val currentTimeSeconds = System.currentTimeMillis() / 1000 + var finalExpiredAt = expiredAt + when { + // 若权限已过期，如果是唯一管理员组，允许交接，交接人将获得半年权限；其他的直接删除。 + expiredAt < currentTimeSeconds -> { + val isUniqueManagerGroup = authResourceGroupMemberDao.listProjectUniqueManagerGroups( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = listOf(groupId) + ).isNotEmpty() + if (isUniqueManagerGroup) { + finalExpiredAt = currentTimeSeconds + TimeUnit.DAYS.toSeconds(180) + } else { + deleteTask( + projectCode = projectCode, + groupId = groupId, + removeMemberDTO = GroupMemberCommonConditionReq( + targetMember = handoverMemberDTO.targetMember + ), + expiredAt = finalExpiredAt + ) + return + } + } + // 若交接人已经在用户组内，无需交接。 + authResourceGroupMemberDao.isMemberInGroup( + dslContext = dslContext, + projectCode = projectCode, + iamGroupId = groupId, + memberId = handoverMemberDTO.handoverTo.id + ) -> { + deleteTask( + projectCode = projectCode, + groupId = groupId, + removeMemberDTO = GroupMemberCommonConditionReq( + targetMember = handoverMemberDTO.targetMember + ), + expiredAt = finalExpiredAt + ) + return + } + } + + val members = listOf( + ManagerMember( + handoverMemberDTO.handoverTo.type, + handoverMemberDTO.handoverTo.id + ) + ) + if (finalExpiredAt < currentTimeSeconds) { + throw ErrorCodeException( + errorCode = AuthMessageCode.INVALID_EXPIRED_PERM_NOT_ALLOW_TO_HANDOVER + ) + } + + addIamGroupMember( + groupId = groupId, + members = members, + expiredAt = finalExpiredAt + ) + deleteIamGroupMembers( + groupId = groupId, + type = handoverMemberDTO.targetMember.type, + memberIds = listOf(handoverMemberDTO.targetMember.id) + ) + authResourceGroupMemberDao.handoverGroupMembers( + dslContext = dslContext, + projectCode = projectCode, + iamGroupId = groupId, + handoverFrom = handoverMemberDTO.targetMember, + handoverTo = handoverMemberDTO.handoverTo, + expiredTime = DateTimeUtil.convertTimestampToLocalDateTime(finalExpiredAt) + ) + } + + private fun batchOperateGroupMembers( + projectCode: String, + conditionReq: T, + operateGroupMemberTask: ( + projectCode: String, + groupId: Int, + conditionReq: T, + expiredAt: Long + ) -> Unit + ): Boolean { + val groupIds = getGroupIdsByCondition( + projectCode = projectCode, + commonCondition = conditionReq + ).first + val targetMember = conditionReq.targetMember + val memberGroupsDetailsList = listMemberGroupsDetails( + projectCode = projectCode, + memberId = targetMember.id, + memberType = targetMember.type, + groupIds = groupIds + ) + val outOfSyncGroupIds = mutableListOf() + val futures = groupIds.map { groupId -> + CompletableFuture.supplyAsync( + { + val memberGroupsDetails = memberGroupsDetailsList.firstOrNull { it.id == groupId } + if (memberGroupsDetails == null) { + logger.warn( + "The data is out of sync, and the record no longer exists in the iam.$groupId" + ) + outOfSyncGroupIds.add(groupId) + return@supplyAsync + } + val expiredAt = memberGroupsDetails.expiredAt + RetryUtils.retry(3) { + operateGroupMemberTask.invoke( + projectCode, + groupId, + conditionReq, + expiredAt + ) + } + }, executorService + ) + } + handleFutures( + projectCode = projectCode, + outOfSyncGroupIds = outOfSyncGroupIds, + futures = futures + ) + return true + } + + private fun handleFutures( + projectCode: String, + outOfSyncGroupIds: List, + futures: List> + ) { + try { + CompletableFuture.allOf(*futures.toTypedArray()).join() + // 存在iam那边已经把用户组下成员删除，但蓝盾数据库未同步问题 + outOfSyncGroupIds.forEach { + syncIamGroupMemberService.syncIamGroupMember( + projectCode = projectCode, + iamGroupId = it + ) + } + } catch (ignore: Exception) { + logger.warn("batch operate group members failed", ignore) + throw ErrorCodeException( + errorCode = AuthMessageCode.ERROR_BATCH_OPERATE_GROUP_MEMBERS + ) + } + } + + private fun getGroupIdsByCondition( + projectCode: String, + commonCondition: GroupMemberCommonConditionReq + ): Pair, List> /*直接加入，模板加入*/ { + val finalResourceGroupMembers = mutableListOf() + with(commonCondition) { + val resourceGroupMembersByCondition = when { + // 全选 + allSelection -> { + listResourceGroupMembers( + projectCode = projectCode, + memberId = commonCondition.targetMember.id + ).second + } + // 全选某些资源类型用户组 + resourceTypes.isNotEmpty() -> { + resourceTypes.flatMap { resourceType -> + listResourceGroupMembers( + projectCode = projectCode, + memberId = commonCondition.targetMember.id, + resourceType = resourceType + ).second + } + } + else -> { + emptyList() + } + } + + if (resourceGroupMembersByCondition.isNotEmpty()) { + finalResourceGroupMembers.addAll(resourceGroupMembersByCondition) + } + + // Select specific groups individually + if (groupIds.isNotEmpty()) { + val resourceGroupMembersOfSelect = listResourceGroupMembers( + projectCode = projectCode, + memberId = commonCondition.targetMember.id, + iamGroupIds = groupIds + ).second + finalResourceGroupMembers.addAll(resourceGroupMembersOfSelect) + } + + val (groupIdsOfDirectJoined, groupInfoIdsOfTemplateJoined) = finalResourceGroupMembers.partition { + it.memberType != ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE) + }.run { + first.map { it.iamGroupId }.toMutableList() to second.map { it.iamGroupId }.toMutableList() + } + + // When batch removing, if the user is the only manager of the group, ignore and do not transfer + if (excludedUniqueManagerGroup) { + val excludedUniqueManagerGroupIds = authResourceGroupMemberDao.listProjectUniqueManagerGroups( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = groupIdsOfDirectJoined + ) + groupIdsOfDirectJoined.removeAll { + excludedUniqueManagerGroupIds.contains(it) + } + } + return Pair(groupIdsOfDirectJoined, groupInfoIdsOfTemplateJoined) + } + } + + private fun listMemberGroupsDetails( + projectCode: String, + memberId: String, + memberType: String, + groupIds: List + ): List { + val memberGroupsDetailsList = mutableListOf() + val groupIdsChunk = groupIds.chunked(100) + val futures = groupIdsChunk.map { + CompletableFuture.supplyAsync( + { + memberGroupsDetailsList.addAll( + // 若离职，则从数据库获取用户加入组的过期时间，调用iam接口会报错。 + // 虽然数据库的过期时间可能不是最新的。 + if (memberType == ManagerScopesEnum.getType(ManagerScopesEnum.USER) && + deptService.isUserDeparted(userId = memberId)) { + val records = authResourceGroupMemberDao.listMemberGroupDetail( + dslContext = dslContext, + projectCode = projectCode, + memberId = memberId, + iamTemplateIds = emptyList(), + iamGroupIds = it + ) + records.map { record -> + MemberGroupDetailsResponse().apply { + id = record.iamGroupId + expiredAt = record.expiredTime.timestamp() + } + } + } else { + iamV2ManagerService.listMemberGroupsDetails( + memberType, + memberId, + it.joinToString(",") + ) + } + ) + }, executorService + ) + } + try { + CompletableFuture.allOf(*futures.toTypedArray()).join() + } catch (ignore: Exception) { + logger.warn("list member groups details failed!$ignore") + throw ignore + } + return memberGroupsDetailsList + } + + @Suppress("CyclomaticComplexMethod") + override fun getMemberGroupsDetails( + projectId: String, + memberId: String, + resourceType: String?, + iamGroupIds: List?, + start: Int?, + limit: Int? + ): SQLPage { + // 查询成员所在资源用户组列表，直接加入+通过用户组（模板）加入 + val (count, resourceGroupMembers) = listResourceGroupMembers( + projectCode = projectId, + memberId = memberId, + resourceType = resourceType, + iamGroupIds = iamGroupIds, + start = start, + limit = limit + ) + // 用户组对应的资源信息 + val resourceGroupMap = authResourceGroupDao.listByRelationId( + dslContext = dslContext, + projectCode = projectId, + iamGroupIds = resourceGroupMembers.map { it.iamGroupId.toString() } + ).associateBy { it.relationId } + // 只有一个成员的管理员组 + val uniqueManagerGroups = authResourceGroupMemberDao.listProjectUniqueManagerGroups( + dslContext = dslContext, + projectCode = projectId, + iamGroupIds = resourceGroupMembers.map { it.iamGroupId } + ) + // 用户组成员详情 + val groupMemberDetailMap = getGroupMemberDetailMap( + memberId = memberId, + resourceGroupMembers = resourceGroupMembers + ) + val records = mutableListOf() + resourceGroupMembers.forEach { + val resourceGroup = resourceGroupMap[it.iamGroupId.toString()]!! + val groupMemberDetail = groupMemberDetailMap["${it.iamGroupId}_${it.memberId}"] + records.add( + convertGroupDetailsInfoVo( + resourceGroup = resourceGroup, + groupMemberDetail = groupMemberDetail, + uniqueManagerGroups = uniqueManagerGroups, + authResourceGroupMember = it + ) + ) + } + return SQLPage(count = count, records = records) + } + + // 查询成员所在资源用户组列表，直接加入+通过用户组（模板）加入 + @Suppress("LongParameterList") + private fun listResourceGroupMembers( + projectCode: String, + memberId: String, + resourceType: String? = null, + iamGroupIds: List? = null, + start: Int? = null, + limit: Int? = null + ): Pair> { + // 获取用户加入的项目级用户组模板ID + val iamTemplateIds = listProjectMemberGroupTemplateIds( + projectCode = projectCode, + memberId = memberId + ) + val count = authResourceGroupMemberDao.countMemberGroup( + dslContext = dslContext, + projectCode = projectCode, + memberId = memberId, + iamTemplateIds = iamTemplateIds, + resourceType = resourceType, + iamGroupIds = iamGroupIds + )[resourceType] ?: 0L + val resourceGroupMembers = authResourceGroupMemberDao.listMemberGroupDetail( + dslContext = dslContext, + projectCode = projectCode, + memberId = memberId, + iamTemplateIds = iamTemplateIds, + resourceType = resourceType, + iamGroupIds = iamGroupIds, + offset = start, + limit = limit + ) + return Pair(count, resourceGroupMembers) + } + + // 获取用户加入的项目级用户组模板ID + private fun listProjectMemberGroupTemplateIds( + projectCode: String, + memberId: String + ): List { + // 查询项目下包含该成员的组列表 + val projectGroupIds = authResourceGroupMemberDao.listResourceGroupMember( + dslContext = dslContext, + projectCode = projectCode, + resourceType = AuthResourceType.PROJECT.value, + memberId = memberId + ).map { it.iamGroupId.toString() } + // 通过项目组ID获取人员模板ID + return authResourceGroupDao.listByRelationId( + dslContext = dslContext, + projectCode = projectCode, + iamGroupIds = projectGroupIds + ).filter { it.iamTemplateId != null } + .map { it.iamTemplateId.toString() } + } + + private fun getGroupMemberDetailMap( + memberId: String, + resourceGroupMembers: List + ): Map { + // 如果用户离职，查询权限中心接口会报错 + if (deptService.isUserDeparted(memberId)) { + return emptyMap() + } + // 用户组成员详情 + val groupMemberDetailMap = mutableMapOf() + // 直接加入的用户 + val userGroupIds = resourceGroupMembers + .filter { it.memberType == ManagerScopesEnum.getType(ManagerScopesEnum.USER) } + .map { it.iamGroupId } + if (userGroupIds.isNotEmpty()) { + iamV2ManagerService.listMemberGroupsDetails( + ManagerScopesEnum.getType(ManagerScopesEnum.USER), + memberId, + userGroupIds.joinToString(",") + ).forEach { + groupMemberDetailMap["${it.id}_$memberId"] = it + } + } + // 直接加入的组织 + val deptGroupIds = resourceGroupMembers + .filter { it.memberType == ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT) } + .map { it.iamGroupId } + if (deptGroupIds.isNotEmpty()) { + iamV2ManagerService.listMemberGroupsDetails( + ManagerScopesEnum.getType(ManagerScopesEnum.DEPARTMENT), + memberId, + deptGroupIds.joinToString(",") + ).forEach { + groupMemberDetailMap["${it.id}_$memberId"] = it + } + } + // 人员模板加入的组 + resourceGroupMembers.filter { it.memberType == ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE) } + .groupBy({ it.memberId }, { it.iamGroupId.toString() }) + .forEach { (iamTemplateId, iamGroupIds) -> + if (iamGroupIds.isEmpty()) return@forEach + iamV2ManagerService.listMemberGroupsDetails( + ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE), + iamTemplateId, + iamGroupIds.joinToString(",") + ).forEach { + groupMemberDetailMap["${it.id}_$iamTemplateId"] = it + } + } + return groupMemberDetailMap + } + + private fun convertGroupDetailsInfoVo( + resourceGroup: TAuthResourceGroupRecord, + groupMemberDetail: MemberGroupDetailsResponse?, + uniqueManagerGroups: List, + authResourceGroupMember: AuthResourceGroupMember + ): GroupDetailsInfoVo { + // 如果用户离职，查询权限中心接口会报错，因此从数据库直接取数据，而不去调用权限中心接口。 + val (expiredAt, joinedTime) = if (groupMemberDetail != null) { + Pair( + TimeUnit.SECONDS.toMillis(groupMemberDetail.expiredAt), + TimeUnit.SECONDS.toMillis(groupMemberDetail.createdAt) + ) + } else { + Pair( + authResourceGroupMember.expiredTime.timestampmilli(), + 0L + ) + } + val between = expiredAt - System.currentTimeMillis() + return GroupDetailsInfoVo( + resourceCode = resourceGroup.resourceCode, + resourceName = resourceGroup.resourceName, + resourceType = resourceGroup.resourceType, + groupId = resourceGroup.relationId.toInt(), + groupName = resourceGroup.groupName, + groupDesc = resourceGroup.description, + expiredAtDisplay = when { + expiredAt == PERMANENT_EXPIRED_TIME -> + I18nUtil.getCodeLanMessage(messageCode = AuthI18nConstants.BK_MEMBER_EXPIRED_AT_DISPLAY_PERMANENT) + + between >= 0 -> I18nUtil.getCodeLanMessage( + messageCode = AuthI18nConstants.BK_MEMBER_EXPIRED_AT_DISPLAY_NORMAL, + params = arrayOf(DateTimeUtil.formatDay(between)) + ) + + else -> I18nUtil.getCodeLanMessage( + messageCode = AuthI18nConstants.BK_MEMBER_EXPIRED_AT_DISPLAY_EXPIRED + ) + }, + expiredAt = expiredAt, + joinedTime = joinedTime, + removeMemberButtonControl = when { + authResourceGroupMember.memberType == ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE) -> + RemoveMemberButtonControl.TEMPLATE + resourceGroup.resourceType == AuthResourceType.PROJECT.value && + uniqueManagerGroups.contains(authResourceGroupMember.iamGroupId) -> + RemoveMemberButtonControl.UNIQUE_MANAGER + uniqueManagerGroups.contains(authResourceGroupMember.iamGroupId) -> + RemoveMemberButtonControl.UNIQUE_OWNER + + else -> + RemoveMemberButtonControl.OTHER + }, + joinedType = when (authResourceGroupMember.memberType) { + ManagerScopesEnum.getType(ManagerScopesEnum.TEMPLATE) -> JoinedType.TEMPLATE + else -> JoinedType.DIRECT + }, + operator = "" + ) + } + + private fun MutableList.removeDepartedMembers(): List { + val userMemberIds = this.filter { it.type == ManagerScopesEnum.getType(ManagerScopesEnum.USER) }.map { it.id } + if (userMemberIds.isEmpty()) return this + // 获取离职的人员 + val departedMembers = deptService.listDepartedMembers( + memberIds = userMemberIds + ) + return this.filterNot { + it.type == ManagerScopesEnum.getType(ManagerScopesEnum.USER) && + departedMembers.contains(it.id) + } + } + companion object { private val logger = LoggerFactory.getLogger(RbacPermissionResourceMemberService::class.java) @@ -416,5 +1533,8 @@ class RbacPermissionResourceMemberService constructor( private val AUTO_RENEWAL_EXPIRED_AT = TimeUnit.DAYS.toSeconds(180) private val executorService = Executors.newFixedThreadPool(30) + + // 永久过期时间 + private const val PERMANENT_EXPIRED_TIME = 4102444800000L } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceService.kt index 80abe63e43a..67cac81018b 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceService.kt @@ -35,24 +35,16 @@ import com.tencent.devops.auth.pojo.AuthResourceInfo import com.tencent.devops.auth.provider.rbac.pojo.enums.AuthGroupCreateMode import com.tencent.devops.auth.provider.rbac.pojo.event.AuthResourceGroupCreateEvent import com.tencent.devops.auth.provider.rbac.pojo.event.AuthResourceGroupModifyEvent -import com.tencent.devops.auth.service.iam.PermissionProjectService +import com.tencent.devops.auth.service.PermissionAuthorizationService import com.tencent.devops.auth.service.iam.PermissionResourceService -import com.tencent.devops.auth.service.iam.PermissionService +import com.tencent.devops.auth.service.iam.PermissionResourceValidateService import com.tencent.devops.common.api.exception.ErrorCodeException -import com.tencent.devops.common.api.exception.PermissionForbiddenException import com.tencent.devops.common.api.pojo.Pagination import com.tencent.devops.common.api.util.PageUtil -import com.tencent.devops.common.auth.api.AuthPermission import com.tencent.devops.common.auth.api.AuthResourceType -import com.tencent.devops.common.auth.rbac.utils.RbacAuthUtils -import com.tencent.devops.common.client.Client +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO import com.tencent.devops.common.event.dispatcher.trace.TraceEventDispatcher -import com.tencent.devops.common.web.utils.I18nUtil -import com.tencent.devops.project.api.service.ServiceProjectResource -import com.tencent.devops.project.constant.ProjectMessageCode -import com.tencent.devops.project.pojo.enums.ProjectApproveStatus import org.slf4j.LoggerFactory -import javax.ws.rs.NotFoundException @SuppressWarnings("LongParameterList", "TooManyFunctions") class RbacPermissionResourceService( @@ -60,11 +52,10 @@ class RbacPermissionResourceService( private val permissionGradeManagerService: PermissionGradeManagerService, private val permissionSubsetManagerService: PermissionSubsetManagerService, private val authResourceCodeConverter: AuthResourceCodeConverter, - private val permissionService: PermissionService, - private val permissionProjectService: PermissionProjectService, private val traceEventDispatcher: TraceEventDispatcher, private val iamV2ManagerService: V2ManagerService, - private val client: Client + private val permissionAuthorizationService: PermissionAuthorizationService, + private val permissionResourceValidateService: PermissionResourceValidateService ) : PermissionResourceService { companion object { @@ -266,6 +257,16 @@ class RbacPermissionResourceService( resourceCode = resourceCode, resourceName = resourceName ) + permissionAuthorizationService.modifyResourceAuthorization( + listOf( + ResourceAuthorizationDTO( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + resourceName = resourceName + ) + ) + ) traceEventDispatcher.dispatch( AuthResourceGroupModifyEvent( managerId = resourceInfo.relationId.toInt(), @@ -301,6 +302,11 @@ class RbacPermissionResourceService( resourceType = resourceType, resourceCode = resourceCode ) + permissionAuthorizationService.deleteResourceAuthorization( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode + ) return true } @@ -321,64 +327,6 @@ class RbacPermissionResourceService( return true } - override fun hasManagerPermission( - userId: String, - projectId: String, - resourceType: String, - resourceCode: String - ): Boolean { - checkProjectApprovalStatus(resourceType, resourceCode) - val checkProjectManage = permissionProjectService.checkProjectManager( - userId = userId, - projectCode = projectId - ) - if (checkProjectManage) { - return true - } - - // TODO 流水线组一期先不上,流水线组权限由项目控制 - if (resourceType == AuthResourceType.PROJECT.value || resourceType == AuthResourceType.PIPELINE_GROUP.value) { - throw PermissionForbiddenException( - message = I18nUtil.getCodeLanMessage(AuthMessageCode.ERROR_AUTH_NO_MANAGE_PERMISSION) - ) - } else { - val checkResourceManage = permissionService.validateUserResourcePermissionByRelation( - userId = userId, - action = RbacAuthUtils.buildAction( - authPermission = AuthPermission.MANAGE, - authResourceType = RbacAuthUtils.getResourceTypeByStr(resourceType) - ), - projectCode = projectId, - resourceType = resourceType, - resourceCode = resourceCode, - relationResourceType = null - ) - if (!checkResourceManage) { - throw PermissionForbiddenException( - message = I18nUtil.getCodeLanMessage(AuthMessageCode.ERROR_AUTH_NO_MANAGE_PERMISSION) - ) - } - } - return true - } - - private fun checkProjectApprovalStatus(resourceType: String, resourceCode: String) { - if (resourceType == AuthResourceType.PROJECT.value) { - val projectInfo = - client.get(ServiceProjectResource::class).get(resourceCode).data - ?: throw NotFoundException("project - $resourceCode is not exist!") - val approvalStatus = ProjectApproveStatus.parse(projectInfo.approvalStatus) - if (approvalStatus.isCreatePending()) { - throw ErrorCodeException( - errorCode = ProjectMessageCode.UNDER_APPROVAL_PROJECT, - params = arrayOf(resourceCode), - defaultMessage = "project $resourceCode is being approved, " + - "please wait patiently, or contact the approver" - ) - } - } - } - override fun isEnablePermission( userId: String, projectId: String, @@ -387,7 +335,7 @@ class RbacPermissionResourceService( ): Boolean { // 项目不能进入[成员管理]页面,其他资源不需要校验权限，有普通成员视角查看权限页面 if (resourceType == AuthResourceType.PROJECT.value) { - hasManagerPermission( + permissionResourceValidateService.hasManagerPermission( userId = userId, projectId = projectId, resourceType = resourceType, @@ -408,7 +356,7 @@ class RbacPermissionResourceService( resourceCode: String ): Boolean { logger.info("enable resource permission|$userId|$projectId|$resourceType|$resourceCode") - hasManagerPermission( + permissionResourceValidateService.hasManagerPermission( userId = userId, projectId = projectId, resourceType = resourceType, @@ -455,11 +403,11 @@ class RbacPermissionResourceService( resourceCode: String ): Boolean { logger.info("disable resource permission|$userId|$projectId|$resourceType|$resourceCode") - hasManagerPermission( + permissionResourceValidateService.hasManagerPermission( userId = userId, projectId = projectId, resourceType = resourceType, - resourceCode + resourceCode = resourceCode ) if (resourceType == AuthResourceType.PROJECT.value) { throw ErrorCodeException( diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceValidateService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceValidateService.kt index d371901d2f5..c0baf8abee1 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceValidateService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/RbacPermissionResourceValidateService.kt @@ -28,17 +28,29 @@ package com.tencent.devops.auth.provider.rbac.service +import com.tencent.devops.auth.constant.AuthMessageCode import com.tencent.devops.auth.pojo.dto.PermissionBatchValidateDTO import com.tencent.devops.auth.service.iam.PermissionResourceValidateService import com.tencent.devops.auth.service.iam.PermissionService +import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.api.exception.PermissionForbiddenException import com.tencent.devops.common.api.util.Watcher +import com.tencent.devops.common.auth.api.AuthPermission import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.rbac.utils.RbacAuthUtils +import com.tencent.devops.common.client.Client import com.tencent.devops.common.service.utils.LogUtils +import com.tencent.devops.common.web.utils.I18nUtil +import com.tencent.devops.project.api.service.ServiceProjectResource +import com.tencent.devops.project.constant.ProjectMessageCode +import com.tencent.devops.project.pojo.enums.ProjectApproveStatus import org.slf4j.LoggerFactory +import javax.ws.rs.NotFoundException class RbacPermissionResourceValidateService( private val permissionService: PermissionService, - private val rbacCacheService: RbacCacheService + private val rbacCacheService: RbacCacheService, + private val client: Client ) : PermissionResourceValidateService { companion object { @@ -98,6 +110,65 @@ class RbacPermissionResourceValidateService( } } + override fun hasManagerPermission( + userId: String, + projectId: String, + resourceType: String, + resourceCode: String + ): Boolean { + checkProjectApprovalStatus(resourceType, resourceCode) + val checkProjectManage = rbacCacheService.checkProjectManager( + userId = userId, + projectCode = projectId + ) + + if (checkProjectManage) { + return true + } + + // TODO 流水线组一期先不上,流水线组权限由项目控制 + if (resourceType == AuthResourceType.PROJECT.value || resourceType == AuthResourceType.PIPELINE_GROUP.value) { + throw PermissionForbiddenException( + message = I18nUtil.getCodeLanMessage(AuthMessageCode.ERROR_AUTH_NO_MANAGE_PERMISSION) + ) + } else { + val checkResourceManage = permissionService.validateUserResourcePermissionByRelation( + userId = userId, + action = RbacAuthUtils.buildAction( + authPermission = AuthPermission.MANAGE, + authResourceType = RbacAuthUtils.getResourceTypeByStr(resourceType) + ), + projectCode = projectId, + resourceType = resourceType, + resourceCode = resourceCode, + relationResourceType = null + ) + if (!checkResourceManage) { + throw PermissionForbiddenException( + message = I18nUtil.getCodeLanMessage(AuthMessageCode.ERROR_AUTH_NO_MANAGE_PERMISSION) + ) + } + } + return true + } + + private fun checkProjectApprovalStatus(resourceType: String, resourceCode: String) { + if (resourceType == AuthResourceType.PROJECT.value) { + val projectInfo = + client.get(ServiceProjectResource::class).get(resourceCode).data + ?: throw NotFoundException("project - $resourceCode is not exist!") + val approvalStatus = ProjectApproveStatus.parse(projectInfo.approvalStatus) + if (approvalStatus.isCreatePending()) { + throw ErrorCodeException( + errorCode = ProjectMessageCode.UNDER_APPROVAL_PROJECT, + params = arrayOf(resourceCode), + defaultMessage = "project $resourceCode is being approved, " + + "please wait patiently, or contact the approver" + ) + } + } + } + private fun validateProjectPermission( userId: String, actions: List, diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/AbMigratePolicyService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/AbMigratePolicyService.kt index bc4cd211bac..4fae9d617a7 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/AbMigratePolicyService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/AbMigratePolicyService.kt @@ -31,12 +31,10 @@ package com.tencent.devops.auth.provider.rbac.service.migrate import com.tencent.bk.sdk.iam.config.IamConfiguration import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum import com.tencent.bk.sdk.iam.dto.manager.AuthorizationScopes -import com.tencent.bk.sdk.iam.dto.manager.ManagerMember import com.tencent.bk.sdk.iam.dto.manager.ManagerPath import com.tencent.bk.sdk.iam.dto.manager.ManagerResources import com.tencent.bk.sdk.iam.dto.manager.ManagerRoleGroup import com.tencent.bk.sdk.iam.dto.manager.RoleGroupMemberInfo -import com.tencent.bk.sdk.iam.dto.manager.dto.ManagerMemberGroupDTO import com.tencent.bk.sdk.iam.dto.manager.dto.ManagerRoleGroupDTO import com.tencent.bk.sdk.iam.service.v2.V2ManagerService import com.tencent.devops.auth.constant.AuthMessageCode @@ -50,6 +48,7 @@ import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateIamApiServic import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateIamApiService.Companion.GROUP_WEB_POLICY import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateIamApiService.Companion.USER_CUSTOM_POLICY import com.tencent.devops.auth.service.DeptService +import com.tencent.devops.auth.service.iam.PermissionResourceMemberService import com.tencent.devops.auth.service.iam.PermissionService import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.util.DateTimeUtil @@ -78,7 +77,8 @@ abstract class AbMigratePolicyService( private val permissionService: PermissionService, private val rbacCacheService: RbacCacheService, private val deptService: DeptService, - private val permissionGroupPoliciesService: PermissionGroupPoliciesService + private val permissionGroupPoliciesService: PermissionGroupPoliciesService, + private val permissionResourceMemberService: PermissionResourceMemberService ) { companion object { @@ -157,7 +157,7 @@ abstract class AbMigratePolicyService( projectName = groupInfo.resourceName ) authorizationScopeList.forEach { authorizationScope -> - v2ManagerService.grantRoleGroupV2(groupInfo.relationId.toInt(), authorizationScope) + v2ManagerService.grantRoleGroupV2(groupInfo.relationId, authorizationScope) } } } @@ -258,6 +258,7 @@ abstract class AbMigratePolicyService( } // 往用户组添加成员 batchAddGroupMember( + projectCode = projectCode, groupId = groupId, defaultGroup = defaultGroup, members = result.members, @@ -276,6 +277,7 @@ abstract class AbMigratePolicyService( ): Pair/*组授权范围*/, List/*流水线用户组ID（关联流水线动作组）*/> abstract fun batchAddGroupMember( + projectCode: String, groupId: Int, defaultGroup: Boolean, members: List?, @@ -377,13 +379,14 @@ abstract class AbMigratePolicyService( permission = permission ) groupIds.forEach { groupId -> - val managerMember = ManagerMember(ManagerScopesEnum.getType(ManagerScopesEnum.USER), userId) - val managerMemberGroupDTO = ManagerMemberGroupDTO.builder() - .members(listOf(managerMember)) - .expiredAt( - System.currentTimeMillis() / MILLISECOND + TimeUnit.DAYS.toSeconds(DEFAULT_EXPIRED_DAY) - ).build() - v2ManagerService.createRoleGroupMemberV2(groupId, managerMemberGroupDTO) + permissionResourceMemberService.addGroupMember( + projectCode = projectCode, + memberId = userId, + memberType = ManagerScopesEnum.getType(ManagerScopesEnum.USER), + expiredAt = System.currentTimeMillis() / MILLISECOND + + TimeUnit.DAYS.toSeconds(DEFAULT_EXPIRED_DAY), + iamGroupId = groupId + ) } } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigratePermissionHandoverService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigratePermissionHandoverService.kt index 7bffe471d60..0c26c1ebac0 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigratePermissionHandoverService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigratePermissionHandoverService.kt @@ -60,10 +60,11 @@ class MigratePermissionHandoverService constructor( ) handoverToList.forEach { handoverTo -> permissionResourceMemberService.addGroupMember( - userId = handoverTo, + projectCode = projectCode, + memberId = handoverTo, memberType = USER_TYPE, expiredAt = GROUP_EXPIRED_TIME, - groupId = projectManagerGroupId!!.relationId.toInt() + iamGroupId = projectManagerGroupId!!.relationId.toInt() ) } } @@ -91,15 +92,16 @@ class MigratePermissionHandoverService constructor( ) try { permissionResourceMemberService.addGroupMember( - userId = handoverTo, + projectCode = projectCode, + memberId = handoverTo, memberType = USER_TYPE, expiredAt = GROUP_EXPIRED_TIME, - groupId = resourceManagerGroup!!.relationId.toInt() + iamGroupId = resourceManagerGroup!!.relationId.toInt() ) - v2ManagerService.deleteRoleGroupMemberV2( - resourceManagerGroup.relationId.toInt(), - USER_TYPE, - handoverFrom + permissionResourceMemberService.batchDeleteResourceGroupMembers( + projectCode = projectCode, + iamGroupId = resourceManagerGroup.relationId.toInt(), + members = listOf(handoverFrom) ) } catch (ignore: Exception) { logger.warn( diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateResourceAuthorizationService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateResourceAuthorizationService.kt new file mode 100644 index 00000000000..188249cb23d --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateResourceAuthorizationService.kt @@ -0,0 +1,226 @@ +/* + * 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.auth.provider.rbac.service.migrate + +import com.tencent.bk.sdk.iam.constants.CallbackMethodEnum +import com.tencent.bk.sdk.iam.dto.PageInfoDTO +import com.tencent.bk.sdk.iam.dto.PathInfoDTO +import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO +import com.tencent.bk.sdk.iam.dto.callback.request.FilterDTO +import com.tencent.devops.auth.service.PermissionAuthorizationService +import com.tencent.devops.auth.service.ResourceService +import com.tencent.devops.common.api.util.PageUtil +import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.api.AuthTokenApi +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.callback.ListResourcesAuthorizationDTO +import com.tencent.devops.common.auth.code.ProjectAuthServiceCode +import com.tencent.devops.common.client.Client +import com.tencent.devops.common.service.trace.TraceTag +import com.tencent.devops.project.api.service.ServiceProjectResource +import org.slf4j.LoggerFactory +import org.slf4j.MDC +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service +import java.util.concurrent.CompletableFuture +import java.util.concurrent.Executors + +/** + * 迁移资源授权 + */ +@Service +class MigrateResourceAuthorizationService @Autowired constructor( + private val resourceService: ResourceService, + private val tokenApi: AuthTokenApi, + private val projectAuthServiceCode: ProjectAuthServiceCode, + private val permissionAuthorizationService: PermissionAuthorizationService, + private val client: Client +) { + fun migrateResourceAuthorization(projectCodes: List): Boolean { + logger.info("start to migrate resource authorization by project list:$projectCodes") + executorService.submit { + projectCodes.forEach { + migrateResourceAuthorization( + projectCode = it + ) + } + } + return true + } + + fun migrateAllResourceAuthorization(): Boolean { + logger.info("start to migrate all project resource authorization") + executorService.submit { + var offset = 0 + val limit = PageUtil.MAX_PAGE_SIZE / 2 + do { + val migrateProjects = client.get(ServiceProjectResource::class).listProjectsByCondition( + projectConditionDTO = ProjectConditionDTO(), + limit = limit, + offset = offset + ).data ?: break + migrateProjects.forEach { + migrateResourceAuthorization(it.englishName) + } + offset += limit + } while (migrateProjects.size == limit) + } + return true + } + + private fun migrateResourceAuthorization(projectCode: String) { + val startEpoch = System.currentTimeMillis() + logger.info("start to migrate resource authorization:$projectCode") + try { + val resourceTypes = listOf( + AuthResourceType.PIPELINE_DEFAULT.value, + AuthResourceType.ENVIRONMENT_ENV_NODE.value, + AuthResourceType.CODE_REPERTORY.value + ) + + logger.info("MigrateResourceAuthorization|resourceTypes:$resourceTypes") + // 迁移各个资源类型下的资源授权 + val traceId = MDC.get(TraceTag.BIZID) + resourceTypes.forEach { resourceType -> + CompletableFuture.supplyAsync( + { + MDC.put(TraceTag.BIZID, traceId) + migrateResourceAuthorization( + projectCode = projectCode, + resourceType = resourceType + ) + }, + executorService + ) + } + } finally { + logger.info("It take(${System.currentTimeMillis() - startEpoch})ms to migrate resource $projectCode") + } + } + + private fun migrateResourceAuthorization( + projectCode: String, + resourceType: String + ) { + val startEpoch = System.currentTimeMillis() + logger.info("start to migrate resource authorization|$projectCode|$resourceType") + try { + createResourceAuthorization( + resourceType = resourceType, + projectCode = projectCode + ) + } catch (ignore: Exception) { + logger.error("Failed to migrate resource authorization|$projectCode|$resourceType", ignore) + throw ignore + } finally { + logger.info( + "It take(${System.currentTimeMillis() - startEpoch})ms to migrate " + + "resource authorization|$projectCode|$resourceType" + ) + } + } + + private fun createResourceAuthorization( + resourceType: String, + projectCode: String + ) { + var offset = 0L + val limit = 100L + val resourceAuthorizationIds = mutableListOf() + do { + val resourceAuthorizationData = listResourceAuthorization( + offset = offset, + limit = limit, + resourceType = resourceType, + projectCode = projectCode + )?.data + + logger.info( + "MigrateResourceAuthorizationService|projectCode:$projectCode|resourceType:$resourceType" + + "|resourceAuthorizationData:$resourceAuthorizationData" + ) + if (resourceAuthorizationData == null || resourceAuthorizationData.result.isNullOrEmpty()) { + return + } + permissionAuthorizationService.migrateResourceAuthorization( + resourceAuthorizationList = resourceAuthorizationData.result.map { + ResourceAuthorizationDTO( + projectCode = projectCode, + resourceType = resourceType, + resourceName = it.resourceName, + resourceCode = it.resourceCode, + handoverTime = it.handoverTime, + handoverFrom = it.handoverFrom + ) + } + ) + resourceAuthorizationIds.addAll(resourceAuthorizationData.result.map { it.resourceCode }) + offset += limit + } while (resourceAuthorizationData!!.result.size.toLong() == limit) + // 由于生产和灰度不是同时发布，可能会出现生产删除资源，但是授权记录未删除，而导致出现的脏数据，需要进行删除。 + permissionAuthorizationService.fixResourceAuthorization( + projectCode = projectCode, + resourceType = resourceType, + resourceAuthorizationIds = resourceAuthorizationIds + ) + } + + private fun listResourceAuthorization( + offset: Long, + limit: Long, + resourceType: String, + projectCode: String + ): ListResourcesAuthorizationDTO? { + val pathInfoDTO = PathInfoDTO().apply { + type = AuthResourceType.PROJECT.value + id = projectCode + } + val filterDTO = FilterDTO().apply { + parent = pathInfoDTO + } + return resourceService.getInstanceByResource( + callBackInfo = CallbackRequestDTO().apply { + type = resourceType + method = CallbackMethodEnum.LIST_RESOURCE_AUTHORIZATION + filter = filterDTO + page = PageInfoDTO().apply { + this.offset = offset + this.limit = limit + } + }, + token = tokenApi.getAccessToken(projectAuthServiceCode) + ) as ListResourcesAuthorizationDTO? + } + + companion object { + private val logger = LoggerFactory.getLogger(MigrateResourceAuthorizationService::class.java) + private val executorService = Executors.newFixedThreadPool(10) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateResourceGroupService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateResourceGroupService.kt new file mode 100644 index 00000000000..74402c2bd59 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateResourceGroupService.kt @@ -0,0 +1,103 @@ +/* + * 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.auth.provider.rbac.service.migrate + +import com.tencent.bk.sdk.iam.dto.V2PageInfoDTO +import com.tencent.bk.sdk.iam.dto.manager.dto.SearchGroupDTO +import com.tencent.bk.sdk.iam.service.v2.V2ManagerService +import com.tencent.devops.auth.dao.AuthResourceGroupDao +import com.tencent.devops.auth.provider.rbac.service.AuthResourceService +import com.tencent.devops.common.api.util.PageUtil +import com.tencent.devops.common.auth.api.AuthResourceType +import org.jooq.DSLContext +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired + +/** + * 将资源组迁移到权限中心 + */ +@Suppress("LongParameterList", "MagicNumber") +class MigrateResourceGroupService @Autowired constructor( + private val authResourceService: AuthResourceService, + private val dslContext: DSLContext, + private val authResourceGroupDao: AuthResourceGroupDao, + private val iamV2ManagerService: V2ManagerService +) { + fun fixResourceGroups(projectCode: String) { + logger.info("start to fix resource groups,$projectCode ") + val recordsOfNeedToFix = authResourceGroupDao.listRecordsOfNeedToFix( + dslContext = dslContext, + projectCode = projectCode + ) + logger.info("resource groups need to fix ,$projectCode|$recordsOfNeedToFix") + recordsOfNeedToFix.forEach { resourceGroupInfo -> + val resourceInfo = authResourceService.get( + projectCode = projectCode, + resourceType = resourceGroupInfo.resourceType, + resourceCode = resourceGroupInfo.resourceCode + ) + val pageInfoDTO = V2PageInfoDTO() + pageInfoDTO.page = PageUtil.DEFAULT_PAGE + pageInfoDTO.pageSize = PageUtil.DEFAULT_PAGE_SIZE + val iamGroupInfo = if (resourceInfo.resourceType == AuthResourceType.PROJECT.value) { + val searchGroupDTO = SearchGroupDTO.builder() + .inherit(false) + .name(resourceGroupInfo.groupName) + .build() + iamV2ManagerService.getGradeManagerRoleGroupV2( + resourceInfo.relationId, + searchGroupDTO, + pageInfoDTO + ) + } else { + iamV2ManagerService.getSubsetManagerRoleGroup( + resourceInfo.relationId.toInt(), + pageInfoDTO + ) + }.results.firstOrNull { it.name == resourceGroupInfo.groupName } + logger.info("resource groups need to fix,iam group info $projectCode|$iamGroupInfo") + if (iamGroupInfo != null) { + authResourceGroupDao.update( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceGroupInfo.resourceType, + resourceCode = resourceGroupInfo.resourceCode, + resourceName = resourceInfo.resourceName, + groupCode = resourceGroupInfo.groupCode, + groupName = resourceGroupInfo.groupName, + relationId = iamGroupInfo.id.toString() + ) + } + } + } + + companion object { + private val logger = LoggerFactory.getLogger(MigrateResourceGroupService::class.java) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV0PolicyService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV0PolicyService.kt index ef9401ee8da..c5ce1b2976b 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV0PolicyService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV0PolicyService.kt @@ -84,7 +84,8 @@ class MigrateV0PolicyService constructor( permissionService = permissionService, rbacCacheService = rbacCacheService, deptService = deptService, - permissionGroupPoliciesService = permissionGroupPoliciesService + permissionGroupPoliciesService = permissionGroupPoliciesService, + permissionResourceMemberService = permissionResourceMemberService ) { companion object { @@ -459,6 +460,7 @@ class MigrateV0PolicyService constructor( } override fun batchAddGroupMember( + projectCode: String, groupId: Int, defaultGroup: Boolean, members: List?, @@ -480,6 +482,7 @@ class MigrateV0PolicyService constructor( groupIdOfPipelineActionGroupList.forEach { logger.info("add subject template to group of pipeline:$it|$subjectTemplateId") addGroupMember( + projectCode = projectCode, groupId = it.toInt(), defaultGroup = true, member = RoleGroupMemberInfo().apply { @@ -503,6 +506,7 @@ class MigrateV0PolicyService constructor( } members.forEach member@{ member -> addGroupMember( + projectCode = projectCode, defaultGroup = defaultGroup, member = member, groupId = groupId @@ -511,6 +515,7 @@ class MigrateV0PolicyService constructor( } private fun addGroupMember( + projectCode: String, defaultGroup: Boolean, member: RoleGroupMemberInfo, groupId: Int @@ -523,11 +528,12 @@ class MigrateV0PolicyService constructor( V0_GROUP_EXPIRED_DAY[RandomUtils.nextInt(0, 2)] } permissionResourceMemberService.addGroupMember( - userId = member.id, + projectCode = projectCode, + memberId = member.id, memberType = member.type, expiredAt = System.currentTimeMillis() / MILLISECOND + TimeUnit.DAYS.toSeconds(expiredDay) + TimeUnit.DAYS.toSeconds(RandomUtils.nextLong(0, 180)), - groupId = groupId + iamGroupId = groupId ) } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV3PolicyService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV3PolicyService.kt index c2e42c529b6..3b218db28e3 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV3PolicyService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/MigrateV3PolicyService.kt @@ -88,7 +88,8 @@ class MigrateV3PolicyService constructor( permissionService = permissionService, rbacCacheService = rbacCacheService, deptService = deptService, - permissionGroupPoliciesService = permissionGroupPoliciesService + permissionGroupPoliciesService = permissionGroupPoliciesService, + permissionResourceMemberService = permissionResourceMemberService ) { companion object { @@ -156,6 +157,7 @@ class MigrateV3PolicyService constructor( val rbacAuthorizationScopes = mutableListOf() result.permissions.forEach permission@{ permission -> val (isManager, rbacActions) = buildRbacActions( + projectCode = projectCode, managerGroupId = managerGroupId, permission = permission, members = result.members @@ -181,6 +183,7 @@ class MigrateV3PolicyService constructor( } private fun buildRbacActions( + projectCode: String, managerGroupId: Int, permission: AuthorizationScopes, members: List? @@ -191,7 +194,12 @@ class MigrateV3PolicyService constructor( // 如果包含all_action,则直接添加到管理员组 Constants.ALL_ACTION -> { logger.info("match all_action,member add to manager group $managerGroupId") - batchAddGroupMember(groupId = managerGroupId, defaultGroup = true, members = members) + batchAddGroupMember( + projectCode = projectCode, + groupId = managerGroupId, + defaultGroup = true, + members = members + ) return Pair(true, emptyList()) } PROJECT_VIEWS_MANAGER, PROJECT_DELETE, QUALITY_GROUP_ENABLE -> { @@ -376,6 +384,7 @@ class MigrateV3PolicyService constructor( } override fun batchAddGroupMember( + projectCode: String, groupId: Int, defaultGroup: Boolean, members: List?, @@ -391,10 +400,11 @@ class MigrateV3PolicyService constructor( member.expiredAt } permissionResourceMemberService.addGroupMember( - userId = member.id, + projectCode = projectCode, + memberId = member.id, memberType = member.type, expiredAt = expiredAt, - groupId = groupId + iamGroupId = groupId ) } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/RbacPermissionMigrateService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/RbacPermissionMigrateService.kt index 4a0e5807bbd..7523c4fff65 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/RbacPermissionMigrateService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/rbac/service/migrate/RbacPermissionMigrateService.kt @@ -83,7 +83,9 @@ class RbacPermissionMigrateService constructor( private val authMigrationDao: AuthMigrationDao, private val authMonitorSpaceDao: AuthMonitorSpaceDao, private val cacheService: RbacCacheService, - private val permissionResourceMemberService: PermissionResourceMemberService + private val permissionResourceMemberService: PermissionResourceMemberService, + private val migrateResourceAuthorizationService: MigrateResourceAuthorizationService, + private val migrateResourceGroupService: MigrateResourceGroupService ) : PermissionMigrateService { companion object { @@ -209,8 +211,12 @@ class RbacPermissionMigrateService constructor( resourceType != null val projectInfoList = client.get(ServiceProjectResource::class).listByProjectCode(projectCodes.toSet()) .data!!.filter { - it.routerTag != null && ( - it.routerTag!!.contains(AuthSystemType.RBAC_AUTH_TYPE.value) || it.routerTag!!.contains("devx")) + val r = it.routerTag + if (migrateResourceDTO.includeNullRouterTag == true) { + r == null || r.contains(AuthSystemType.RBAC_AUTH_TYPE.value) || r.contains("devx") + } else { + r != null && (r.contains(AuthSystemType.RBAC_AUTH_TYPE.value) || r.contains("devx")) + } } val traceId = MDC.get(TraceTag.BIZID) projectInfoList.forEach { @@ -273,7 +279,8 @@ class RbacPermissionMigrateService constructor( val migrateProjects = client.get(ServiceProjectResource::class).listProjectsByCondition( projectConditionDTO = ProjectConditionDTO( routerTag = AuthSystemType.RBAC_AUTH_TYPE, - enabled = true + enabled = true, + includeNullRouterTag = migrateResourceDTO.includeNullRouterTag ), limit = limit, offset = offset @@ -449,6 +456,7 @@ class RbacPermissionMigrateService constructor( watcher = watcher ) } + AuthSystemType.V3_AUTH_TYPE -> { migrateV3Auth( projectCode = projectCode, @@ -585,12 +593,15 @@ class RbacPermissionMigrateService constructor( is IamException -> { exception.errorMsg } + is ErrorCodeException -> { exception.defaultMessage } + is CompletionException -> { exception.cause?.message ?: exception.message } + else -> { exception.toString() } @@ -665,4 +676,23 @@ class RbacPermissionMigrateService constructor( } while (resourceSize == limit) logger.info("Finish to auto renewal|$projectCode|${System.currentTimeMillis() - startTime}") } + + override fun migrateResourceAuthorization(projectCodes: List): Boolean { + return migrateResourceAuthorizationService.migrateResourceAuthorization( + projectCodes = projectCodes + ) + } + + override fun migrateAllResourceAuthorization(): Boolean { + return migrateResourceAuthorizationService.migrateAllResourceAuthorization() + } + + override fun fixResourceGroups(projectCodes: List): Boolean { + projectCodes.forEach { + migrateResourceGroupService.fixResourceGroups( + projectCode = it + ) + } + return true + } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/config/MockAuthConfiguration.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/config/MockAuthConfiguration.kt index cab51428097..383c3f2642a 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/config/MockAuthConfiguration.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/config/MockAuthConfiguration.kt @@ -1,5 +1,6 @@ package com.tencent.devops.auth.provider.sample.config +import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResourceAuthorizationService import com.tencent.devops.auth.provider.sample.service.SampleAuthAuthorizationScopesService import com.tencent.devops.auth.provider.sample.service.SampleAuthMonitorSpaceService import com.tencent.devops.auth.provider.sample.service.SampleAuthPermissionProjectService @@ -12,6 +13,7 @@ import com.tencent.devops.auth.provider.sample.service.SamplePermissionGradeServ import com.tencent.devops.auth.provider.sample.service.SamplePermissionItsmCallbackService import com.tencent.devops.auth.provider.sample.service.SamplePermissionMigrateService import com.tencent.devops.auth.provider.sample.service.SamplePermissionResourceGroupService +import com.tencent.devops.auth.provider.sample.service.SamplePermissionResourceGroupSyncService import com.tencent.devops.auth.provider.sample.service.SamplePermissionResourceMemberService import com.tencent.devops.auth.provider.sample.service.SamplePermissionResourceService import com.tencent.devops.auth.provider.sample.service.SamplePermissionResourceValidateService @@ -24,6 +26,7 @@ import com.tencent.devops.auth.service.AuthMonitorSpaceService import com.tencent.devops.auth.service.DefaultDeptServiceImpl import com.tencent.devops.auth.service.DeptService import com.tencent.devops.auth.service.OrganizationService +import com.tencent.devops.auth.service.PermissionAuthorizationService import com.tencent.devops.auth.service.SuperManagerService import com.tencent.devops.auth.service.iam.PermissionApplyService import com.tencent.devops.auth.service.iam.PermissionExtService @@ -33,6 +36,7 @@ import com.tencent.devops.auth.service.iam.PermissionItsmCallbackService import com.tencent.devops.auth.service.iam.PermissionMigrateService import com.tencent.devops.auth.service.iam.PermissionProjectService import com.tencent.devops.auth.service.iam.PermissionResourceGroupService +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.auth.service.iam.PermissionResourceMemberService import com.tencent.devops.auth.service.iam.PermissionResourceService import com.tencent.devops.auth.service.iam.PermissionResourceValidateService @@ -97,7 +101,11 @@ class MockAuthConfiguration { @Bean @ConditionalOnMissingBean(PermissionResourceService::class) - fun samplePermissionResourceService() = SamplePermissionResourceService() + fun samplePermissionResourceService( + permissionAuthorizationService: PermissionAuthorizationService + ) = SamplePermissionResourceService( + permissionAuthorizationService = permissionAuthorizationService + ) @Bean @ConditionalOnMissingBean(PermissionResourceGroupService::class) @@ -121,7 +129,11 @@ class MockAuthConfiguration { @Bean @ConditionalOnMissingBean(PermissionMigrateService::class) - fun samplePermissionMigrateService() = SamplePermissionMigrateService() + fun samplePermissionMigrateService( + migrateResourceAuthorizationService: MigrateResourceAuthorizationService + ) = SamplePermissionMigrateService( + migrateResourceAuthorizationService = migrateResourceAuthorizationService + ) @Bean @ConditionalOnMissingBean(AuthAuthorizationScopesService::class) @@ -130,4 +142,8 @@ class MockAuthConfiguration { @Bean @ConditionalOnMissingBean(AuthMonitorSpaceService::class) fun sampleAuthMonitorSpaceService() = SampleAuthMonitorSpaceService() + + @Bean + @ConditionalOnMissingBean(PermissionResourceGroupSyncService::class) + fun samplePermissionResourceGroupSyncService() = SamplePermissionResourceGroupSyncService() } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionMigrateService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionMigrateService.kt index f18f94ec79d..13b3f743a0e 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionMigrateService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionMigrateService.kt @@ -32,8 +32,11 @@ import com.tencent.devops.auth.pojo.dto.MigrateResourceDTO import com.tencent.devops.auth.service.iam.PermissionMigrateService import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO import com.tencent.devops.auth.pojo.dto.PermissionHandoverDTO +import com.tencent.devops.auth.provider.rbac.service.migrate.MigrateResourceAuthorizationService -class SamplePermissionMigrateService : PermissionMigrateService { +class SamplePermissionMigrateService( + val migrateResourceAuthorizationService: MigrateResourceAuthorizationService +) : PermissionMigrateService { override fun v3ToRbacAuth(projectCodes: List): Boolean { return true } @@ -85,4 +88,16 @@ class SamplePermissionMigrateService : PermissionMigrateService { override fun autoRenewal(projectConditionDTO: ProjectConditionDTO): Boolean { return true } + + override fun migrateResourceAuthorization(projectCodes: List): Boolean { + return migrateResourceAuthorizationService.migrateResourceAuthorization( + projectCodes = projectCodes + ) + } + + override fun migrateAllResourceAuthorization(): Boolean { + return migrateResourceAuthorizationService.migrateAllResourceAuthorization() + } + + override fun fixResourceGroups(projectCodes: List): Boolean = true } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupService.kt index a0069dc9698..30a8fc341af 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupService.kt @@ -29,6 +29,7 @@ package com.tencent.devops.auth.provider.sample.service import com.tencent.devops.auth.pojo.dto.GroupAddDTO +import com.tencent.devops.auth.pojo.dto.ListGroupConditionDTO import com.tencent.devops.auth.pojo.dto.RenameGroupDTO import com.tencent.devops.auth.pojo.vo.GroupPermissionDetailVo import com.tencent.devops.auth.pojo.vo.IamGroupInfoVo @@ -40,11 +41,8 @@ import com.tencent.devops.common.api.pojo.Pagination class SamplePermissionResourceGroupService : PermissionResourceGroupService { override fun listGroup( - projectId: String, - resourceType: String, - resourceCode: String, - page: Int, - pageSize: Int + userId: String, + listGroupConditionDTO: ListGroupConditionDTO ): Pagination { return Pagination(false, emptyList()) } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupSyncService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupSyncService.kt new file mode 100644 index 00000000000..eceb19c8a3c --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceGroupSyncService.kt @@ -0,0 +1,55 @@ +/* + * 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.auth.provider.sample.service + +import com.tencent.devops.auth.pojo.enum.AuthMigrateStatus +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO + +class SamplePermissionResourceGroupSyncService : PermissionResourceGroupSyncService { + + override fun syncByCondition(projectConditionDTO: ProjectConditionDTO) = Unit + + override fun batchSyncGroupAndMember(projectCodes: List) = Unit + + override fun syncGroupAndMember(projectCode: String) = Unit + + override fun getStatusOfSync(projectCode: String): AuthMigrateStatus = AuthMigrateStatus.SUCCEED + + override fun batchSyncProjectGroup(projectCodes: List) = Unit + + override fun batchSyncAllMember(projectCodes: List) = Unit + + override fun syncResourceMember(projectCode: String, resourceType: String, resourceCode: String) = Unit + + override fun syncIamGroupMember(projectCode: String, iamGroupId: Int) = Unit + + override fun syncIamGroupMembersOfApply() = Unit + + override fun fixResourceGroupMember(projectCode: String) = Unit +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceMemberService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceMemberService.kt index 9210ca39780..e6f5eddc799 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceMemberService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceMemberService.kt @@ -1,7 +1,22 @@ package com.tencent.devops.auth.provider.sample.service +import com.tencent.bk.sdk.iam.dto.manager.ManagerMember +import com.tencent.devops.auth.pojo.ResourceMemberInfo import com.tencent.devops.auth.pojo.dto.GroupMemberRenewalDTO +import com.tencent.devops.auth.pojo.enum.BatchOperateType +import com.tencent.devops.auth.pojo.enum.JoinedType +import com.tencent.devops.auth.pojo.enum.RemoveMemberButtonControl +import com.tencent.devops.auth.pojo.request.GroupMemberCommonConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberHandoverConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberRenewalConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberSingleRenewalReq +import com.tencent.devops.auth.pojo.request.RemoveMemberFromProjectReq +import com.tencent.devops.auth.pojo.vo.BatchOperateGroupMemberCheckVo +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo +import com.tencent.devops.auth.pojo.vo.MemberGroupCountWithPermissionsVo +import com.tencent.devops.auth.pojo.vo.ResourceMemberCountVO import com.tencent.devops.auth.service.iam.PermissionResourceMemberService +import com.tencent.devops.common.api.model.SQLPage import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import com.tencent.devops.common.auth.api.pojo.BkAuthGroupAndUserList @@ -43,7 +58,11 @@ class SamplePermissionResourceMemberService : PermissionResourceMemberService { roleCode: String ): Int = 0 - override fun autoRenewal(projectCode: String, resourceType: String, resourceCode: String) = Unit + override fun autoRenewal( + projectCode: String, + resourceType: String, + resourceCode: String + ) = Unit override fun renewalGroupMember( userId: String, @@ -53,17 +72,122 @@ class SamplePermissionResourceMemberService : PermissionResourceMemberService { memberRenewalDTO: GroupMemberRenewalDTO ): Boolean = true - override fun deleteGroupMember( + override fun renewalGroupMember( userId: String, projectCode: String, - resourceType: String, - groupId: Int + renewalConditionReq: GroupMemberSingleRenewalReq + ): GroupDetailsInfoVo = GroupDetailsInfoVo( + resourceCode = "resourceCode", + resourceName = "resourceName", + resourceType = "resourceType", + groupId = 0, + groupName = "", + groupDesc = "", + expiredAtDisplay = "", + expiredAt = 0, + joinedTime = 0, + removeMemberButtonControl = RemoveMemberButtonControl.OTHER, + joinedType = JoinedType.DIRECT, + operator = "" + ) + + override fun renewalIamGroupMembers( + groupId: Int, + members: List, + expiredAt: Long ): Boolean = true - override fun addGroupMember( + override fun batchRenewalGroupMembers( + userId: String, + projectCode: String, + renewalConditionReq: GroupMemberRenewalConditionReq + ): Boolean = true + + override fun batchDeleteResourceGroupMembers( + userId: String, + projectCode: String, + removeMemberDTO: GroupMemberCommonConditionReq + ): Boolean = true + + override fun deleteIamGroupMembers( + groupId: Int, + type: String, + memberIds: List + ): Boolean = true + + override fun batchHandoverGroupMembers( + userId: String, + projectCode: String, + handoverMemberDTO: GroupMemberHandoverConditionReq + ): Boolean = true + + override fun batchOperateGroupMembersCheck( userId: String, + projectCode: String, + batchOperateType: BatchOperateType, + conditionReq: GroupMemberCommonConditionReq + ): BatchOperateGroupMemberCheckVo = BatchOperateGroupMemberCheckVo( + totalCount = 0, + inoperableCount = 0 + ) + + override fun removeMemberFromProject( + userId: String, + projectCode: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): List = emptyList() + + override fun removeMemberFromProjectCheck( + userId: String, + projectCode: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): Boolean = true + + override fun addGroupMember( + projectCode: String, + memberId: String, memberType: String, expiredAt: Long, - groupId: Int + iamGroupId: Int ): Boolean = true + + override fun addIamGroupMember(groupId: Int, members: List, expiredAt: Long): Boolean { + TODO("Not yet implemented") + } + + override fun getProjectMemberCount(projectCode: String): ResourceMemberCountVO = + ResourceMemberCountVO( + userCount = 0, + departmentCount = 0 + ) + + override fun listProjectMembers( + projectCode: String, + memberType: String?, + userName: String?, + deptName: String?, + departedFlag: Boolean?, + page: Int, + pageSize: Int + ): SQLPage { + return SQLPage(count = 0, records = emptyList()) + } + + override fun getMemberGroupsCount( + projectCode: String, + memberId: String + ): List { + return emptyList() + } + + override fun getMemberGroupsDetails( + projectId: String, + memberId: String, + resourceType: String?, + iamGroupIds: List?, + start: Int?, + limit: Int? + ): SQLPage { + return SQLPage(0, records = emptyList()) + } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceService.kt index 383dd80f809..c85c667a096 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceService.kt @@ -29,11 +29,15 @@ package com.tencent.devops.auth.provider.sample.service import com.tencent.devops.auth.pojo.AuthResourceInfo +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.auth.service.PermissionAuthorizationService import com.tencent.devops.auth.service.iam.PermissionResourceService import com.tencent.devops.common.api.pojo.Pagination import java.time.LocalDateTime -class SamplePermissionResourceService : PermissionResourceService { +class SamplePermissionResourceService constructor( + private val permissionAuthorizationService: PermissionAuthorizationService +) : PermissionResourceService { override fun resourceCreateRelation( userId: String, projectCode: String, @@ -48,13 +52,32 @@ class SamplePermissionResourceService : PermissionResourceService { resourceType: String, resourceCode: String, resourceName: String - ) = true + ): Boolean { + permissionAuthorizationService.modifyResourceAuthorization( + listOf( + ResourceAuthorizationDTO( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + resourceName = resourceName + ) + ) + ) + return true + } override fun resourceDeleteRelation( projectCode: String, resourceType: String, resourceCode: String - ) = true + ): Boolean { + permissionAuthorizationService.deleteResourceAuthorization( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode + ) + return true + } override fun resourceCancelRelation( userId: String, @@ -63,13 +86,6 @@ class SamplePermissionResourceService : PermissionResourceService { resourceCode: String ) = true - override fun hasManagerPermission( - userId: String, - projectId: String, - resourceType: String, - resourceCode: String - ) = true - override fun isEnablePermission( userId: String, projectId: String, diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceValidateService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceValidateService.kt index 2aa4ee86d90..b2ba564a4cf 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceValidateService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/sample/service/SamplePermissionResourceValidateService.kt @@ -39,4 +39,11 @@ class SamplePermissionResourceValidateService : PermissionResourceValidateServic ): Map { return permissionBatchValidateDTO.actionList.associateWith { true } } + + override fun hasManagerPermission( + userId: String, + projectId: String, + resourceType: String, + resourceCode: String + ): Boolean = true } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/CentralizedStramPermissionServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/CentralizedStramPermissionServiceImpl.kt index 0adda249404..7d3705549cd 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/CentralizedStramPermissionServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/CentralizedStramPermissionServiceImpl.kt @@ -29,12 +29,17 @@ package com.tencent.devops.auth.provider.stream.service import com.tencent.devops.auth.utils.GitTypeUtils import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import com.tencent.devops.common.client.Client import org.springframework.beans.factory.annotation.Autowired class CentralizedStramPermissionServiceImpl @Autowired constructor( val client: Client ) : StreamPermissionServiceImpl() { + override fun getProjectUsers(projectCode: String, group: BkAuthGroup?): List { + return emptyList() + } + override fun isPublicProject(projectCode: String, userId: String?): Boolean { val gitType = GitTypeUtils.getType() // type: github, gitlab, svn, tgitd等 diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GithubStreamPermissionServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GithubStreamPermissionServiceImpl.kt index ebac1e08273..06bdf7aece0 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GithubStreamPermissionServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GithubStreamPermissionServiceImpl.kt @@ -29,6 +29,7 @@ package com.tencent.devops.auth.provider.stream.service import com.google.common.cache.CacheBuilder import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import com.tencent.devops.common.client.Client import com.tencent.devops.repository.api.github.ServiceGithubPermissionResource import com.tencent.devops.stream.api.service.ServiceStreamBasicSettingResource @@ -64,6 +65,10 @@ class GithubStreamPermissionServiceImpl @Autowired constructor( .expireAfterAccess(5, TimeUnit.MINUTES) .build() + override fun getProjectUsers(projectCode: String, group: BkAuthGroup?): List { + return emptyList() + } + override fun isPublicProject(projectCode: String, userId: String?): Boolean { if (publicProjectCache.getIfPresent(projectCode) != null) { return publicProjectCache.getIfPresent(projectCode)!! diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GitlabStreamPermissionServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GitlabStreamPermissionServiceImpl.kt index 0e619dd21f8..e9858dd8ffc 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GitlabStreamPermissionServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/GitlabStreamPermissionServiceImpl.kt @@ -28,9 +28,14 @@ package com.tencent.devops.auth.provider.stream.service import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import org.springframework.beans.factory.annotation.Autowired class GitlabStreamPermissionServiceImpl @Autowired constructor() : StreamPermissionServiceImpl() { + override fun getProjectUsers(projectCode: String, group: BkAuthGroup?): List { + return emptyList() + } + override fun isPublicProject(projectCode: String, userId: String?): Boolean { TODO("Not yet implemented") } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionProjectServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionProjectServiceImpl.kt index 56e0ed3e370..696894dcd42 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionProjectServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionProjectServiceImpl.kt @@ -38,8 +38,7 @@ class StreamPermissionProjectServiceImpl @Autowired constructor( private val streamPermissionService: StreamPermissionServiceImpl ) : PermissionProjectService { override fun getProjectUsers(projectCode: String, group: BkAuthGroup?): List { - // stream场景下使用不到此接口。占做默认实现 - return emptyList() + return streamPermissionService.getProjectUsers(projectCode, group) } override fun getProjectGroupAndUserList(projectCode: String): List { diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionServiceImpl.kt index 96d50afb4a9..f6c34e9e292 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/provider/stream/service/StreamPermissionServiceImpl.kt @@ -30,6 +30,7 @@ package com.tencent.devops.auth.provider.stream.service import com.tencent.devops.auth.service.iam.PermissionService import com.tencent.devops.common.auth.api.AuthPermission import com.tencent.devops.common.auth.api.pojo.AuthResourceInstance +import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import com.tencent.devops.common.auth.utils.ActionTypeUtils import org.slf4j.LoggerFactory @@ -191,6 +192,8 @@ abstract class StreamPermissionServiceImpl : PermissionService { return emptyMap() } + abstract fun getProjectUsers(projectCode: String, group: BkAuthGroup?): List + /** * 是否是开源项目 * projectCode: stream侧项目编码 diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthMigrateResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthMigrateResourceImpl.kt index ce52985b790..945d6c3c838 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthMigrateResourceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthMigrateResourceImpl.kt @@ -98,4 +98,16 @@ class OpAuthMigrateResourceImpl @Autowired constructor( permissionMigrateService.autoRenewal(projectConditionDTO) return Result(true) } + + override fun migrateResourceAuthorization(projectCodes: List): Result { + return Result(permissionMigrateService.migrateResourceAuthorization(projectCodes)) + } + + override fun migrateAllResourceAuthorization(): Result { + return Result(permissionMigrateService.migrateAllResourceAuthorization()) + } + + override fun fixResourceGroups(projectCodes: List): Result { + return Result(permissionMigrateService.fixResourceGroups(projectCodes)) + } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthResourceGroupSyncResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthResourceGroupSyncResourceImpl.kt new file mode 100644 index 00000000000..40cccbbb9ba --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/OpAuthResourceGroupSyncResourceImpl.kt @@ -0,0 +1,80 @@ +/* + * 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.auth.resources + +import com.tencent.devops.auth.api.sync.OpAuthResourceGroupSyncResource +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO +import com.tencent.devops.common.web.RestResource +import org.springframework.beans.factory.annotation.Autowired + +@RestResource +class OpAuthResourceGroupSyncResourceImpl @Autowired constructor( + private val permissionResourceGroupSyncService: PermissionResourceGroupSyncService +) : OpAuthResourceGroupSyncResource { + + override fun syncByCondition(projectConditionDTO: ProjectConditionDTO): Result { + permissionResourceGroupSyncService.syncByCondition(projectConditionDTO) + return Result(true) + } + + override fun batchSyncGroupAndMember(projectIds: List): Result { + permissionResourceGroupSyncService.batchSyncGroupAndMember(projectIds) + return Result(true) + } + + override fun batchSyncProjectGroup(projectIds: List): Result { + permissionResourceGroupSyncService.batchSyncProjectGroup(projectIds) + return Result(true) + } + + override fun batchSyncAllMember(projectIds: List): Result { + permissionResourceGroupSyncService.batchSyncAllMember(projectIds) + return Result(true) + } + + override fun syncResourceMember(projectId: String, resourceType: String, resourceCode: String): Result { + permissionResourceGroupSyncService.syncResourceMember( + projectCode = projectId, + resourceType = resourceType, + resourceCode = resourceCode + ) + return Result(true) + } + + override fun fixResourceGroupMember(projectId: String): Result { + permissionResourceGroupSyncService.fixResourceGroupMember(projectId) + return Result(true) + } + + override fun syncIamGroupMembersOfApply(): Result { + permissionResourceGroupSyncService.syncIamGroupMembersOfApply() + return Result(true) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthAuthorizationResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthAuthorizationResourceImpl.kt new file mode 100644 index 00000000000..a184fd8cf63 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthAuthorizationResourceImpl.kt @@ -0,0 +1,96 @@ +package com.tencent.devops.auth.resources + +import com.tencent.devops.auth.api.user.UserAuthAuthorizationResource +import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo +import com.tencent.devops.auth.service.PermissionAuthorizationService +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.BkManagerCheck +import com.tencent.devops.common.auth.api.pojo.ResetAllResourceAuthorizationReq +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.web.RestResource + +@RestResource +class UserAuthAuthorizationResourceImpl( + val permissionAuthorizationService: PermissionAuthorizationService +) : UserAuthAuthorizationResource { + @BkManagerCheck + override fun listResourceAuthorization( + userId: String, + projectId: String, + condition: ResourceAuthorizationConditionRequest + ): Result> { + return Result( + permissionAuthorizationService.listResourceAuthorizations( + condition = condition + ) + ) + } + + override fun getResourceAuthorization( + userId: String, + projectId: String, + resourceType: String, + resourceCode: String + ): Result { + return Result( + permissionAuthorizationService.getResourceAuthorization( + resourceType = resourceType, + projectCode = projectId, + resourceCode = resourceCode, + executePermissionCheck = true + ) + ) + } + + override fun checkAuthorizationWhenRemoveGroupMember( + userId: String, + projectId: String, + resourceType: String, + resourceCode: String, + memberId: String + ): Result { + return Result( + permissionAuthorizationService.checkAuthorizationWhenRemoveGroupMember( + userId = userId, + projectCode = projectId, + resourceType = resourceType, + resourceCode = resourceCode, + memberId = memberId + ) + ) + } + + override fun resetResourceAuthorization( + userId: String, + projectId: String, + condition: ResourceAuthorizationHandoverConditionRequest + ): Result>> { + return Result( + permissionAuthorizationService.resetResourceAuthorizationByResourceType( + operator = userId, + projectCode = projectId, + condition = condition + ) + ) + } + + @BkManagerCheck + override fun resetAllResourceAuthorization( + userId: String, + projectId: String, + condition: ResetAllResourceAuthorizationReq + ): Result> { + return Result( + permissionAuthorizationService.resetAllResourceAuthorization( + operator = userId, + projectCode = projectId, + condition = condition + ) + ) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupResourceImpl.kt index 1b56fa3fef1..43ed6851abe 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupResourceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupResourceImpl.kt @@ -28,13 +28,19 @@ package com.tencent.devops.auth.resources +import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum import com.tencent.devops.auth.api.user.UserAuthResourceGroupResource +import com.tencent.devops.auth.pojo.ResourceMemberInfo import com.tencent.devops.auth.pojo.dto.GroupMemberRenewalDTO import com.tencent.devops.auth.pojo.dto.RenameGroupDTO +import com.tencent.devops.auth.pojo.request.GroupMemberCommonConditionReq +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo import com.tencent.devops.auth.pojo.vo.IamGroupPoliciesVo import com.tencent.devops.auth.service.iam.PermissionResourceGroupService import com.tencent.devops.auth.service.iam.PermissionResourceMemberService +import com.tencent.devops.common.api.model.SQLPage import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.BkManagerCheck import com.tencent.devops.common.web.RestResource import org.springframework.beans.factory.annotation.Autowired @@ -59,6 +65,26 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor( ) } + @BkManagerCheck + override fun getMemberGroupsDetails( + userId: String, + projectId: String, + resourceType: String, + memberId: String, + start: Int, + limit: Int + ): Result> { + return Result( + permissionResourceMemberService.getMemberGroupsDetails( + projectId = projectId, + resourceType = resourceType, + memberId = memberId, + start = start, + limit = limit + ) + ) + } + override fun renewal( userId: String, projectId: String, @@ -84,15 +110,21 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor( groupId: Int ): Result { return Result( - permissionResourceMemberService.deleteGroupMember( + permissionResourceMemberService.batchDeleteResourceGroupMembers( userId = userId, projectCode = projectId, - resourceType = resourceType, - groupId = groupId + removeMemberDTO = GroupMemberCommonConditionReq( + groupIds = listOf(groupId), + targetMember = ResourceMemberInfo( + id = userId, + type = ManagerScopesEnum.getType(ManagerScopesEnum.USER) + ) + ) ) ) } + @BkManagerCheck override fun deleteGroup( userId: String, projectId: String, @@ -109,6 +141,7 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor( ) } + @BkManagerCheck override fun rename( userId: String, projectId: String, diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserDeptResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupSyncResourceImpl.kt similarity index 57% rename from src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserDeptResourceImpl.kt rename to src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupSyncResourceImpl.kt index 701d2e8bfaf..b7f6aa8ad3c 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserDeptResourceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceGroupSyncResourceImpl.kt @@ -27,42 +27,31 @@ package com.tencent.devops.auth.resources -import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum -import com.tencent.devops.auth.api.user.UserDeptResource -import com.tencent.devops.auth.pojo.vo.DeptInfoVo -import com.tencent.devops.auth.pojo.vo.UserAndDeptInfoVo -import com.tencent.devops.auth.service.DeptService +import com.tencent.devops.auth.api.user.UserAuthResourceGroupSyncResource +import com.tencent.devops.auth.pojo.enum.AuthMigrateStatus +import com.tencent.devops.auth.service.iam.PermissionResourceGroupSyncService import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.web.RestResource import org.springframework.beans.factory.annotation.Autowired @RestResource -class UserDeptResourceImpl @Autowired constructor( - val deptService: DeptService -) : UserDeptResource { - override fun getDeptByLevel(userId: String, accessToken: String?, level: Int): Result { - return Result(deptService.getDeptByLevel(level, accessToken, userId)) - } +class UserAuthResourceGroupSyncResourceImpl @Autowired constructor( + private val permissionResourceGroupSyncService: PermissionResourceGroupSyncService +) : UserAuthResourceGroupSyncResource { - override fun getDeptByParent( - userId: String, - accessToken: String?, - parentId: Int, - pageSize: Int? - ): Result { - return Result(deptService.getDeptByParent(parentId, accessToken, userId, pageSize)) + override fun syncGroupAndMember(userId: String, projectId: String): Result { + permissionResourceGroupSyncService.syncGroupAndMember(projectId) + return Result(true) } - override fun getUserAndDeptByName( - userId: String, - accessToken: String?, - name: String, - type: ManagerScopesEnum - ): Result> { - return Result(deptService.getUserAndDeptByName(name, accessToken, userId, type)) + override fun syncGroupMember(userId: String, projectId: String, groupId: Int): Result { + permissionResourceGroupSyncService.syncIamGroupMember(projectCode = projectId, iamGroupId = groupId) + return Result(true) } - override fun getDeptUsers(userId: String, accessToken: String?, deptId: Int): Result?> { - return Result(deptService.getDeptUser(deptId, accessToken)) + override fun getStatusOfSync(userId: String, projectId: String): Result { + return Result( + permissionResourceGroupSyncService.getStatusOfSync(projectCode = projectId) + ) } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceMemberResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceMemberResourceImpl.kt new file mode 100644 index 00000000000..47912b3d569 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceMemberResourceImpl.kt @@ -0,0 +1,168 @@ +package com.tencent.devops.auth.resources + +import com.tencent.devops.auth.api.user.UserAuthResourceMemberResource +import com.tencent.devops.auth.pojo.ResourceMemberInfo +import com.tencent.devops.auth.pojo.enum.BatchOperateType +import com.tencent.devops.auth.pojo.request.GroupMemberCommonConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberHandoverConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberRenewalConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberSingleRenewalReq +import com.tencent.devops.auth.pojo.request.RemoveMemberFromProjectReq +import com.tencent.devops.auth.pojo.vo.BatchOperateGroupMemberCheckVo +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo +import com.tencent.devops.auth.pojo.vo.MemberGroupCountWithPermissionsVo +import com.tencent.devops.auth.service.iam.PermissionResourceMemberService +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.BkManagerCheck +import com.tencent.devops.common.web.RestResource + +@RestResource +class UserAuthResourceMemberResourceImpl( + private val permissionResourceMemberService: PermissionResourceMemberService +) : UserAuthResourceMemberResource { + @BkManagerCheck + override fun listProjectMembers( + userId: String, + projectId: String, + memberType: String?, + userName: String?, + deptName: String?, + departedFlag: Boolean?, + page: Int, + pageSize: Int + ): Result> { + return Result( + permissionResourceMemberService.listProjectMembers( + projectCode = projectId, + memberType = memberType, + userName = userName, + deptName = deptName, + departedFlag = departedFlag ?: false, + page = page, + pageSize = pageSize + ) + ) + } + + @BkManagerCheck + override fun renewalGroupMember( + userId: String, + projectId: String, + renewalConditionReq: GroupMemberSingleRenewalReq + ): Result { + return Result( + permissionResourceMemberService.renewalGroupMember( + userId = userId, + projectCode = projectId, + renewalConditionReq = renewalConditionReq + ) + ) + } + + @BkManagerCheck + override fun batchRenewalGroupMembers( + userId: String, + projectId: String, + renewalConditionReq: GroupMemberRenewalConditionReq + ): Result { + return Result( + permissionResourceMemberService.batchRenewalGroupMembers( + userId = userId, + projectCode = projectId, + renewalConditionReq = renewalConditionReq + ) + ) + } + + @BkManagerCheck + override fun batchRemoveGroupMembers( + userId: String, + projectId: String, + removeMemberDTO: GroupMemberCommonConditionReq + ): Result { + return Result( + permissionResourceMemberService.batchDeleteResourceGroupMembers( + userId = userId, + projectCode = projectId, + removeMemberDTO = removeMemberDTO + ) + ) + } + + @BkManagerCheck + override fun batchHandoverGroupMembers( + userId: String, + projectId: String, + handoverMemberDTO: GroupMemberHandoverConditionReq + ): Result { + return Result( + permissionResourceMemberService.batchHandoverGroupMembers( + userId = userId, + projectCode = projectId, + handoverMemberDTO = handoverMemberDTO + ) + ) + } + + @BkManagerCheck + override fun batchOperateGroupMembersCheck( + userId: String, + projectId: String, + batchOperateType: BatchOperateType, + conditionReq: GroupMemberCommonConditionReq + ): Result { + return Result( + permissionResourceMemberService.batchOperateGroupMembersCheck( + userId = userId, + projectCode = projectId, + batchOperateType = batchOperateType, + conditionReq = conditionReq + ) + ) + } + + @BkManagerCheck + override fun removeMemberFromProject( + userId: String, + projectId: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): Result> { + return Result( + permissionResourceMemberService.removeMemberFromProject( + userId = userId, + projectCode = projectId, + removeMemberFromProjectReq = removeMemberFromProjectReq + ) + ) + } + + @BkManagerCheck + override fun removeMemberFromProjectCheck( + userId: String, + projectId: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): Result { + return Result( + permissionResourceMemberService.removeMemberFromProjectCheck( + userId = userId, + projectCode = projectId, + removeMemberFromProjectReq = removeMemberFromProjectReq + ) + ) + } + + @BkManagerCheck + override fun getMemberGroupCount( + userId: String, + projectId: String, + memberId: String + ): Result> { + return Result( + permissionResourceMemberService.getMemberGroupsCount( + projectCode = projectId, + memberId = memberId + ) + ) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceResourceImpl.kt index 00884871858..5ee46656fe5 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceResourceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserAuthResourceResourceImpl.kt @@ -30,10 +30,12 @@ package com.tencent.devops.auth.resources import com.tencent.devops.auth.api.user.UserAuthResourceResource import com.tencent.devops.auth.pojo.AuthResourceInfo +import com.tencent.devops.auth.pojo.dto.ListGroupConditionDTO import com.tencent.devops.auth.pojo.vo.IamGroupInfoVo import com.tencent.devops.auth.pojo.vo.IamGroupMemberInfoVo import com.tencent.devops.auth.service.iam.PermissionResourceGroupService import com.tencent.devops.auth.service.iam.PermissionResourceService +import com.tencent.devops.auth.service.iam.PermissionResourceValidateService import com.tencent.devops.common.api.pojo.Pagination import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.web.RestResource @@ -42,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired @RestResource class UserAuthResourceResourceImpl @Autowired constructor( private val permissionResourceService: PermissionResourceService, + private val permissionResourceValidateService: PermissionResourceValidateService, private val permissionResourceGroupService: PermissionResourceGroupService ) : UserAuthResourceResource { override fun hasManagerPermission( @@ -51,7 +54,7 @@ class UserAuthResourceResourceImpl @Autowired constructor( resourceCode: String ): Result { return Result( - permissionResourceService.hasManagerPermission( + permissionResourceValidateService.hasManagerPermission( userId = userId, projectId = projectId, resourceType = resourceType, @@ -81,16 +84,21 @@ class UserAuthResourceResourceImpl @Autowired constructor( projectId: String, resourceType: String, resourceCode: String, + allProjectMembersGroupFlag: Boolean?, page: Int, pageSize: Int ): Result> { return Result( permissionResourceGroupService.listGroup( - projectId = projectId, - resourceType = resourceType, - resourceCode = resourceCode, - page = page, - pageSize = pageSize + userId = userId, + ListGroupConditionDTO( + projectId = projectId, + resourceType = resourceType, + resourceCode = resourceCode, + getAllProjectMembersGroup = allProjectMembersGroupFlag ?: true, + page = page, + pageSize = pageSize + ) ) ) } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/service/ServiceAuthAuthorizationResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/service/ServiceAuthAuthorizationResourceImpl.kt new file mode 100644 index 00000000000..16ffdbd9801 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/service/ServiceAuthAuthorizationResourceImpl.kt @@ -0,0 +1,63 @@ +package com.tencent.devops.auth.resources.service + +import com.tencent.devops.auth.api.service.ServiceAuthAuthorizationResource +import com.tencent.devops.auth.service.PermissionAuthorizationService +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import com.tencent.devops.common.web.RestResource + +@RestResource +class ServiceAuthAuthorizationResourceImpl constructor( + val permissionAuthorizationService: PermissionAuthorizationService +) : ServiceAuthAuthorizationResource { + override fun addResourceAuthorization( + projectId: String, + resourceAuthorizationList: List + ): Result { + return Result( + permissionAuthorizationService.addResourceAuthorization( + resourceAuthorizationList = resourceAuthorizationList + ) + ) + } + + override fun getResourceAuthorization( + projectId: String, + resourceType: String, + resourceCode: String + ): Result { + return Result( + permissionAuthorizationService.getResourceAuthorization( + projectCode = projectId, + resourceType = resourceType, + resourceCode = resourceCode + ) + ) + } + + override fun listResourceAuthorization( + projectId: String, + condition: ResourceAuthorizationConditionRequest + ): Result> { + return Result( + permissionAuthorizationService.listResourceAuthorizations( + condition = condition + ) + ) + } + + override fun batchModifyHandoverFrom( + projectId: String, + resourceAuthorizationHandoverList: List + ): Result { + return Result( + permissionAuthorizationService.batchModifyHandoverFrom( + resourceAuthorizationHandoverList = resourceAuthorizationHandoverList + ) + ) + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthDeptServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthDeptServiceImpl.kt index 80e2c8360e3..bedb4278b84 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthDeptServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthDeptServiceImpl.kt @@ -33,39 +33,47 @@ import com.fasterxml.jackson.module.kotlin.readValue import com.google.common.cache.CacheBuilder import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum import com.tencent.bk.sdk.iam.dto.response.ResponseDTO +import com.tencent.devops.auth.common.Constants.DEPT_LABEL import com.tencent.devops.auth.common.Constants.HTTP_RESULT +import com.tencent.devops.auth.common.Constants.ID import com.tencent.devops.auth.common.Constants.LEVEL import com.tencent.devops.auth.common.Constants.NAME import com.tencent.devops.auth.common.Constants.PARENT import com.tencent.devops.auth.common.Constants.USERNAME -import com.tencent.devops.auth.common.Constants.USER_LABLE +import com.tencent.devops.auth.common.Constants.USER_LABEL +import com.tencent.devops.auth.common.Constants.USER_NAME_AND_DISPLAY_NAME_LABEL import com.tencent.devops.auth.constant.AuthMessageCode import com.tencent.devops.auth.entity.SearchDeptUserEntity import com.tencent.devops.auth.entity.SearchProfileDeptEntity import com.tencent.devops.auth.entity.SearchRetrieveDeptEntity import com.tencent.devops.auth.entity.SearchUserAndDeptEntity import com.tencent.devops.auth.entity.UserDeptTreeInfo +import com.tencent.devops.auth.pojo.BkUserDeptInfo +import com.tencent.devops.auth.pojo.BkUserInfo +import com.tencent.devops.auth.pojo.DeptInfo import com.tencent.devops.auth.pojo.vo.BkUserInfoVo import com.tencent.devops.auth.pojo.vo.DeptInfoVo import com.tencent.devops.auth.pojo.vo.UserAndDeptInfoVo +import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.exception.OperationException import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.OkhttpUtils import com.tencent.devops.common.auth.api.pojo.EsbBaseReq import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.web.utils.I18nUtil +import okhttp3.Headers.Companion.toHeaders import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.RequestBody import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value -import java.util.Optional +import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.TimeUnit class AuthDeptServiceImpl @Autowired constructor( - val redisOperation: RedisOperation, - val objectMapper: ObjectMapper + private val redisOperation: RedisOperation, + private val objectMapper: ObjectMapper ) : DeptService { @Value("\${esb.code:#{null}}") @@ -90,7 +98,15 @@ class AuthDeptServiceImpl @Autowired constructor( private val userInfoCache = CacheBuilder.newBuilder() .maximumSize(10000) .expireAfterWrite(24, TimeUnit.HOURS) - .build>() + .build() + + private val memberInfoCache = CacheBuilder.newBuilder() + .maximumSize(10000) + .expireAfterWrite(24, TimeUnit.HOURS) + .build() + + // 已离职成员 + private val departedMembersCache = CopyOnWriteArrayList() override fun getDeptByLevel(level: Int, accessToken: String?, userId: String): DeptInfoVo { val search = SearchUserAndDeptEntity( @@ -141,7 +157,7 @@ class AuthDeptServiceImpl @Autowired constructor( bk_app_code = appCode, bk_app_secret = appSecret, bk_username = userId, - fields = USER_LABLE, + fields = USER_LABEL, lookupField = USERNAME, accessToken = accessToken ) @@ -160,51 +176,27 @@ class AuthDeptServiceImpl @Autowired constructor( val userInfos = getUserInfo(userSearch) userInfos.results.forEach { userAndDeptInfos.add( - UserAndDeptInfoVo( - id = it.id, - name = it.username, - type = ManagerScopesEnum.USER, - deptInfo = it.departments, - extras = it.extras - ) + it.toUserAndDeptInfoVo() ) } } ManagerScopesEnum.DEPARTMENT -> { - val depteInfos = getDeptInfo(deptSearch) - depteInfos.results.forEach { - userAndDeptInfos.add( - UserAndDeptInfoVo( - id = it.id, - name = it.name, - type = ManagerScopesEnum.DEPARTMENT, - hasChild = it.hasChildren - ) - ) + val deptInfos = getDeptInfo(deptSearch) + deptInfos.results.forEach { + it.toUserAndDeptInfoVo() } } ManagerScopesEnum.ALL -> { val userInfos = getUserInfo(userSearch) userInfos.results.forEach { userAndDeptInfos.add( - UserAndDeptInfoVo( - id = it.id, - name = it.username, - type = ManagerScopesEnum.USER, - deptInfo = it.departments, - extras = it.extras - ) + it.toUserAndDeptInfoVo() ) } val deptInfos = getDeptInfo(deptSearch) deptInfos.results.forEach { userAndDeptInfos.add( - UserAndDeptInfoVo( - id = it.id, - name = it.name, - type = ManagerScopesEnum.DEPARTMENT, - hasChild = it.hasChildren - ) + it.toUserAndDeptInfoVo() ) } } @@ -250,6 +242,8 @@ class AuthDeptServiceImpl @Autowired constructor( } override fun getUserDeptInfo(userId: String): Set { + if (userId.endsWith("@tai")) + return emptySet() if (userDeptCache.getIfPresent(userId) != null) { return userDeptCache.getIfPresent(userId)!! } @@ -260,17 +254,138 @@ class AuthDeptServiceImpl @Autowired constructor( } override fun getUserInfo(userId: String, name: String): UserAndDeptInfoVo? { - return userInfoCache.getIfPresent(name)?.get() ?: getUserAndPutInCache(userId, name) + return userInfoCache.getIfPresent(name) ?: getUserAndPutInCache(userId, name) + } + + override fun getMemberInfo( + memberId: String, + memberType: ManagerScopesEnum + ): UserAndDeptInfoVo { + return listMemberInfos( + memberIds = listOf(memberId), + memberType = memberType + ).firstOrNull() ?: throw ErrorCodeException( + errorCode = AuthMessageCode.USER_NOT_EXIST, + params = arrayOf(memberId), + defaultMessage = "member $memberId not exist" + ) + } + + override fun listMemberInfos( + memberIds: List, + memberType: ManagerScopesEnum + ): List { + val cacheResult = memberInfoCache.getAllPresent(memberIds) + val membersNotInCache = memberIds.filterNot { cacheResult.containsKey(it) || departedMembersCache.contains(it) } + + if (membersNotInCache.isNotEmpty()) { + val fetchedMembers = fetchMemberInfos(membersNotInCache, memberType) + fetchedMembers.forEach { memberInfoCache.put(it.name, it) } + + if (memberType == ManagerScopesEnum.USER) { + val departedMembers = membersNotInCache.subtract(fetchedMembers.map { it.name }.toSet()) + if (departedMembers.isNotEmpty()) { + departedMembersCache.addAll(departedMembers) + } + } + } + return memberInfoCache.getAllPresent(memberIds).values.toList() + } + + override fun listDepartedMembers(memberIds: List): List { + val activeMembers = listMemberInfos( + memberIds = memberIds, + memberType = ManagerScopesEnum.USER + ).map { it.name } + return memberIds.subtract(activeMembers.toSet()).toList() + } + + override fun isUserDeparted(userId: String): Boolean { + return if (departedMembersCache.contains(userId)) { + true + } else { + listMemberInfos( + memberIds = listOf(userId), + memberType = ManagerScopesEnum.USER + ).isEmpty() + } } - private fun getUserAndPutInCache(userId: String, name: String): UserAndDeptInfoVo? { + private fun fetchMemberInfos( + memberIds: List, + memberType: ManagerScopesEnum + ): List { + val memberInfos = when (memberType) { + ManagerScopesEnum.USER -> { + val userSearch = SearchUserAndDeptEntity( + bk_app_code = appCode!!, + bk_app_secret = appSecret!!, + bk_username = "admin", + fields = USER_NAME_AND_DISPLAY_NAME_LABEL, + lookupField = USERNAME, + exactLookups = memberIds.joinToString(",") + ) + getUserInfo(userSearch).results.map { it.toUserAndDeptInfoVo() } + } + ManagerScopesEnum.DEPARTMENT -> { + val deptSearch = SearchUserAndDeptEntity( + bk_app_code = appCode!!, + bk_app_secret = appSecret!!, + bk_username = "admin", + fields = DEPT_LABEL, + lookupField = ID, + exactLookups = memberIds.joinToString(",") + ) + getDeptInfo(deptSearch).results.map { it.toUserAndDeptInfoVo() } + } + else -> emptyList() + } + return memberInfos + } + + private fun BkUserInfo.toUserAndDeptInfoVo(): UserAndDeptInfoVo { + val department = this.departments?.firstOrNull() + return UserAndDeptInfoVo( + id = this.id, + name = this.userName, + displayName = this.displayName, + type = ManagerScopesEnum.USER, + deptInfo = if (department == null) { + emptyList() + } else { + department.fullName?.split("/")?.map { + BkUserDeptInfo( + id = null, + name = it, + fullName = it + ) + } ?: emptyList() + }, + extras = this.extras + ) + } + + private fun DeptInfo.toUserAndDeptInfoVo(): UserAndDeptInfoVo { + return UserAndDeptInfoVo( + id = this.id, + displayName = this.name, + name = this.name, + type = ManagerScopesEnum.DEPARTMENT, + hasChild = this.hasChildren + ) + } + + private fun getUserAndPutInCache( + userId: String, + name: String + ): UserAndDeptInfoVo? { return getUserAndDeptByName( name = name, accessToken = null, userId = userId, type = ManagerScopesEnum.USER, exactLookups = true - ).firstOrNull().also { if (it != null) userInfoCache.put(name, Optional.of(it)) } + ).firstOrNull().also { if (it != null) userInfoCache.put(name, it) } } private fun getUserDeptFamily(userId: String): String { @@ -313,6 +428,7 @@ class AuthDeptServiceImpl @Autowired constructor( val mediaType = "application/json; charset=utf-8".toMediaTypeOrNull() val requestBody = RequestBody.create(mediaType, content) val request = Request.Builder().url(url) + .headers(searchEntity.toMap().toHeaders()) .post(requestBody) .build() OkhttpUtils.doHttp(request).use { diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DefaultDeptServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DefaultDeptServiceImpl.kt index df5bb01fddd..fe4f695ab78 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DefaultDeptServiceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DefaultDeptServiceImpl.kt @@ -71,6 +71,26 @@ class DefaultDeptServiceImpl : DeptService { UserAndDeptInfoVo( id = 0, name = name, + displayName = name, type = ManagerScopesEnum.USER ) + + override fun getMemberInfo( + memberId: String, + memberType: ManagerScopesEnum + ): UserAndDeptInfoVo = UserAndDeptInfoVo( + id = 0, + name = memberId, + displayName = memberId, + type = memberType + ) + + override fun listMemberInfos( + memberIds: List, + memberType: ManagerScopesEnum + ): List = emptyList() + + override fun listDepartedMembers(memberIds: List): List = emptyList() + + override fun isUserDeparted(userId: String): Boolean = false } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DeptService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DeptService.kt index ac49979a436..523baada313 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DeptService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/DeptService.kt @@ -55,4 +55,23 @@ interface DeptService { // 获取单个用户信息 fun getUserInfo(userId: String, name: String): UserAndDeptInfoVo? + + // 获取成员信息 + fun getMemberInfo( + memberId: String, + memberType: ManagerScopesEnum + ): UserAndDeptInfoVo + + // 获取成员信息 + fun listMemberInfos( + memberIds: List, + memberType: ManagerScopesEnum + ): List + + // 传入成员名单，筛选出其中离职的成员 + fun listDepartedMembers( + memberIds: List + ): List + + fun isUserDeparted(userId: String): Boolean } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/PermissionAuthorizationService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/PermissionAuthorizationService.kt new file mode 100644 index 00000000000..301dd66bea8 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/PermissionAuthorizationService.kt @@ -0,0 +1,132 @@ +/* + * 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.auth.service + +import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.auth.api.pojo.ResetAllResourceAuthorizationReq +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus + +interface PermissionAuthorizationService { + /** + * 增加资源授权管理 + */ + fun addResourceAuthorization( + resourceAuthorizationList: List + ): Boolean + + /** + * 迁移资源授权管理 + */ + fun migrateResourceAuthorization( + resourceAuthorizationList: List + ): Boolean + + /** + * 获取资源授权记录 + */ + fun getResourceAuthorization( + projectCode: String, + resourceType: String, + resourceCode: String, + executePermissionCheck: Boolean = false + ): ResourceAuthorizationResponse + + /** + * 当移出用户组时做授权检查 + */ + fun checkAuthorizationWhenRemoveGroupMember( + userId: String, + projectCode: String, + resourceType: String, + resourceCode: String, + memberId: String + ): Boolean + + /** + * 获取项目资源授予记录--根据条件 + */ + fun listResourceAuthorizations( + condition: ResourceAuthorizationConditionRequest + ): SQLPage + + /** + * 修改资源授权管理 + */ + fun modifyResourceAuthorization( + resourceAuthorizationList: List + ): Boolean + + /** + * 删除资源授权管理 + */ + fun deleteResourceAuthorization( + projectCode: String, + resourceType: String, + resourceCode: String + ): Boolean + + /** + * 修复迁移产生的脏数据 + */ + fun fixResourceAuthorization( + projectCode: String, + resourceType: String, + resourceAuthorizationIds: List + ): Boolean + + /** + * 批量重置授权人 + */ + fun batchModifyHandoverFrom( + resourceAuthorizationHandoverList: List + ): Boolean + + /** + * 批量重置授权人--根据资源类型 + */ + fun resetResourceAuthorizationByResourceType( + operator: String, + projectCode: String, + condition: ResourceAuthorizationHandoverConditionRequest + ): Map> + + /** + * 批量重置授权人--项目下全量 + */ + fun resetAllResourceAuthorization( + operator: String, + projectCode: String, + condition: ResetAllResourceAuthorizationReq + ): List +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/PermissionAuthorizationServiceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/PermissionAuthorizationServiceImpl.kt new file mode 100644 index 00000000000..dac016a70d2 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/PermissionAuthorizationServiceImpl.kt @@ -0,0 +1,374 @@ +package com.tencent.devops.auth.service + +import com.tencent.bk.sdk.iam.constants.ManagerScopesEnum +import com.tencent.devops.auth.constant.AuthI18nConstants +import com.tencent.devops.auth.constant.AuthMessageCode +import com.tencent.devops.auth.dao.AuthAuthorizationDao +import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo +import com.tencent.devops.auth.service.iam.PermissionResourceValidateService +import com.tencent.devops.auth.service.iam.PermissionService +import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.api.model.SQLPage +import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.api.pojo.ResetAllResourceAuthorizationReq +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverConditionRequest +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import com.tencent.devops.common.auth.enums.HandoverChannelCode +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.auth.rbac.utils.RbacAuthUtils +import com.tencent.devops.common.client.Client +import com.tencent.devops.common.web.utils.I18nUtil +import com.tencent.devops.environment.api.ServiceEnvNodeAuthorizationResource +import com.tencent.devops.process.api.service.ServicePipelineAuthorizationResource +import com.tencent.devops.repository.api.ServiceRepositoryAuthorizationResource +import org.jooq.DSLContext +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Service + +@Service +class PermissionAuthorizationServiceImpl constructor( + private val dslContext: DSLContext, + private val authAuthorizationDao: AuthAuthorizationDao, + private val client: Client, + private val permissionResourceValidateService: PermissionResourceValidateService, + private val deptService: DeptService, + private val permissionService: PermissionService +) : PermissionAuthorizationService { + companion object { + private val logger = LoggerFactory.getLogger(PermissionAuthorizationServiceImpl::class.java) + private val needToHandoverResourceTypes = listOf( + AuthResourceType.PIPELINE_DEFAULT.value, + AuthResourceType.ENVIRONMENT_ENV_NODE.value, + AuthResourceType.CODE_REPERTORY.value + ) + } + + override fun addResourceAuthorization(resourceAuthorizationList: List): Boolean { + logger.info("add resource authorization:$resourceAuthorizationList") + addHandoverFromCnName(resourceAuthorizationList) + authAuthorizationDao.batchAdd( + dslContext = dslContext, + resourceAuthorizationList = resourceAuthorizationList + ) + return true + } + + override fun migrateResourceAuthorization(resourceAuthorizationList: List): Boolean { + logger.info("migrate resource authorization:$resourceAuthorizationList") + addHandoverFromCnName(resourceAuthorizationList) + authAuthorizationDao.migrate( + dslContext = dslContext, + resourceAuthorizationList = resourceAuthorizationList + ) + return true + } + + override fun getResourceAuthorization( + projectCode: String, + resourceType: String, + resourceCode: String, + executePermissionCheck: Boolean + ): ResourceAuthorizationResponse { + logger.info("get resource authorization:$projectCode|$resourceType|$resourceCode") + val record = authAuthorizationDao.get( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode + ) ?: throw ErrorCodeException( + errorCode = AuthMessageCode.ERROR_RESOURCE_AUTHORIZATION_NOT_FOUND + ) + // 流水线代持人可能会因为被移出用户组，导致失去执行权限。 + if (executePermissionCheck && resourceType == AuthResourceType.PIPELINE_DEFAULT.value) { + val action = RbacAuthUtils.buildAction( + authResourceType = AuthResourceType.PIPELINE_DEFAULT, + authPermission = AuthPermission.EXECUTE + ) + val isHandoverFromHasExecutePermission = permissionService.validateUserResourcePermissionByRelation( + userId = record.handoverFrom, + action = action, + projectCode = projectCode, + resourceCode = resourceCode, + resourceType = resourceType, + relationResourceType = null + ) + return record.copy(executePermission = isHandoverFromHasExecutePermission) + } + return record + } + + override fun checkAuthorizationWhenRemoveGroupMember( + userId: String, + projectCode: String, + resourceType: String, + resourceCode: String, + memberId: String + ): Boolean { + if (resourceType == AuthResourceType.PIPELINE_DEFAULT.value) { + val record = getResourceAuthorization( + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode, + executePermissionCheck = true + ) + return memberId == record.handoverFrom && !record.executePermission!! + } + return true + } + + override fun listResourceAuthorizations( + condition: ResourceAuthorizationConditionRequest + ): SQLPage { + logger.info("list resource authorizations:$condition") + val record = authAuthorizationDao.list( + dslContext = dslContext, + condition = condition + ) + val count = authAuthorizationDao.count( + dslContext = dslContext, + condition = condition + ) + return SQLPage( + count = count.toLong(), + records = record + ) + } + + override fun modifyResourceAuthorization(resourceAuthorizationList: List): Boolean { + logger.info("modify resource authorizations:$resourceAuthorizationList") + addHandoverFromCnName(resourceAuthorizationList) + authAuthorizationDao.batchUpdate( + dslContext = dslContext, + resourceAuthorizationHandoverList = resourceAuthorizationList + ) + return true + } + + override fun deleteResourceAuthorization( + projectCode: String, + resourceType: String, + resourceCode: String + ): Boolean { + logger.info("delete resource authorizations:$projectCode|$resourceType|$resourceCode") + authAuthorizationDao.delete( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + resourceCode = resourceCode + ) + return true + } + + override fun fixResourceAuthorization( + projectCode: String, + resourceType: String, + resourceAuthorizationIds: List + ): Boolean { + logger.info("fix resource authorizations:$projectCode|$resourceType|$resourceAuthorizationIds") + authAuthorizationDao.delete( + dslContext = dslContext, + projectCode = projectCode, + resourceType = resourceType, + resourceCodes = resourceAuthorizationIds + ) + return true + } + + override fun batchModifyHandoverFrom( + resourceAuthorizationHandoverList: List + ): Boolean { + logger.info("batch modify handoverFrom:$resourceAuthorizationHandoverList") + addHandoverToCnName(resourceAuthorizationHandoverList) + authAuthorizationDao.batchUpdate( + dslContext = dslContext, + resourceAuthorizationHandoverList = resourceAuthorizationHandoverList + ) + return true + } + + override fun resetResourceAuthorizationByResourceType( + operator: String, + projectCode: String, + condition: ResourceAuthorizationHandoverConditionRequest + ): Map> { + logger.info("user reset resource authorization|$operator|$projectCode|$condition") + val result = mutableMapOf>() + if (condition.checkPermission) { + validateOperatorPermission( + operator = operator, + condition = condition + ) + } + val resourceAuthorizationList = getResourceAuthorizationList(condition = condition) + val handoverResult2Records = handoverResourceAuthorizations( + projectId = projectCode, + preCheck = condition.preCheck, + resourceType = condition.resourceType, + resourceAuthorizationHandoverDTOs = resourceAuthorizationList + ) ?: return emptyMap() + + val successList = handoverResult2Records[ResourceAuthorizationHandoverStatus.SUCCESS] + val failedList = handoverResult2Records[ResourceAuthorizationHandoverStatus.FAILED] + + if (!successList.isNullOrEmpty() && !condition.preCheck) { + logger.info("batch modify handover from|$successList") + batchModifyHandoverFrom( + resourceAuthorizationHandoverList = successList + ) + } + if (!failedList.isNullOrEmpty()) { + result[ResourceAuthorizationHandoverStatus.FAILED] = failedList + } + return result + } + + override fun resetAllResourceAuthorization( + operator: String, + projectCode: String, + condition: ResetAllResourceAuthorizationReq + ): List { + val result = mutableListOf() + needToHandoverResourceTypes.map { resourceType -> + val handoverResult = resetResourceAuthorizationByResourceType( + operator = operator, + projectCode = projectCode, + condition = ResourceAuthorizationHandoverConditionRequest( + projectCode = projectCode, + resourceType = resourceType, + handoverFrom = condition.handoverFrom, + fullSelection = true, + preCheck = condition.preCheck, + handoverChannel = HandoverChannelCode.MANAGER, + handoverTo = condition.handoverTo, + checkPermission = condition.checkPermission + ) + ) + if (!handoverResult[ResourceAuthorizationHandoverStatus.FAILED].isNullOrEmpty()) { + result.add( + ResourceTypeInfoVo( + resourceType = resourceType, + name = I18nUtil.getCodeLanMessage( + messageCode = resourceType + AuthI18nConstants.RESOURCE_TYPE_NAME_SUFFIX + ) + ) + ) + } + } + return result + } + + private fun addHandoverFromCnName( + resourceAuthorizationList: List + ) { + val handoverFromList = resourceAuthorizationList.map { it.handoverFrom ?: "" }.distinct() + val userId2UserInfo = deptService.listMemberInfos( + memberIds = handoverFromList, + memberType = ManagerScopesEnum.USER + ).associateBy { it.name } + resourceAuthorizationList.forEach { + val handoverFrom = it.handoverFrom ?: "" + it.copyHandoverFromCnName( + handoverFromCnName = userId2UserInfo[handoverFrom]?.displayName ?: handoverFrom + ) + } + } + + private fun addHandoverToCnName( + resourceAuthorizationList: List + ) { + val handoverToList = resourceAuthorizationList.map { it.handoverTo ?: "" }.distinct() + val userId2UserInfo = deptService.listMemberInfos( + memberIds = handoverToList, + memberType = ManagerScopesEnum.USER + ).associateBy { it.name } + resourceAuthorizationList.forEach { + val handoverTo = it.handoverTo ?: "" + it.copyHandoverToCnName( + handoverToCnName = userId2UserInfo[handoverTo]?.displayName ?: handoverTo + ) + } + } + + private fun validateOperatorPermission( + operator: String, + condition: ResourceAuthorizationHandoverConditionRequest + ) { + // 若是在授权管理界面操作，则只要校验操作人是否为管理员即可 + if (condition.handoverChannel == HandoverChannelCode.MANAGER) { + permissionResourceValidateService.hasManagerPermission( + userId = operator, + projectId = condition.projectCode, + resourceType = AuthResourceType.PROJECT.value, + resourceCode = condition.projectCode + ) + } else { + val record = condition.resourceAuthorizationHandoverList.first() + permissionResourceValidateService.hasManagerPermission( + userId = operator, + projectId = record.projectCode, + resourceType = record.resourceType, + record.resourceCode + ) + } + } + + private fun getResourceAuthorizationList( + condition: ResourceAuthorizationHandoverConditionRequest + ): List { + return if (condition.fullSelection) { + listResourceAuthorizations( + condition = condition + ).records.map { + ResourceAuthorizationHandoverDTO( + projectCode = it.projectCode, + resourceType = it.resourceType, + resourceName = it.resourceName, + resourceCode = it.resourceCode, + handoverFrom = it.handoverFrom, + handoverTime = it.handoverTime, + handoverTo = condition.handoverTo + ) + } + } else { + condition.resourceAuthorizationHandoverList + } + } + + private fun handoverResourceAuthorizations( + projectId: String, + preCheck: Boolean, + resourceType: String, + resourceAuthorizationHandoverDTOs: List + ): Map>? { + return when (resourceType) { + AuthResourceType.PIPELINE_DEFAULT.value -> { + client.get(ServicePipelineAuthorizationResource::class).resetPipelineAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs + ).data + } + AuthResourceType.CODE_REPERTORY.value -> { + client.get(ServiceRepositoryAuthorizationResource::class).resetRepositoryAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs + ).data + } + AuthResourceType.ENVIRONMENT_ENV_NODE.value -> { + client.get(ServiceEnvNodeAuthorizationResource::class).resetEnvNodeAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs + ).data + } + else -> { + null + } + } + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/ResourceService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/ResourceService.kt index 74e9726d997..627f7a79909 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/ResourceService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/ResourceService.kt @@ -39,6 +39,7 @@ import com.tencent.devops.auth.constant.AuthMessageCode import com.tencent.devops.common.api.exception.ParamBlankException import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.auth.callback.AuthConstants.KEYWORD_MIN_SIZE +import com.tencent.devops.common.auth.callback.ListResourcesAuthorizationDTO import com.tencent.devops.common.auth.callback.SearchInstanceInfo import com.tencent.devops.common.web.utils.I18nUtil import org.slf4j.LoggerFactory @@ -120,11 +121,13 @@ class ResourceService @Autowired constructor( return true } + @Suppress("MaxLineLength") private fun buildResult(method: CallbackMethodEnum, response: String): CallbackBaseResponseDTO1 { return when (method) { CallbackMethodEnum.SEARCH_INSTANCE -> objectMapper.readValue(response) CallbackMethodEnum.FETCH_INSTANCE_INFO -> objectMapper.readValue(response) CallbackMethodEnum.LIST_INSTANCE -> objectMapper.readValue(response) + CallbackMethodEnum.LIST_RESOURCE_AUTHORIZATION -> objectMapper.readValue(response) else -> objectMapper.readValue(response) } } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionMigrateService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionMigrateService.kt index a9dbaf3cf82..2d839d78036 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionMigrateService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionMigrateService.kt @@ -99,4 +99,21 @@ interface PermissionMigrateService { fun autoRenewal( projectConditionDTO: ProjectConditionDTO ): Boolean + + /** + * 迁移资源授权--按照项目 + */ + fun migrateResourceAuthorization( + projectCodes: List + ): Boolean + + /** + * 全量迁移资源授权 + */ + fun migrateAllResourceAuthorization(): Boolean + + /** + * 修复资源组数据，存在同步iam资源组数据，数据库 iam组id为NULL的情况，需要进行修复 + */ + fun fixResourceGroups(projectCodes: List): Boolean } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupService.kt index 58912f914ba..700b634676b 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupService.kt @@ -29,6 +29,7 @@ package com.tencent.devops.auth.service.iam import com.tencent.devops.auth.pojo.dto.GroupAddDTO +import com.tencent.devops.auth.pojo.dto.ListGroupConditionDTO import com.tencent.devops.auth.pojo.dto.RenameGroupDTO import com.tencent.devops.auth.pojo.vo.GroupPermissionDetailVo import com.tencent.devops.auth.pojo.vo.IamGroupInfoVo @@ -41,11 +42,8 @@ interface PermissionResourceGroupService { * 资源关联的组列表 */ fun listGroup( - projectId: String, - resourceType: String, - resourceCode: String, - page: Int, - pageSize: Int + userId: String, + listGroupConditionDTO: ListGroupConditionDTO ): Pagination /** diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupSyncService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupSyncService.kt new file mode 100644 index 00000000000..c9e5f5c8157 --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceGroupSyncService.kt @@ -0,0 +1,86 @@ +/* + * 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.auth.service.iam + +import com.tencent.devops.auth.pojo.enum.AuthMigrateStatus +import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO + +/** + * iam资源组同步服务 + */ +interface PermissionResourceGroupSyncService { + /** + * 通过条件搜素项目，同步项目下组和成员 + */ + fun syncByCondition(projectConditionDTO: ProjectConditionDTO) + + /** + * 批量同步项目下组和成员 + */ + fun batchSyncGroupAndMember(projectCodes: List) + + /** + * 同步项目下组和成员 + */ + fun syncGroupAndMember(projectCode: String) + + /** + * 获取项目的同步状态 + */ + fun getStatusOfSync(projectCode: String): AuthMigrateStatus + + /** + * 同步项目下用户组 + */ + fun batchSyncProjectGroup(projectCodes: List) + + /** + * 同步所有用户组成员 + */ + fun batchSyncAllMember(projectCodes: List) + + /** + * 同步资源成员 + */ + fun syncResourceMember(projectCode: String, resourceType: String, resourceCode: String) + + /** + * 同步iam组成员 + */ + fun syncIamGroupMember(projectCode: String, iamGroupId: Int) + + /** + * 同步iam组成员--用户申请加入 + */ + fun syncIamGroupMembersOfApply() + + /** + * 防止出现用户组表的数据已经删了，但是用户组成员表的数据未删除，导致出现不同步，调用iam接口报错问题。 + */ + fun fixResourceGroupMember(projectCode: String) +} diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceMemberService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceMemberService.kt index fe4aa8fe4cc..e0f01355221 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceMemberService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceMemberService.kt @@ -1,9 +1,23 @@ package com.tencent.devops.auth.service.iam +import com.tencent.bk.sdk.iam.dto.manager.ManagerMember +import com.tencent.devops.auth.pojo.ResourceMemberInfo import com.tencent.devops.auth.pojo.dto.GroupMemberRenewalDTO +import com.tencent.devops.auth.pojo.enum.BatchOperateType +import com.tencent.devops.auth.pojo.request.GroupMemberCommonConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberHandoverConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberRenewalConditionReq +import com.tencent.devops.auth.pojo.request.GroupMemberSingleRenewalReq +import com.tencent.devops.auth.pojo.request.RemoveMemberFromProjectReq +import com.tencent.devops.auth.pojo.vo.BatchOperateGroupMemberCheckVo +import com.tencent.devops.auth.pojo.vo.GroupDetailsInfoVo +import com.tencent.devops.auth.pojo.vo.MemberGroupCountWithPermissionsVo +import com.tencent.devops.auth.pojo.vo.ResourceMemberCountVO +import com.tencent.devops.common.api.model.SQLPage import com.tencent.devops.common.auth.api.pojo.BkAuthGroup import com.tencent.devops.common.auth.api.pojo.BkAuthGroupAndUserList +@Suppress("LongParameterList", "TooManyFunctions") interface PermissionResourceMemberService { fun getResourceGroupMembers( projectCode: String, @@ -18,20 +32,79 @@ interface PermissionResourceMemberService { resourceCode: String ): List + fun getProjectMemberCount(projectCode: String): ResourceMemberCountVO + + fun listProjectMembers( + projectCode: String, + memberType: String?, + userName: String?, + deptName: String?, + departedFlag: Boolean? = false, + page: Int, + pageSize: Int + ): SQLPage + + /** + * 获取用户有权限的用户组数量 + * */ + fun getMemberGroupsCount( + projectCode: String, + memberId: String + ): List + + // 查询成员所在资源用户组详情，直接加入+通过用户组（模板）加入 @Suppress("LongParameterList") - fun batchAddResourceGroupMembers( + fun getMemberGroupsDetails( + projectId: String, + memberId: String, + resourceType: String?, + iamGroupIds: List? = null, + start: Int?, + limit: Int? + ): SQLPage + + fun batchDeleteResourceGroupMembers( projectCode: String, iamGroupId: Int, - expiredTime: Long, members: List? = emptyList(), departments: List? = emptyList() ): Boolean fun batchDeleteResourceGroupMembers( + userId: String, projectCode: String, - iamGroupId: Int, - members: List? = emptyList(), - departments: List? = emptyList() + removeMemberDTO: GroupMemberCommonConditionReq + ): Boolean + + fun deleteIamGroupMembers( + groupId: Int, + type: String, + memberIds: List + ): Boolean + + fun batchHandoverGroupMembers( + userId: String, + projectCode: String, + handoverMemberDTO: GroupMemberHandoverConditionReq + ): Boolean + + fun batchOperateGroupMembersCheck( + userId: String, + projectCode: String, + batchOperateType: BatchOperateType, + conditionReq: GroupMemberCommonConditionReq + ): BatchOperateGroupMemberCheckVo + + fun removeMemberFromProject( + userId: String, + projectCode: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq + ): List + + fun removeMemberFromProjectCheck( + userId: String, + projectCode: String, + removeMemberFromProjectReq: RemoveMemberFromProjectReq ): Boolean fun roleCodeToIamGroupId( @@ -45,6 +118,7 @@ interface PermissionResourceMemberService { resourceCode: String ) + // 需审批版本 fun renewalGroupMember( userId: String, projectCode: String, @@ -53,18 +127,46 @@ interface PermissionResourceMemberService { memberRenewalDTO: GroupMemberRenewalDTO ): Boolean - fun deleteGroupMember( + // 无需审批版本 + fun renewalGroupMember( userId: String, projectCode: String, - resourceType: String, - groupId: Int + renewalConditionReq: GroupMemberSingleRenewalReq + ): GroupDetailsInfoVo + + fun renewalIamGroupMembers( + groupId: Int, + members: List, + expiredAt: Long ): Boolean - fun addGroupMember( + fun batchRenewalGroupMembers( userId: String, + projectCode: String, + renewalConditionReq: GroupMemberRenewalConditionReq + ): Boolean + + fun addGroupMember( + projectCode: String, + memberId: String, /*user or department or template*/ memberType: String, expiredAt: Long, - groupId: Int + iamGroupId: Int + ): Boolean + + fun addIamGroupMember( + groupId: Int, + members: List, + expiredAt: Long + ): Boolean + + @Suppress("LongParameterList") + fun batchAddResourceGroupMembers( + projectCode: String, + iamGroupId: Int, + expiredTime: Long, + members: List? = emptyList(), + departments: List? = emptyList() ): Boolean } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceService.kt index 577129f7659..8b7c7567e6b 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceService.kt @@ -78,16 +78,6 @@ interface PermissionResourceService { resourceCode: String ): Boolean - /** - * 是否有资源管理员权限 - */ - fun hasManagerPermission( - userId: String, - projectId: String, - resourceType: String, - resourceCode: String - ): Boolean - /** * 资源是否开启权限管理 */ diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceValidateService.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceValidateService.kt index c9213a5f52d..e81196b7eec 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceValidateService.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionResourceValidateService.kt @@ -36,4 +36,14 @@ interface PermissionResourceValidateService { projectCode: String, permissionBatchValidateDTO: PermissionBatchValidateDTO ): Map + + /** + * 是否有资源管理员权限 + */ + fun hasManagerPermission( + userId: String, + projectId: String, + resourceType: String, + resourceCode: String + ): Boolean } diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/lock/SyncGroupAndMemberLock.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/lock/SyncGroupAndMemberLock.kt new file mode 100644 index 00000000000..89e83afa5af --- /dev/null +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/lock/SyncGroupAndMemberLock.kt @@ -0,0 +1,44 @@ +/* + * 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.auth.service.lock + +import com.tencent.devops.common.redis.RedisLock +import com.tencent.devops.common.redis.RedisOperation + +class SyncGroupAndMemberLock(redisOperation: RedisOperation, projectCode: String) : + RedisLock( + redisOperation = redisOperation, + lockKey = "sync.group.and.member.lock.$projectCode", + // 12小时，防止服务重启，锁未释放 + expiredTimeInSeconds = 43200 + ) { + override fun decorateKey(key: String): String { + // buildId，key无需加上集群信息前缀来区分 + return key + } +} diff --git a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/rbac/service/migrate/MigrateV3PolicyServiceTest.kt b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/rbac/service/migrate/MigrateV3PolicyServiceTest.kt index 403007b90a8..247cdd0a9a8 100644 --- a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/rbac/service/migrate/MigrateV3PolicyServiceTest.kt +++ b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/rbac/service/migrate/MigrateV3PolicyServiceTest.kt @@ -67,7 +67,12 @@ class MigrateV3PolicyServiceTest : AbMigratePolicyServiceTest() { @BeforeEach fun v3Before() { justRun { - self.batchAddGroupMember(groupId = any(), defaultGroup = any(), members = any()) + self.batchAddGroupMember( + projectCode = any(), + groupId = any(), + defaultGroup = any(), + members = any() + ) } } diff --git a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/AuthorizationCodeTokenGranterTest.kt b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/AuthorizationCodeTokenGranterTest.kt index 0c8e1bdb6f9..2f181d70e39 100644 --- a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/AuthorizationCodeTokenGranterTest.kt +++ b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/AuthorizationCodeTokenGranterTest.kt @@ -10,11 +10,14 @@ import io.mockk.mockk import io.mockk.spyk import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotEquals +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import java.time.LocalDateTime @ExtendWith(MockKExtension::class) +@Disabled +// todo 到时候合并最新代码可消除 class AuthorizationCodeTokenGranterTest : BkCiAbstractTest() { private val codeService = mockk() @@ -45,16 +48,15 @@ class AuthorizationCodeTokenGranterTest : BkCiAbstractTest() { @Test fun `generateRefreshToken should return existing refreshToken when accessToken is valid`() { - val accessTokenInfo = TAuthOauth2AccessTokenRecord( - "testAccessToken", - "testClientId", - "testUserName", - "testGrantType", - System.currentTimeMillis() / 1000 + 1000, - "testRefreshToken", - 1, - LocalDateTime.now() - ) + val accessTokenInfo = TAuthOauth2AccessTokenRecord() + accessTokenInfo.accessToken = "testAccessToken" + accessTokenInfo.clientId = "testClientId" + accessTokenInfo.userName = "testUserName" + accessTokenInfo.grantType = "testGrantType" + accessTokenInfo.expiredTime = System.currentTimeMillis() / 1000 + 1000 + accessTokenInfo.refreshToken = "testRefreshToken" + accessTokenInfo.scopeId = 1 + accessTokenInfo.createTime = LocalDateTime.now() val refreshToken = self.invokePrivate( "generateRefreshToken", @@ -68,16 +70,15 @@ class AuthorizationCodeTokenGranterTest : BkCiAbstractTest() { @Test fun `generateRefreshToken should return new refreshToken when accessToken is expired`() { - val expiredAccessTokenInfo = TAuthOauth2AccessTokenRecord( - "testAccessToken", - "testClientId", - "testUserName", - "testGrantType", - System.currentTimeMillis() / 1000 - 1000, - "testRefreshToken", - 1, - LocalDateTime.now() - ) + val expiredAccessTokenInfo = TAuthOauth2AccessTokenRecord() + expiredAccessTokenInfo.accessToken = "testAccessToken" + expiredAccessTokenInfo.clientId = "testClientId" + expiredAccessTokenInfo.userName = "testUserName" + expiredAccessTokenInfo.grantType = "testGrantType" + expiredAccessTokenInfo.expiredTime = System.currentTimeMillis() / 1000 - 1000 + expiredAccessTokenInfo.refreshToken = "testRefreshToken" + expiredAccessTokenInfo.scopeId = 1 + expiredAccessTokenInfo.createTime = LocalDateTime.now() every { refreshTokenService.create(any(), any(), any()) } returns Unit every { refreshTokenService.delete(any()) } returns Unit diff --git a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2ClientServiceTest.kt b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2ClientServiceTest.kt index 9244eb7defe..67a6e224b09 100644 --- a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2ClientServiceTest.kt +++ b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2ClientServiceTest.kt @@ -7,9 +7,11 @@ import com.tencent.devops.common.test.BkCiAbstractTest import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertArrayEquals import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +@Disabled class Oauth2ClientServiceTest : BkCiAbstractTest() { private val authOauth2ClientDetailsDao = mockk() diff --git a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2CodeServiceTest.kt b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2CodeServiceTest.kt index 2f4c33dd32a..027428eac3f 100644 --- a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2CodeServiceTest.kt +++ b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/Oauth2CodeServiceTest.kt @@ -8,10 +8,12 @@ import com.tencent.devops.model.auth.tables.records.TAuthOauth2CodeRecord import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.LocalDateTime +@Disabled class Oauth2CodeServiceTest : BkCiAbstractTest() { private val authOauth2CodeDao = mockk() private val oauth2CodeService = Oauth2CodeService( diff --git a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/RefreshTokenGranterTest.kt b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/RefreshTokenGranterTest.kt index 9ad9ac1b2b2..78689b9db60 100644 --- a/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/RefreshTokenGranterTest.kt +++ b/src/backend/ci/core/auth/biz-auth/src/test/kotlin/com/tencent/devops/auth/service/oauth2/RefreshTokenGranterTest.kt @@ -13,10 +13,12 @@ import io.mockk.mockk import io.mockk.spyk import io.mockk.verify import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.LocalDateTime +@Disabled class RefreshTokenGranterTest : BkCiAbstractTest() { private val accessTokenService = mockk() @@ -41,16 +43,16 @@ class RefreshTokenGranterTest : BkCiAbstractTest() { icon = "icon" ) - private val accessTokenInfo = TAuthOauth2AccessTokenRecord( - "testAccessToken", - "testClientId", - "testUserName", - "testGrantType", - System.currentTimeMillis() / 1000 + 1000, - "testRefreshToken", - 1, - LocalDateTime.now() - ) + private val accessTokenInfo = TAuthOauth2AccessTokenRecord().apply { + accessToken = "testAccessToken" + clientId = "testClientId" + userName = "testUserName" + grantType = "testGrantType" + expiredTime = System.currentTimeMillis() / 1000 + 1000 + refreshToken = "testRefreshToken" + scopeId = 1 + createTime = LocalDateTime.now() + } private val accessTokenRequest = Oauth2AccessTokenRequest( refreshToken = "testRefreshToken", diff --git a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/constant/CommonMessageCode.kt b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/constant/CommonMessageCode.kt index a7836f057de..58a88d007b6 100644 --- a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/constant/CommonMessageCode.kt +++ b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/constant/CommonMessageCode.kt @@ -101,8 +101,6 @@ object CommonMessageCode { const val USERS_EXCEEDS_THE_LIMIT = "2100048" // 授权用户数越界:{0} const val FAILED_TO_QUERY_GSE_AGENT_STATUS = "2100049" // 查询 Gse Agent 状态失败 const val FAILED_TO_GET_AGENT_STATUS = "2100050" // 获取agent状态失败 - const val FAILED_TO_GET_CMDB_NODE = "2100051" // 获取 CMDB 节点失败 - const val FAILED_TO_GET_CMDB_LIST = "2100052" // 获取CMDB列表失败 const val STAGES_AND_STEPS_CANNOT_EXIST_BY_SIDE = "2100053" // stages和steps不能并列存在! const val USER_NOT_PERMISSIONS_OPERATE_PIPELINE = "2100054" // 用户({0})无权限在工程({1})下{2}流水线{3} diff --git a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/enums/TriggerRepositoryType.kt b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/enums/TriggerRepositoryType.kt index 6fd5e4093c5..bd1b2591819 100644 --- a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/enums/TriggerRepositoryType.kt +++ b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/enums/TriggerRepositoryType.kt @@ -30,7 +30,9 @@ package com.tencent.devops.common.api.enums enum class TriggerRepositoryType { ID, NAME, - SELF; + SELF, + // 触发器不需要绑定代码库,如定时触发默认时,不需要绑定 + NONE; companion object { fun toRepositoryType(type: TriggerRepositoryType?): RepositoryType? { diff --git a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/pojo/Pagination.kt b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/pojo/Pagination.kt index 05f3381ee88..204fed3b359 100644 --- a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/pojo/Pagination.kt +++ b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/pojo/Pagination.kt @@ -34,5 +34,7 @@ data class Pagination( @get:Schema(title = "是否有下一页", required = true) val hasNext: Boolean, @get:Schema(title = "数据", required = true) - val records: List + val records: List, + @get:Schema(title = "总记录行数", required = false) + val count: Long? = null ) diff --git a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/DateTimeUtil.kt b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/DateTimeUtil.kt index 7f5beeb0260..53876182365 100644 --- a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/DateTimeUtil.kt +++ b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/DateTimeUtil.kt @@ -245,7 +245,7 @@ object DateTimeUtil { */ fun formatDay(mss: Long): String { if (mss == 0L) return "0" - return (mss / (1000 * 60 * 60 * 24)).toString() + return ((mss / (1000 * 60 * 60 * 24)) + 1).toString() } /** diff --git a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/JsonUtil.kt b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/JsonUtil.kt index a6d020edc60..22828875ffa 100644 --- a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/JsonUtil.kt +++ b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/JsonUtil.kt @@ -32,9 +32,11 @@ import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.core.json.JsonReadFeature import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.DeserializationFeature +import com.fasterxml.jackson.databind.MapperFeature import com.fasterxml.jackson.databind.Module import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature +import com.fasterxml.jackson.databind.json.JsonMapper import com.fasterxml.jackson.databind.ser.FilterProvider import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider @@ -119,22 +121,40 @@ object JsonUtil { private val objectMapper = objectMapper() + private val jsonMapper = jsonMapper() + private fun objectMapper(): ObjectMapper { return ObjectMapper().apply { - registerModule(javaTimeModule()) - registerModule(KotlinModule()) - enable(SerializationFeature.INDENT_OUTPUT) - enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT) - enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature()) - setSerializationInclusion(JsonInclude.Include.NON_NULL) - disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - jsonModules.forEach { jsonModule -> - registerModule(jsonModule) - } + objectMapperInit() + } + } + + private fun ObjectMapper.objectMapperInit() { + registerModule(javaTimeModule()) + registerModule(KotlinModule()) + enable(SerializationFeature.INDENT_OUTPUT) + enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT) + enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature()) + setSerializationInclusion(JsonInclude.Include.NON_NULL) + disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + jsonModules.forEach { jsonModule -> + registerModule(jsonModule) } } + private fun jsonMapper(): JsonMapper { + return JsonMapper.builder() + /* 使得POJO反序列化有序，对性能会有略微影响 + * https://github.com/FasterXML/jackson-databind/issues/3900 + * */ + .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY) + .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS) + .disable(MapperFeature.SORT_CREATOR_PROPERTIES_FIRST).build().apply { + objectMapperInit() + } + } + private val skipEmptyObjectMapper = ObjectMapper().apply { registerModule(javaTimeModule()) registerModule(KotlinModule()) @@ -178,6 +198,7 @@ object JsonUtil { } subModules.forEach { subModule -> objectMapper.registerModule(subModule) + jsonMapper.registerModule(subModule) skipEmptyObjectMapper.registerModule(subModule) unformattedObjectMapper.registerModule(subModule) } @@ -193,6 +214,13 @@ object JsonUtil { return getObjectMapper(formatted).writeValueAsString(bean)!! } + fun toSortJson(bean: Any): String { + if (ReflectUtil.isNativeType(bean) || bean is String) { + return bean.toString() + } + return jsonMapper.writeValueAsString(bean)!! + } + /** * 将对象转可修改的Map, * 注意：会忽略掉值为空串和null的属性 diff --git a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/OkhttpUtils.kt b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/OkhttpUtils.kt index c07f7257afb..f72f7dbabed 100644 --- a/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/OkhttpUtils.kt +++ b/src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/util/OkhttpUtils.kt @@ -155,6 +155,10 @@ object OkhttpUtils { return doHttp(okHttpClient, request) } + fun doShortGet(url: String, headers: Map = mapOf()): Response { + return doGet(shortOkHttpClient, url, headers) + } + fun doLongGet(url: String, headers: Map = mapOf()): Response { return doGet(longHttpClient, url, headers) } @@ -167,6 +171,13 @@ object OkhttpUtils { return doHttp(shortOkHttpClient, request) } + fun doShortPost(url: String, jsonParam: String, headers: Map = mapOf()): Response { + val builder = getBuilder(url, headers) + val body = jsonParam.toRequestBody(jsonMediaType) + val request = builder.post(body).build() + return doShortHttp(request) + } + private fun doCustomClientHttp(customOkHttpClient: OkHttpClient, request: Request): Response { return doHttp(customOkHttpClient, request) } diff --git a/src/backend/ci/core/common/common-audit/build.gradle.kts b/src/backend/ci/core/common/common-audit/build.gradle.kts index ec1236c05a0..46e8fc3a845 100644 --- a/src/backend/ci/core/common/common-audit/build.gradle.kts +++ b/src/backend/ci/core/common/common-audit/build.gradle.kts @@ -1,3 +1,30 @@ +/* + * 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. + */ + dependencies { api("com.tencent.bk.sdk:spring-boot-bk-audit-starter") api(project(":core:common:common-web")) diff --git a/src/backend/ci/core/common/common-audit/src/main/kotlin/com/tencent/devops/common/audit/ActionAuditContent.kt b/src/backend/ci/core/common/common-audit/src/main/kotlin/com/tencent/devops/common/audit/ActionAuditContent.kt index af9cf420596..f4fcc475290 100644 --- a/src/backend/ci/core/common/common-audit/src/main/kotlin/com/tencent/devops/common/audit/ActionAuditContent.kt +++ b/src/backend/ci/core/common/common-audit/src/main/kotlin/com/tencent/devops/common/audit/ActionAuditContent.kt @@ -102,9 +102,10 @@ object ActionAuditContent { const val IMAGE_EDIT_CONTENT = "modify workspace image $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" // 代理仓库 - const val CODE_PROXY_CREATE_CONTENT = "create code proxy $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" - const val CODE_PROXY_LIST_CONTENT = "list code proxy $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" - const val CODE_PROXY_DELETE_CONTENT = "delete code proxy $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" + const val TGIT_LINK_CREATE_CONTENT = "create tgit link $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" + const val TGIT_LINK_CALLBACK_CREATE_CONTENT = "create tgit link callback $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" + const val TGIT_LINK_DELETE_CONTENT = "delete tgit link $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" + const val TGIT_LINK_CREATE_PROJECT_CONTENT = "create tgit project $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" // 环境 const val ENVIRONMENT_CREATE_CONTENT = "create environment $CONTENT_TEMPLATE in project $PROJECT_CODE_CONTENT_TEMPLATE" diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ActionId.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ActionId.kt index d397a3c102c..835cf51999a 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ActionId.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ActionId.kt @@ -70,9 +70,9 @@ object ActionId { const val IMAGE_EDIT = "image_edit" // 代理仓库 - const val CODE_PROXY_CREATE = "code_proxy_create" - const val CODE_PROXY_LIST = "code_proxy_list" - const val CODE_PROXY_DELETE = "code_proxy_delete" + const val TGIT_LINK_CREATE = "tgit_link_create" + const val TGIT_LINK_LIST = "tgit_link_list" + const val TGIT_LINK_DELETE = "tgit_link_delete" // 环境 const val ENVIRONMENT_CREATE = "environment_create" diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/AuthAuthorizationApi.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/AuthAuthorizationApi.kt new file mode 100644 index 00000000000..0cd4bc07727 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/AuthAuthorizationApi.kt @@ -0,0 +1,45 @@ +package com.tencent.devops.common.auth.api + +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverResult +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus + +interface AuthAuthorizationApi { + /** + * 批量重置资源授权人 + * @param projectId 项目ID + * @param resourceAuthorizationHandoverList 资源授权交接列表 + */ + fun batchModifyHandoverFrom( + projectId: String, + resourceAuthorizationHandoverList: List + ) + + /** + * 新增资源授权 + * @param projectId 项目ID + * @param resourceAuthorizationList 资源授权列表 + */ + fun addResourceAuthorization( + projectId: String, + resourceAuthorizationList: List + ) + + /** + * 重置资源授权 + * @param projectId 项目ID + * @param preCheck 是否为预检查，若是则只做检查，不做交接 + * @param resourceAuthorizationHandoverDTOs 数据 + * @param handoverResourceAuthorization 业务方交接授权逻辑 + */ + fun resetResourceAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List, + handoverResourceAuthorization: ( + preCheck: Boolean, + resourceAuthorizationHandoverDTO: ResourceAuthorizationHandoverDTO + ) -> ResourceAuthorizationHandoverResult + ): Map> +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/BkManagerCheck.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/BkManagerCheck.kt new file mode 100644 index 00000000000..95afa7b42e6 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/BkManagerCheck.kt @@ -0,0 +1,32 @@ +/* + * 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.auth.api + +@Target(AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +annotation class BkManagerCheck diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ResourceTypeId.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ResourceTypeId.kt index 7dd788d219e..854e9f19caa 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ResourceTypeId.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/ResourceTypeId.kt @@ -9,7 +9,6 @@ object ResourceTypeId { const val CERT = "cert" const val CGS = "cgs" const val IMAGE = "image" - const val CODE_PROXY = "code_proxy" const val ENVIRONMENT = "environment" const val ENV_NODE = "env_node" const val RULE = "rule" @@ -19,4 +18,5 @@ object ResourceTypeId { const val EXPERIENCE_GROUP = "experience_group" // 自定义 const val SECURITY = "security" + const val TGIT_LINK = "tgit_link" } diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/DefaultGroupType.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/DefaultGroupType.kt index 7966b7d2209..839513dc4e1 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/DefaultGroupType.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/DefaultGroupType.kt @@ -42,7 +42,8 @@ enum class DefaultGroupType( TESTER("tester", "测试人员"), // 测试人员 PM("pm", "产品人员"), // 产品人员 QC("qc", "质量管理员"), // 质量管理员 - VIEWER("viewer", "查看项目权限组"); // 查看项目权限组 + VIEWER("viewer", "查看项目权限组"), // 查看项目权限组 + CUSTOM("custom", "用户自定义组"); // 用户自定义组 companion object { fun get(value: String): DefaultGroupType { diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt index 85fd31d9dd9..8b92069eaa8 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt @@ -33,4 +33,15 @@ abstract class EsbBaseReq( open var bk_app_secret: String, open var bk_username: String, open val bk_token: String = "" -) +) { + fun toMap(): Map { + return mapOf( + "X-Bkapi-Authorization" to """{ + "bk_app_code":"$bk_app_code", + "bk_app_secret":"$bk_app_secret", + "bk_username":"$bk_username", + "bk_token":"$bk_token" + }""".trimIndent().replace("\\s".toRegex(), "") + ) + } +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ProjectConditionDTO.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ProjectConditionDTO.kt index 6b7daa45ad9..e11c6c31e40 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ProjectConditionDTO.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ProjectConditionDTO.kt @@ -23,6 +23,8 @@ data class ProjectConditionDTO( val resourceType: String? = null, @get:Schema(title = "路由tag") val routerTag: AuthSystemType? = null, + @get:Schema(title = "是否包含router_tag为null") + val includeNullRouterTag: Boolean? = false, @get:Schema(title = "是否关联产品") val relatedProduct: Boolean? = null, @get:Schema(title = "排除创建时间大于该值的项目") diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResetAllResourceAuthorizationReq.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResetAllResourceAuthorizationReq.kt new file mode 100644 index 00000000000..36ca18c32b3 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResetAllResourceAuthorizationReq.kt @@ -0,0 +1,17 @@ +package com.tencent.devops.common.auth.api.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "全量资源授权交接条件实体") +data class ResetAllResourceAuthorizationReq( + @get:Schema(title = "项目ID") + val projectCode: String, + @get:Schema(title = "授予人") + val handoverFrom: String, + @get:Schema(title = "交接人") + val handoverTo: String?, + @get:Schema(title = "是否为预检查，若为true,不做权限交接") + val preCheck: Boolean = true, + @get:Schema(title = "是否校验操作人权限") + val checkPermission: Boolean = true +) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationConditionRequest.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationConditionRequest.kt new file mode 100644 index 00000000000..d5f8241e220 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationConditionRequest.kt @@ -0,0 +1,25 @@ +package com.tencent.devops.common.auth.api.pojo + +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权交接条件实体") +@Suppress("LongParameterList") +open class ResourceAuthorizationConditionRequest( + @get:Schema(title = "项目ID") + open val projectCode: String, + @get:Schema(title = "资源类型") + open val resourceType: String? = null, + @get:Schema(title = "资源名称") + open val resourceName: String? = null, + @get:Schema(title = "授予人") + open val handoverFrom: String? = null, + @get:Schema(title = "greaterThanHandoverTime") + open val greaterThanHandoverTime: Long? = null, + @get:Schema(title = "lessThanHandoverTime") + open val lessThanHandoverTime: Long? = null, + @Parameter(description = "第几页", required = false) + open val page: Int? = null, + @Parameter(description = "每页条数", required = false) + open val pageSize: Int? = null +) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationDTO.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationDTO.kt new file mode 100644 index 00000000000..24f217daba5 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationDTO.kt @@ -0,0 +1,26 @@ +package com.tencent.devops.common.auth.api.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权DTO") +@Suppress("LongParameterList") +open class ResourceAuthorizationDTO( + @get:Schema(title = "项目ID") + open val projectCode: String, + @get:Schema(title = "资源类型") + open val resourceType: String, + @get:Schema(title = "资源名称") + open val resourceName: String, + @get:Schema(title = "资源code") + open val resourceCode: String, + @get:Schema(title = "授权时间") + open val handoverTime: Long? = null, + @get:Schema(title = "授予人") + open val handoverFrom: String? = null, + @get:Schema(title = "授予人中文名称") + open var handoverFromCnName: String? = null +) { + fun copyHandoverFromCnName(handoverFromCnName: String) { + this.handoverFromCnName = handoverFromCnName + } +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverConditionRequest.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverConditionRequest.kt new file mode 100644 index 00000000000..21fd1979736 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverConditionRequest.kt @@ -0,0 +1,46 @@ +package com.tencent.devops.common.auth.api.pojo + +import com.tencent.devops.common.auth.enums.HandoverChannelCode +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权交接条件实体") +data class ResourceAuthorizationHandoverConditionRequest( + @get:Schema(title = "项目ID") + override val projectCode: String, + @get:Schema(title = "资源类型") + override val resourceType: String, + @get:Schema(title = "资源名称") + override val resourceName: String? = null, + @get:Schema(title = "授予人") + override val handoverFrom: String? = null, + @get:Schema(title = "greaterThanHandoverTime") + override val greaterThanHandoverTime: Long? = null, + @get:Schema(title = "lessThanHandoverTime") + override val lessThanHandoverTime: Long? = null, + @Parameter(description = "第几页", required = false) + override val page: Int? = null, + @Parameter(description = "每页条数", required = false) + override val pageSize: Int? = null, + @get:Schema(title = "是否全量选择") + val fullSelection: Boolean = false, + @get:Schema(title = "资源权限交接列表") + val resourceAuthorizationHandoverList: List = emptyList(), + @get:Schema(title = "交接渠道") + val handoverChannel: HandoverChannelCode, + @get:Schema(title = "交接人") + val handoverTo: String? = null, + @get:Schema(title = "是否为预检查，若为true,不做权限交接；") + val preCheck: Boolean = false, + @get:Schema(title = "是否校验操作人权限") + val checkPermission: Boolean = true +) : ResourceAuthorizationConditionRequest( + projectCode = projectCode, + resourceType = resourceType, + resourceName = resourceName, + handoverFrom = handoverFrom, + greaterThanHandoverTime = greaterThanHandoverTime, + lessThanHandoverTime = lessThanHandoverTime, + page = page, + pageSize = pageSize +) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverDTO.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverDTO.kt new file mode 100644 index 00000000000..3bcdc251fc9 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverDTO.kt @@ -0,0 +1,37 @@ +package com.tencent.devops.common.auth.api.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "交接资源授权DTO") +data class ResourceAuthorizationHandoverDTO( + @get:Schema(title = "项目ID") + override val projectCode: String, + @get:Schema(title = "资源类型") + override val resourceType: String, + @get:Schema(title = "资源名称") + override val resourceName: String, + @get:Schema(title = "资源code") + override val resourceCode: String, + @get:Schema(title = "授予时间") + override val handoverTime: Long? = null, + @get:Schema(title = "授予人") + override val handoverFrom: String? = null, + @get:Schema(title = "授予人中文名称") + override var handoverFromCnName: String? = null, + @get:Schema(title = "交接人") + val handoverTo: String? = null, + @get:Schema(title = "交接人中文名稱") + var handoverToCnName: String? = null, + @get:Schema(title = "交接失败信息") + val handoverFailedMessage: String? = null +) : ResourceAuthorizationDTO( + projectCode = projectCode, + resourceType = resourceType, + resourceName = resourceName, + resourceCode = resourceCode, + handoverFrom = handoverFrom +) { + fun copyHandoverToCnName(handoverToCnName: String) { + this.handoverToCnName = handoverToCnName + } +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverResult.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverResult.kt new file mode 100644 index 00000000000..1c97cfdf9d8 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationHandoverResult.kt @@ -0,0 +1,12 @@ +package com.tencent.devops.common.auth.api.pojo + +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权移交结果") +data class ResourceAuthorizationHandoverResult( + @get:Schema(title = "状态") + val status: ResourceAuthorizationHandoverStatus, + @get:Schema(title = "信息") + var message: String? = "" +) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationResetRequest.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationResetRequest.kt new file mode 100644 index 00000000000..2690e77d6a5 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationResetRequest.kt @@ -0,0 +1,22 @@ +package com.tencent.devops.common.auth.api.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "业务方重置资源授权请求体") +data class ResourceAuthorizationResetRequest( + @get:Schema(description = "资源授权重置条件实体", required = true) + val condition: ResourceAuthorizationHandoverConditionRequest, + @get:Schema( + description = "重置资源授权操作的渠道有两种，一种是管理员界面视角，一种是在具体资源列表界面对单个资源进行操作;" + + "对于在管理员界面重置授权时，统一校验是否有管理员权限，不存在差异;" + + "但对于在具体资源列表界面单条操作时，它们的鉴权方式存在差异，需要业务方自己自行进行处理，抛出异常。", + required = true + ) + val validateSingleResourcePermission: (( + operator: String, + projectCode: String, + resourceCode: String + ) -> Unit)?, + @get:Schema(description = "资源授权重置函数", required = true) + val handoverResourceAuthorization: (ResourceAuthorizationHandoverDTO) -> ResourceAuthorizationHandoverResult +) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationResponse.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationResponse.kt new file mode 100644 index 00000000000..0c396b8c198 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/ResourceAuthorizationResponse.kt @@ -0,0 +1,24 @@ +package com.tencent.devops.common.auth.api.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权返回体") +@Suppress("LongParameterList") +data class ResourceAuthorizationResponse( + @get:Schema(title = "项目ID") + val projectCode: String, + @get:Schema(title = "资源类型") + val resourceType: String, + @get:Schema(title = "资源名称") + val resourceName: String, + @get:Schema(title = "资源code") + val resourceCode: String, + @get:Schema(title = "授权时间") + val handoverTime: Long, + @get:Schema(title = "授予人") + val handoverFrom: String, + @get:Schema(title = "授予人中文名称") + val handoverFromCnName: String? = null, + @get:Schema(title = "是否有执行权限") + val executePermission: Boolean? = null +) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/callback/ListResourcesAuthorizationDTO.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/callback/ListResourcesAuthorizationDTO.kt new file mode 100644 index 00000000000..6b2ace609f4 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/callback/ListResourcesAuthorizationDTO.kt @@ -0,0 +1,24 @@ +package com.tencent.devops.common.auth.callback + +import com.tencent.bk.sdk.iam.dto.callback.response.BaseDataResponseDTO +import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权回调返回实体DTO") +data class ListResourcesAuthorizationDTO( + val data: BaseDataResponseDTO +) : CallbackBaseResponseDTO() { + fun buildResourcesAuthorizationListFailResult(message: String): ListResourcesAuthorizationDTO { + this.code = 0 + this.message = message + this.data.count = 0 + return this + } + + fun buildResourcesAuthorizationListResult(): ListResourcesAuthorizationDTO { + this.code = 0L + this.message = "" + return this + } +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/enums/HandoverChannelCode.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/enums/HandoverChannelCode.kt new file mode 100644 index 00000000000..247a91eef54 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/enums/HandoverChannelCode.kt @@ -0,0 +1,6 @@ +package com.tencent.devops.common.auth.enums + +enum class HandoverChannelCode { + MANAGER, + OTHER +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/enums/ResourceAuthorizationHandoverStatus.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/enums/ResourceAuthorizationHandoverStatus.kt new file mode 100644 index 00000000000..6113e3eb4e9 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/enums/ResourceAuthorizationHandoverStatus.kt @@ -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.auth.enums + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "资源授权移交状态") +enum class ResourceAuthorizationHandoverStatus { + SUCCESS, + FAILED +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/service/IamEsbService.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/service/IamEsbService.kt index 75857dfe898..46d138498e0 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/service/IamEsbService.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/service/IamEsbService.kt @@ -33,6 +33,7 @@ import com.tencent.devops.common.api.exception.RemoteServiceException import com.tencent.devops.common.api.util.OkhttpUtils import com.tencent.devops.common.auth.api.pojo.EsbCreateApiReq import com.tencent.devops.common.auth.api.pojo.EsbPermissionUrlReq +import okhttp3.Headers.Companion.toHeaders import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.RequestBody @@ -44,8 +45,10 @@ class IamEsbService { @Value("\${esb.code:#{null}}") val appCode: String? = null + @Value("\${esb.secret:#{null}}") val appSecret: String? = null + @Value("\${bk.paas.host:#{null}}") val iamHost: String? = null @@ -60,8 +63,9 @@ class IamEsbService { val mediaType = "application/json; charset=utf-8".toMediaTypeOrNull() val requestBody = RequestBody.create(mediaType, content) val request = Request.Builder().url(url) - .post(requestBody) - .build() + .headers(iamCreateApiReq.toMap().toHeaders()) + .post(requestBody) + .build() OkhttpUtils.doHttp(request).use { if (!it.isSuccessful) { logger.warn("bkiam v3 request failed url:$url response $it") @@ -92,8 +96,9 @@ class IamEsbService { logger.info("getPermissionUrl url:$url") logger.info("getPermissionUrl content:$content body:$requestBody") val request = Request.Builder().url(url) - .post(requestBody) - .build() + .headers(iamPermissionUrl.toMap().toHeaders()) + .post(requestBody) + .build() OkhttpUtils.doHttp(request).use { if (!it.isSuccessful) { // 请求错误 @@ -113,8 +118,8 @@ class IamEsbService { } /** - * 生成请求url - */ + * 生成请求url + */ private fun getAuthRequestUrl(uri: String): String { val newUrl = if (iamHost?.endsWith("/")!!) { iamHost + uri diff --git a/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/kotlin/com/tencent/devops/common/auth/authorization/AuthAuthorizationConfiguration.kt b/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/kotlin/com/tencent/devops/common/auth/authorization/AuthAuthorizationConfiguration.kt new file mode 100644 index 00000000000..99271408ad9 --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/kotlin/com/tencent/devops/common/auth/authorization/AuthAuthorizationConfiguration.kt @@ -0,0 +1,47 @@ +/* + * 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.auth.authorization + +import com.tencent.devops.common.client.Client +import org.springframework.boot.autoconfigure.AutoConfigureOrder +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.core.Ordered + +@Configuration +@ConditionalOnWebApplication +@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) +class AuthAuthorizationConfiguration { + @Bean + fun authAuthorizationApi( + client: Client + ) = AuthAuthorizationService( + client = client + ) +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/kotlin/com/tencent/devops/common/auth/authorization/AuthAuthorizationService.kt b/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/kotlin/com/tencent/devops/common/auth/authorization/AuthAuthorizationService.kt new file mode 100644 index 00000000000..48b0332608c --- /dev/null +++ b/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/kotlin/com/tencent/devops/common/auth/authorization/AuthAuthorizationService.kt @@ -0,0 +1,80 @@ +package com.tencent.devops.common.auth.authorization + +import com.tencent.devops.auth.api.service.ServiceAuthAuthorizationResource +import com.tencent.devops.common.auth.api.AuthAuthorizationApi +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverResult +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.client.Client +import org.slf4j.LoggerFactory +import java.util.concurrent.Callable +import java.util.concurrent.Executors + +class AuthAuthorizationService( + private val client: Client +) : AuthAuthorizationApi { + override fun batchModifyHandoverFrom( + projectId: String, + resourceAuthorizationHandoverList: List + ) { + logger.info("batch modify handoverfrom|$projectId|$resourceAuthorizationHandoverList") + client.get(ServiceAuthAuthorizationResource::class).batchModifyHandoverFrom( + projectId = projectId, + resourceAuthorizationHandoverList = resourceAuthorizationHandoverList + ) + } + + override fun addResourceAuthorization( + projectId: String, + resourceAuthorizationList: List + ) { + logger.info("add resource authorization|$projectId|$resourceAuthorizationList") + client.get(ServiceAuthAuthorizationResource::class).addResourceAuthorization( + projectId = projectId, + resourceAuthorizationList = resourceAuthorizationList + ) + } + + override fun resetResourceAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List, + handoverResourceAuthorization: ( + preCheck: Boolean, + resourceAuthorizationHandoverDTO: ResourceAuthorizationHandoverDTO + ) -> ResourceAuthorizationHandoverResult + ): Map> { + logger.info("reset resource authorization|$preCheck|$projectId|$resourceAuthorizationHandoverDTOs") + val futures = resourceAuthorizationHandoverDTOs.map { resourceAuthorization -> + executor.submit(Callable { + val result = try { + handoverResourceAuthorization.invoke( + preCheck, + resourceAuthorization + ) + } catch (ignore: Exception) { + ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.FAILED, + message = ignore.message + ) + } + when (result.status) { + ResourceAuthorizationHandoverStatus.SUCCESS -> resourceAuthorization + else -> resourceAuthorization.copy(handoverFailedMessage = result.message) + } + }) + } + val result = futures.map { it.get() } + val (successList, failedList) = result.partition { it.handoverFailedMessage == null } + return mapOf( + ResourceAuthorizationHandoverStatus.SUCCESS to successList, + ResourceAuthorizationHandoverStatus.FAILED to failedList + ) + } + + companion object { + private val logger = LoggerFactory.getLogger(AuthAuthorizationService::class.java) + private val executor = Executors.newFixedThreadPool(20) + } +} diff --git a/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/resources/META-INF/spring.factories b/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/resources/META-INF/spring.factories index 5ecb7a02fa1..2d512815555 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/resources/META-INF/spring.factories +++ b/src/backend/ci/core/common/common-auth/common-auth-provider/src/main/resources/META-INF/spring.factories @@ -1,4 +1,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.tencent.devops.common.auth.rbac.RbacAuthAutoConfiguration,\ com.tencent.devops.common.auth.rbac.RbacAuthHttpClientAutoConfiguration,\ -com.tencent.devops.common.auth.mock.MockAuthAutoConfiguration +com.tencent.devops.common.auth.mock.MockAuthAutoConfiguration,\ +com.tencent.devops.common.auth.authorization.AuthAuthorizationConfiguration diff --git a/src/backend/ci/core/common/common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeccUtils.kt b/src/backend/ci/core/common/common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeccUtils.kt index 11bd85cbb76..6dc8ab589e5 100644 --- a/src/backend/ci/core/common/common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeccUtils.kt +++ b/src/backend/ci/core/common/common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeccUtils.kt @@ -37,6 +37,8 @@ object CodeccUtils { const val BK_CI_CODECC_COMMUNITY_ATOM = "CodeCCCheckAtom" + const val BK_CI_CODECC_REPORT_URL = "BK_CI_CODECC_REPORT_URL" + fun isCodeccAtom(atomName: String?): Boolean { return isCodeccNewAtom(atomName) } diff --git a/src/backend/ci/core/common/common-db-base/src/main/kotlin/com/tencent/devops/common/db/utils/JooqUtils.kt b/src/backend/ci/core/common/common-db-base/src/main/kotlin/com/tencent/devops/common/db/utils/JooqUtils.kt index 23c357d61a1..ef23fd7dd89 100644 --- a/src/backend/ci/core/common/common-db-base/src/main/kotlin/com/tencent/devops/common/db/utils/JooqUtils.kt +++ b/src/backend/ci/core/common/common-db-base/src/main/kotlin/com/tencent/devops/common/db/utils/JooqUtils.kt @@ -28,8 +28,6 @@ package com.tencent.devops.common.db.utils import com.mysql.cj.jdbc.exceptions.MySQLTransactionRollbackException -import java.math.BigDecimal -import java.sql.Timestamp import org.jooq.DatePart import org.jooq.Field import org.jooq.Record @@ -37,16 +35,27 @@ import org.jooq.SelectOptionStep import org.jooq.SelectUnionStep import org.jooq.exception.DataAccessException import org.jooq.impl.DSL +import org.springframework.dao.DeadlockLoserDataAccessException +import java.math.BigDecimal +import java.sql.Timestamp object JooqUtils { const val JooqDeadLockMessage = "Deadlock found when trying to get lock; try restarting transaction" - fun retryWhenDeadLock(action: () -> T): T { + fun retryWhenDeadLock(retryTime: Int = 1, action: () -> T): T { return try { action() } catch (dae: DataAccessException) { - if (dae.isDeadLock()) action() else throw dae + if (retryTime - 1 < 0) { + throw dae + } + if (dae.isDeadLock()) retryWhenDeadLock(retryTime - 1, action) else throw dae + } catch (dae: DeadlockLoserDataAccessException) { + if (retryTime - 1 < 0) { + throw dae + } + retryWhenDeadLock(retryTime - 1, action) } } diff --git a/src/backend/ci/core/common/common-db-base/src/test/kotlin/com/tencent/devops/common/db/utils/JooqUtilsTest.kt b/src/backend/ci/core/common/common-db-base/src/test/kotlin/com/tencent/devops/common/db/utils/JooqUtilsTest.kt index 17e2b4b7f82..13612a47f0b 100644 --- a/src/backend/ci/core/common/common-db-base/src/test/kotlin/com/tencent/devops/common/db/utils/JooqUtilsTest.kt +++ b/src/backend/ci/core/common/common-db-base/src/test/kotlin/com/tencent/devops/common/db/utils/JooqUtilsTest.kt @@ -2,6 +2,7 @@ package com.tencent.devops.common.db.utils import org.jooq.exception.DataAccessException import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test class JooqUtilsTest { @@ -18,6 +19,19 @@ class JooqUtilsTest { Assertions.assertEquals(expect, actual) } + @Test + @DisplayName("重试多次") + fun retryWhenDeadLock_2() { + var actual = 0 + JooqUtils.retryWhenDeadLock(3) { + if (actual++ < 3) { + throw DataAccessException("mock sql dead lock; ${JooqUtils.JooqDeadLockMessage}") + } + } + val expect = 4 // retry + Assertions.assertEquals(expect, actual) + } + @Test fun assertThrowsRetryWhenDeadLock() { var actual = 0 diff --git a/src/backend/ci/core/common/common-dispatch-sdk/src/main/kotlin/com/tencent/devops/common/dispatch.sdk/service/DispatchService.kt b/src/backend/ci/core/common/common-dispatch-sdk/src/main/kotlin/com/tencent/devops/common/dispatch.sdk/service/DispatchService.kt index fe077548a19..2a5d734fb86 100644 --- a/src/backend/ci/core/common/common-dispatch-sdk/src/main/kotlin/com/tencent/devops/common/dispatch.sdk/service/DispatchService.kt +++ b/src/backend/ci/core/common/common-dispatch-sdk/src/main/kotlin/com/tencent/devops/common/dispatch.sdk/service/DispatchService.kt @@ -60,6 +60,8 @@ import com.tencent.devops.monitoring.pojo.DispatchStatus import com.tencent.devops.process.api.service.ServiceBuildResource import com.tencent.devops.process.api.service.ServicePipelineTaskResource import com.tencent.devops.process.engine.common.VMUtils +import com.tencent.devops.process.engine.pojo.PipelineBuildContainer +import com.tencent.devops.process.engine.pojo.PipelineBuildTask import com.tencent.devops.process.pojo.mq.PipelineAgentShutdownEvent import com.tencent.devops.process.pojo.mq.PipelineAgentStartupEvent import java.util.Date @@ -151,28 +153,7 @@ class DispatchService constructor( } fun checkRunning(event: PipelineAgentStartupEvent): Boolean { - // 判断流水线当前container是否在运行中 - val statusResult = client.get(ServicePipelineTaskResource::class).getContainerStartupInfo( - projectId = event.projectId, - buildId = event.buildId, - containerId = event.containerId, - taskId = VMUtils.genStartVMTaskId(event.containerId) - ) - val startBuildTask = statusResult.data?.startBuildTask - val buildContainer = statusResult.data?.buildContainer - if (statusResult.isNotOk() || startBuildTask == null || buildContainer == null) { - logger.warn( - "The build event($event) fail to check if pipeline task is running " + - "because of statusResult(${statusResult.message})" - ) - val errorMessage = I18nUtil.getCodeLanMessage(UNABLE_GET_PIPELINE_JOB_STATUS) - throw BuildFailureException( - errorType = ErrorType.SYSTEM, - errorCode = UNABLE_GET_PIPELINE_JOB_STATUS.toInt(), - formatErrorMessage = errorMessage, - errorMessage = errorMessage - ) - } + val (startBuildTask, buildContainer) = getContainerStartupInfo(event) var needStart = true if (event.executeCount != startBuildTask.executeCount) { @@ -206,6 +187,11 @@ class DispatchService constructor( fun onContainerFailure(event: PipelineAgentStartupEvent, e: BuildFailureException) { logger.warn("[${event.buildId}|${event.vmSeqId}] Container startup failure") try { + val (startBuildTask, buildContainer) = getContainerStartupInfo(event) + if (buildContainer.status.isCancel() || startBuildTask.status.isCancel()) { + return + } + client.get(ServiceBuildResource::class).setVMStatus( projectId = event.projectId, pipelineId = event.pipelineId, @@ -263,6 +249,35 @@ class DispatchService constructor( } } + private fun getContainerStartupInfo( + event: PipelineAgentStartupEvent + ): Pair { + // 判断流水线当前container是否在运行中 + val statusResult = client.get(ServicePipelineTaskResource::class).getContainerStartupInfo( + projectId = event.projectId, + buildId = event.buildId, + containerId = event.containerId, + taskId = VMUtils.genStartVMTaskId(event.containerId) + ) + val startBuildTask = statusResult.data?.startBuildTask + val buildContainer = statusResult.data?.buildContainer + if (statusResult.isNotOk() || startBuildTask == null || buildContainer == null) { + logger.warn( + "The build event($event) fail to check if pipeline task is running " + + "because of statusResult(${statusResult.message})" + ) + val errorMessage = I18nUtil.getCodeLanMessage(UNABLE_GET_PIPELINE_JOB_STATUS) + throw BuildFailureException( + errorType = ErrorType.SYSTEM, + errorCode = UNABLE_GET_PIPELINE_JOB_STATUS.toInt(), + formatErrorMessage = errorMessage, + errorMessage = errorMessage + ) + } + + return Pair(startBuildTask, buildContainer) + } + private fun finishBuild(vmSeqId: String, buildId: String, executeCount: Int) { val result = redisOperation.hget(secretInfoRedisKey(buildId), secretInfoRedisMapKey(vmSeqId, executeCount)) if (result != null) { diff --git a/src/backend/ci/core/common/common-event/src/main/kotlin/com/tencent/devops/common/event/dispatcher/pipeline/mq/MQ.kt b/src/backend/ci/core/common/common-event/src/main/kotlin/com/tencent/devops/common/event/dispatcher/pipeline/mq/MQ.kt index 919c6ffd1b1..a7ac05e342e 100644 --- a/src/backend/ci/core/common/common-event/src/main/kotlin/com/tencent/devops/common/event/dispatcher/pipeline/mq/MQ.kt +++ b/src/backend/ci/core/common/common-event/src/main/kotlin/com/tencent/devops/common/event/dispatcher/pipeline/mq/MQ.kt @@ -77,9 +77,11 @@ object MQ { const val QUEUE_PIPELINE_BUILD_MONITOR = "q.engine.pipeline.listener.monitor" const val ROUTE_PIPELINE_BUILD_HEART_BEAT = "r.engine.pipeline.build.hb" const val QUEUE_PIPELINE_BUILD_HEART_BEAT = "q.engine.pipeline.build.hb" + // 构建产生的审核通知类队列 const val ROUTE_PIPELINE_BUILD_NOTIFY = "r.engine.pipeline.build.notify" const val QUEUE_PIPELINE_BUILD_NOTIFY = "q.engine.pipeline.build.notify" + // 构建状态Websocket推送解耦 const val ROUTE_PIPELINE_BUILD_WEBSOCKET = "r.engine.pipeline.build.websocket" const val QUEUE_PIPELINE_BUILD_WEBSOCKET = "q.engine.pipeline.build.websocket" @@ -278,6 +280,7 @@ object MQ { // 蓝盾构建结束后metrics数据上报事件广播 const val EXCHANGE_BUILD_END_METRICS_DATA_REPORT_FANOUT = "e.engine.build.end.metrics.data.report.fanout" + // 流水线标签变化metrics数据同步广播 const val EXCHANGE_PIPELINE_LABEL_CHANGE_METRICS_DATA_SYNC_FANOUT = "e.pipeline.label.change.metrics.data.sync.fanout" @@ -324,17 +327,23 @@ object MQ { const val EXCHANGE_PROJECT_USER_DAILY_FANOUT = "e.metrics.project.user.daily.exchange.fanout" const val QUEUE_PROJECT_USER_DAILY_METRICS = "q.metrics.project.user.daily.queue" + // 项目启用同步组和成员事件 + const val QUEUE_PROJECT_ENABLED_SYNC_GROUP_AND_MEMBER = "q.project.enabled.sync.group.and.member" + // 数据库分片 const val EXCHANGE_SHARDING_ROUTING_RULE_FANOUT = "e.sharding.routing.rule.exchange.fanout" // pac每条流水线触发事件 const val EXCHANGE_PIPELINE_YAML_LISTENER = "e.pipeline.yaml.listener" + // pac开启流水线事件 const val ROUTE_PIPELINE_YAML_ENABLE_EVENT = "r.pipeline.yaml.enable.event" const val QUEUE_PIPELINE_YAML_ENABLE_EVENT = "q.pipeline.yaml.enable.event" + // pac触发事件 const val ROUTE_PIPELINE_YAML_TRIGGER_EVENT = "r.pipeline.yaml.trigger.event" const val QUEUE_PIPELINE_YAML_TRIGGER_EVENT = "q.pipeline.yaml.trigger.event" + // pac关闭流水线事件 const val ROUTE_PIPELINE_YAML_DISABLE_EVENT = "r.pipeline.yaml.disable.event" const val QUEUE_PIPELINE_YAML_DISABLE_EVENT = "q.pipeline.yaml.disable.event" diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelCreate.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelCreate.kt index 0f19dcd012d..7accac9abfc 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelCreate.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelCreate.kt @@ -35,20 +35,22 @@ 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.BuildFormProperty +import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting import com.tencent.devops.common.pipeline.pojo.element.Element +import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildAtomElement import com.tencent.devops.common.pipeline.pojo.element.trigger.ManualTriggerElement +import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType +import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.process.api.user.UserPipelineGroupResource import com.tencent.devops.process.engine.common.VMUtils import com.tencent.devops.process.pojo.classify.PipelineGroup import com.tencent.devops.process.pojo.classify.PipelineGroupCreate import com.tencent.devops.process.pojo.classify.PipelineLabelCreate -import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting -import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType -import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting import com.tencent.devops.process.yaml.creator.inner.ModelCreateEvent import com.tencent.devops.process.yaml.pojo.QualityElementInfo import com.tencent.devops.process.yaml.v2.models.ScriptBuildYaml +import com.tencent.devops.store.api.atom.ServiceMarketAtomResource import java.util.concurrent.TimeUnit import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired @@ -142,16 +144,18 @@ class ModelCreate @Autowired constructor( ) ) } + val model = Model( + name = modelName, + desc = "", + stages = stageList, + labels = labelList, + instanceFromTemplate = false, + pipelineCreator = event.userId + ) + modelInstallAtom(model, event.projectCode, event.elementInstallUserId) return PipelineModelAndSetting( - model = Model( - name = modelName, - desc = "", - stages = stageList, - labels = labelList, - instanceFromTemplate = false, - pipelineCreator = event.userId - ), + model = model, setting = PipelineSetting( concurrencyGroup = yaml.concurrency?.group, // Cancel-In-Progress 配置group后默认为true @@ -172,6 +176,27 @@ class ModelCreate @Autowired constructor( ) } + @Suppress("NestedBlockDepth") + private fun modelInstallAtom(model: Model, projectId: String, elementInstallUserId: String) { + val install = client.get(ServiceMarketAtomResource::class).getProjectElements( + projectCode = projectId + ).data?.keys ?: emptyList() + model.stages.forEach { stage -> + stage.containers.forEach { container -> + container.elements.forEach { element -> + if (element is MarketBuildAtomElement && element.getAtomCode() !in install) { + ModelCommon.installMarketAtom( + client = client, + projectCode = projectId, + userId = elementInstallUserId, + atomCode = element.getAtomCode() + ) + } + } + } + } + } + @Suppress("NestedBlockDepth") private fun preparePipelineLabels( event: ModelCreateEvent, diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelElement.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelElement.kt index 0407c6673ac..d34a467f02a 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelElement.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/creator/ModelElement.kt @@ -118,14 +118,6 @@ class ModelElement @Autowired(required = false) constructor( element.canRetry = false element.customEnv = ModelCommon.getCustomEnv(step.env) elementList.add(element) - if (element is MarketBuildAtomElement) { - ModelCommon.installMarketAtom( - client = client, - projectCode = event.projectCode, - userId = event.elementInstallUserId, - atomCode = element.getAtomCode() - ) - } } } @@ -177,6 +169,7 @@ class ModelElement @Autowired(required = false) constructor( scriptType = BuildScriptType.BAT, script = step.run ) + else -> linux } } diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt index e31089a7c5a..b99fb572a33 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt @@ -309,9 +309,9 @@ class ContainerTransfer @Autowired(required = false) constructor( } private fun makeJobTimeout(controlOption: JobControlOption?): String? { - return controlOption?.timeoutVar.nullIfDefault( + return (controlOption?.timeoutVar ?: controlOption?.timeout?.toString()).nullIfDefault( VariableDefault.DEFAULT_JOB_MAX_RUNNING_MINUTES.toString() - ) ?: controlOption?.timeout.nullIfDefault(VariableDefault.DEFAULT_JOB_MAX_RUNNING_MINUTES)?.toString() + ) } @Suppress("UNCHECKED_CAST") @@ -426,8 +426,8 @@ class ContainerTransfer @Autowired(required = false) constructor( null }, timeoutMinutes = if (resource.queueEnable) { - resource.timeoutVar.nullIfDefault(DEFAULT_MUTEX_TIMEOUT_MINUTES.toString()) - ?: resource.timeout.nullIfDefault(DEFAULT_MUTEX_TIMEOUT_MINUTES)?.toString() + (resource.timeoutVar ?: resource.timeout.toString()) + .nullIfDefault(DEFAULT_MUTEX_TIMEOUT_MINUTES.toString()) } else { null } diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ElementTransfer.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ElementTransfer.kt index c1f7d1ebfe4..65e6b846571 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ElementTransfer.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ElementTransfer.kt @@ -124,7 +124,7 @@ class ElementTransfer @Autowired(required = false) constructor( if (element is ManualTriggerElement) { triggerOn.value.manual = ManualRule( name = element.name, - enable = element.isElementEnable().nullIfDefault(true), + enable = element.elementEnabled().nullIfDefault(true), canElementSkip = element.canElementSkip.nullIfDefault(false), useLatestParameters = element.useLatestParameters.nullIfDefault(false) ) @@ -152,10 +152,18 @@ class ElementTransfer @Autowired(required = false) constructor( else -> return@m "" } } - val (repoHashId, repoName) = if (element.repositoryType == TriggerRepositoryType.SELF) { - Pair(null, null) - } else { - Pair(element.repoHashId, element.repoName) + // ui->code,repositoryType为null时,repoType才需要在code模式下展示 + val (repoType, repoHashId, repoName) = when { + element.repositoryType == TriggerRepositoryType.ID && !element.repoHashId.isNullOrBlank() -> + Triple(null, element.repoHashId, null) + + element.repositoryType == TriggerRepositoryType.NAME && !element.repoName.isNullOrBlank() -> + Triple(null, null, element.repoName) + + element.repositoryType == TriggerRepositoryType.SELF -> + Triple(null, null, null) + + else -> Triple(TriggerRepositoryType.NONE.name, null, null) } schedules.add( SchedulesRule( @@ -166,17 +174,18 @@ class ElementTransfer @Autowired(required = false) constructor( } else { element.advanceExpression }, + repoType = repoType, repoId = repoHashId, repoName = repoName, branches = element.branches, always = (element.noScm != true).nullIfDefault(false), - enable = element.isElementEnable().nullIfDefault(true) + enable = element.elementEnabled().nullIfDefault(true) ) ) return@forEach } if (element is RemoteTriggerElement) { - triggerOn.value.remote = if (element.isElementEnable()) { + triggerOn.value.remote = if (element.elementEnabled()) { RemoteRule(element.name, EnableType.TRUE.value) } else { RemoteRule(element.name, EnableType.FALSE.value) @@ -213,7 +222,7 @@ class ElementTransfer @Autowired(required = false) constructor( elements = gitElement, projectId = projectId, aspectWrapper = aspectWrapper, - defaultName = "Git事件触发" + defaultName = "Git" ) res.putAll(gitTrigger.groupBy { ScmType.CODE_GIT }) } @@ -227,7 +236,7 @@ class ElementTransfer @Autowired(required = false) constructor( elements = tGitElement, projectId = projectId, aspectWrapper = aspectWrapper, - defaultName = "TGit事件触发" + defaultName = "TGit" ) res.putAll(gitTrigger.groupBy { ScmType.CODE_TGIT }) } @@ -241,7 +250,7 @@ class ElementTransfer @Autowired(required = false) constructor( elements = githubElement, projectId = projectId, aspectWrapper = aspectWrapper, - defaultName = "GitHub事件触发" + defaultName = "GitHub" ) res.putAll(gitTrigger.groupBy { ScmType.GITHUB }) } @@ -255,7 +264,7 @@ class ElementTransfer @Autowired(required = false) constructor( elements = svnElement, projectId = projectId, aspectWrapper = aspectWrapper, - defaultName = "SVN事件触发" + defaultName = "SVN" ) res.putAll(gitTrigger.groupBy { ScmType.CODE_SVN }) } @@ -269,7 +278,7 @@ class ElementTransfer @Autowired(required = false) constructor( elements = p4Element, projectId = projectId, aspectWrapper = aspectWrapper, - defaultName = "P4事件触发" + defaultName = "P4" ) res.putAll(gitTrigger.groupBy { ScmType.CODE_P4 }) } @@ -283,7 +292,7 @@ class ElementTransfer @Autowired(required = false) constructor( elements = gitlabElement, projectId = projectId, aspectWrapper = aspectWrapper, - defaultName = "Gitlab变更触发" + defaultName = "Gitlab" ) res.putAll(gitTrigger.groupBy { ScmType.CODE_GITLAB }) } @@ -553,10 +562,11 @@ class ElementTransfer @Autowired(required = false) constructor( else -> element.transferYaml(transferCache.getAtomDefaultValue(uses)) }?.apply { - this.enable = element.isElementEnable().nullIfDefault(true) - this.timeoutMinutes = element.additionalOptions?.timeoutVar.nullIfDefault( - VariableDefault.DEFAULT_TASK_TIME_OUT.toString() - ) ?: element.additionalOptions?.timeout.nullIfDefault(VariableDefault.DEFAULT_TASK_TIME_OUT)?.toString() + this.enable = element.elementEnabled().nullIfDefault(true) + this.timeoutMinutes = + (element.additionalOptions?.timeoutVar ?: element.additionalOptions?.timeout?.toString()).nullIfDefault( + VariableDefault.DEFAULT_TASK_TIME_OUT.toString() + ) this.continueOnError = when { element.additionalOptions?.manualSkip == true -> Step.ContinueOnErrorType.MANUAL_SKIP.alis diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt index 2cd0896da97..2736ce93878 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt @@ -298,6 +298,7 @@ class StageTransfer @Autowired(required = false) constructor( } } return PreStage( + enable = stage.stageEnabled().nullIfDefault(true), name = stage.name, label = maskYamlStageLabel(stage.tag).ifEmpty { null }, ifField = when (stage.stageControlOption?.runCondition) { diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TransferMapper.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TransferMapper.kt index ef893ff2781..ef96d793522 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TransferMapper.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TransferMapper.kt @@ -572,6 +572,7 @@ object TransferMapper { * 2.保留锚点信息 * */ fun mergeYaml(old: String, new: String): String { + if (old.isBlank()) return new val oldE = getYamlFactory().parse(old.reader()).toList() val newL = getYamlFactory().parse(new.reader()).toList() diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TriggerTransfer.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TriggerTransfer.kt index 4334119a069..41a6a32348d 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TriggerTransfer.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/TriggerTransfer.kt @@ -160,7 +160,8 @@ class TriggerTransfer @Autowired(required = false) constructor( repositoryName = triggerOn.repoName, enableThirdFilter = !mr.custom?.url.isNullOrBlank(), thirdUrl = mr.custom?.url, - thirdSecretToken = mr.custom?.credentials + thirdSecretToken = mr.custom?.credentials, + skipWip = mr.skipWip ).checkTriggerElementEnable(mr.enable).apply { version = "2.*" } @@ -296,11 +297,13 @@ class TriggerTransfer @Autowired(required = false) constructor( custom = if (git.enableThirdFilter == true) CustomFilter( url = git.thirdUrl, credentials = git.thirdSecretToken - ) else null + ) else null, + skipWip = git.skipWip ) CodeEventType.MERGE_REQUEST_ACCEPT -> throw PipelineTransferException( - errorCode = CommonMessageCode.MR_ACCEPT_EVENT_NOT_SUPPORT_TRANSFER + errorCode = CommonMessageCode.MR_ACCEPT_EVENT_NOT_SUPPORT_TRANSFER, + params = arrayOf(git.name) ) CodeEventType.REVIEW -> nowExist.review = ReviewRule( @@ -462,7 +465,8 @@ class TriggerTransfer @Autowired(required = false) constructor( ), eventType = CodeEventType.MERGE_REQUEST, repositoryType = repositoryType, - repositoryName = triggerOn.repoName + repositoryName = triggerOn.repoName, + skipWip = mr.skipWip ) ) ).checkTriggerElementEnable(mr.enable).apply { @@ -718,6 +722,9 @@ class TriggerTransfer @Autowired(required = false) constructor( !timer.repoName.isNullOrBlank() -> TriggerRepositoryType.NAME + timer.repoType == TriggerRepositoryType.NONE.name -> + null + // code -> ui,默认监听PAC代码库 else -> TriggerRepositoryType.SELF } elementQueue.add( @@ -761,7 +768,7 @@ class TriggerTransfer @Autowired(required = false) constructor( triggerOn.push?.let { push -> elementQueue.add( CodeGitlabWebHookTriggerElement( - name = push.name ?: "Gitlab变更触发", + name = push.name ?: "Gitlab事件触发", branchName = push.branches.nonEmptyOrNull()?.join(), excludeBranchName = push.branchesIgnore.nonEmptyOrNull()?.join(), includePaths = push.paths.nonEmptyOrNull()?.join(), @@ -771,10 +778,15 @@ class TriggerTransfer @Autowired(required = false) constructor( pathFilterType = push.pathFilterType?.let { PathFilterType.valueOf(it) } ?: PathFilterType.NamePrefixFilter, eventType = CodeEventType.PUSH, - // todo action + includeMrAction = push.action ?: listOf( + TGitPushActionType.PUSH_FILE.value, + TGitPushActionType.NEW_BRANCH.value + ), repositoryType = repositoryType, repositoryName = triggerOn.repoName - ).checkTriggerElementEnable(push.enable) + ).checkTriggerElementEnable(push.enable).apply { + version = "2.*" + } ) } @@ -796,7 +808,7 @@ class TriggerTransfer @Autowired(required = false) constructor( triggerOn.mr?.let { mr -> elementQueue.add( CodeGitlabWebHookTriggerElement( - name = mr.name ?: "Gitlab变更触发", + name = mr.name ?: "Gitlab事件触发", branchName = mr.targetBranches.nonEmptyOrNull()?.join(), excludeBranchName = mr.targetBranchesIgnore.nonEmptyOrNull()?.join(), includeSourceBranchName = mr.sourceBranches.nonEmptyOrNull()?.join(), @@ -808,11 +820,17 @@ class TriggerTransfer @Autowired(required = false) constructor( block = mr.blockMr, pathFilterType = mr.pathFilterType?.let { PathFilterType.valueOf(it) } ?: PathFilterType.NamePrefixFilter, - // todo action + includeMrAction = mr.action ?: listOf( + TGitMrEventAction.OPEN.value, + TGitMrEventAction.REOPEN.value, + TGitMrEventAction.PUSH_UPDATE.value + ), eventType = CodeEventType.MERGE_REQUEST, repositoryType = repositoryType, repositoryName = triggerOn.repoName - ).checkTriggerElementEnable(mr.enable) + ).checkTriggerElementEnable(mr.enable).apply { + version = "2.*" + } ) } } diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/pojo/WebHookTriggerElementChanger.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/pojo/WebHookTriggerElementChanger.kt index aaeef46ac6d..dca20aa8069 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/pojo/WebHookTriggerElementChanger.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/pojo/WebHookTriggerElementChanger.kt @@ -100,7 +100,9 @@ data class WebHookTriggerElementChanger( @get:Schema(title = "第三方应用鉴权token") val thirdSecretToken: String? = null, @get:Schema(title = "是否启用插件") - val enable: Boolean + val enable: Boolean, + @get:Schema(title = "跳过WIP") + val skipWip: Boolean? = false ) { constructor(data: CodeGitWebHookTriggerElement) : this( name = data.name, @@ -133,7 +135,8 @@ data class WebHookTriggerElementChanger( enableThirdFilter = data.enableThirdFilter, thirdUrl = data.thirdUrl, thirdSecretToken = data.thirdSecretToken, - enable = data.isElementEnable() + enable = data.elementEnabled(), + skipWip = data.skipWip ) constructor(data: CodeTGitWebHookTriggerElement) : this( @@ -165,7 +168,8 @@ data class WebHookTriggerElementChanger( includeMrAction = data.data.input.includeMrAction, includePushAction = data.data.input.includePushAction, enableThirdFilter = data.data.input.enableThirdFilter, - enable = data.isElementEnable() + enable = data.elementEnabled(), + skipWip = data.data.input.skipWip ) constructor(data: CodeGithubWebHookTriggerElement) : this( @@ -196,7 +200,7 @@ data class WebHookTriggerElementChanger( includeMrAction = data.includeMrAction, includePushAction = data.includePushAction, enableThirdFilter = data.enableThirdFilter, - enable = data.isElementEnable() + enable = data.elementEnabled() ) constructor(data: CodeSVNWebHookTriggerElement) : this( @@ -210,7 +214,7 @@ data class WebHookTriggerElementChanger( eventType = CodeEventType.POST_COMMIT, repositoryType = data.repositoryType, repositoryName = data.repositoryName, - enable = data.isElementEnable() + enable = data.elementEnabled() ) constructor(data: CodeP4WebHookTriggerElement) : this( @@ -221,7 +225,7 @@ data class WebHookTriggerElementChanger( eventType = data.data.input.eventType, repositoryType = data.data.input.repositoryType, repositoryName = data.data.input.repositoryName, - enable = data.isElementEnable() + enable = data.elementEnabled() ) constructor(data: CodeGitlabWebHookTriggerElement) : this( @@ -242,6 +246,8 @@ data class WebHookTriggerElementChanger( excludeTagName = data.excludeTagName, excludeSourceBranchName = data.excludeSourceBranchName, includeSourceBranchName = data.includeSourceBranchName, - enable = data.isElementEnable() + includeMrAction = data.includeMrAction, + includePushAction = data.includePushAction, + enable = data.elementEnabled() ) } diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/image/PoolType.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/image/PoolType.kt index 14c42e48d71..2180c19db7e 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/image/PoolType.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/image/PoolType.kt @@ -60,7 +60,7 @@ enum class PoolType { } override fun validatePool(pool: Pool) { - if (null == pool.container) { + if (null == pool.container && pool.image == null) { throw OperationException("当pool.type=$this, container参数不能为空") } } diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/MrRule.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/MrRule.kt index 63acc584f17..13720b02a03 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/MrRule.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/MrRule.kt @@ -88,5 +88,9 @@ data class MrRule( @get:Schema(title = "custom-filter") @JsonProperty("custom-filter") - val custom: CustomFilter? = null + val custom: CustomFilter? = null, + + @JsonProperty("skip-wip") + @get:Schema(title = "skip-wip") + var skipWip: Boolean? = null ) diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/SchedulesRule.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/SchedulesRule.kt index d371bbf181d..dcada0d2f90 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/SchedulesRule.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/on/SchedulesRule.kt @@ -44,6 +44,9 @@ data class SchedulesRule( val cron: Any? = null, val interval: Interval? = null, + @get:Schema(title = "repo-type") + @JsonProperty("repo-type") + val repoType: String? = null, @get:Schema(title = "repo-id") @JsonProperty("repo-id") val repoId: String? = null, diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json b/src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json index 377409788a0..7c83b104a9b 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json @@ -255,6 +255,9 @@ "type" : "string" } } + }, + "skip-wip" : { + "type" : "boolean" } } } ] @@ -294,6 +297,9 @@ } } }, + "repo-type" : { + "enum" : [ "ID", "NAME", "SELF", "NONE" ] + }, "repo-id" : { "type" : "string" }, @@ -347,6 +353,9 @@ } } }, + "repo-type" : { + "enum" : [ "ID", "NAME", "SELF", "NONE" ] + }, "repo-id" : { "type" : "string" }, @@ -937,6 +946,9 @@ "type" : "string" } } + }, + "skip-wip" : { + "type" : "boolean" } } } ] @@ -976,6 +988,9 @@ } } }, + "repo-type" : { + "enum" : [ "ID", "NAME", "SELF", "NONE" ] + }, "repo-id" : { "type" : "string" }, @@ -1029,6 +1044,9 @@ } } }, + "repo-type" : { + "enum" : [ "ID", "NAME", "SELF", "NONE" ] + }, "repo-id" : { "type" : "string" }, @@ -1514,10 +1532,10 @@ } } }, - "glob" : { + "filter-rule" : { "type" : "string" }, - "properties" : { + "metadata" : { "type" : "object" }, "payload" : { @@ -1673,10 +1691,10 @@ } } }, - "glob" : { + "filter-rule" : { "type" : "string" }, - "properties" : { + "metadata" : { "type" : "object" }, "payload" : { @@ -2205,8 +2223,8 @@ "description" : { "type" : "string" }, - "send-markdown" : { - "type" : "boolean" + "content-format" : { + "enum" : [ "markdown", "text" ] }, "notify-type" : { "type" : "array", @@ -2214,6 +2232,12 @@ "type" : "string" } }, + "chat-id" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "notify-groups" : { "type" : "array", "items" : { diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/AgentReuseMutex.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/AgentReuseMutex.kt index 9b5f7aba172..30facb766aa 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/AgentReuseMutex.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/AgentReuseMutex.kt @@ -59,7 +59,7 @@ data class AgentReuseMutex( "lock:agent:reuse:project:$projectId:agent:$agentId:queue" fun genAgentReuseMutexLinkTipKey(buildId: String): String { - return "linkTip:$buildId" + return "agent:reuse:linkTip:$buildId" } } } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Container.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Container.kt index 9ca785e59d7..c23ad0bccfa 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Container.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Container.kt @@ -107,5 +107,7 @@ interface Container : IModelTemplate { fun fetchMatrixContext(): Map? - fun isContainerEnable(): Boolean + fun containerEnabled(): Boolean + + fun setContainerEnable(enable: Boolean) } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/NormalContainer.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/NormalContainer.kt index 755981bd40f..84e80062a37 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/NormalContainer.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/NormalContainer.kt @@ -134,10 +134,14 @@ data class NormalContainer( return matrixContext } - override fun isContainerEnable(): Boolean { + override fun containerEnabled(): Boolean { return jobControlOption?.enable ?: true } + override fun setContainerEnable(enable: Boolean) { + jobControlOption = jobControlOption?.copy(enable = enable) ?: JobControlOption(enable) + } + override fun transformCompatibility() { if (jobControlOption?.timeoutVar.isNullOrBlank()) { jobControlOption?.timeoutVar = jobControlOption?.timeout.toString() diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Stage.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Stage.kt index ee5cb554938..02c260d71df 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Stage.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/Stage.kt @@ -106,7 +106,7 @@ data class Stage( } } - fun isStageEnable(): Boolean { + fun stageEnabled(): Boolean { return stageControlOption?.enable ?: true } } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/TriggerContainer.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/TriggerContainer.kt index 1a8ea378f51..cacbe97fbd9 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/TriggerContainer.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/TriggerContainer.kt @@ -55,7 +55,7 @@ data class TriggerContainer( @get:Schema(title = "参数化构建", required = false) var params: List = listOf(), @get:Schema(title = "模板参数构建", required = false) - val templateParams: List? = null, + var templateParams: List? = null, @get:Schema(title = "构建版本号", required = false) var buildNo: BuildNo? = null, @get:Schema(title = @@ -102,10 +102,12 @@ data class TriggerContainer( override fun fetchMatrixContext(): Map? = null - override fun isContainerEnable(): Boolean { + override fun containerEnabled(): Boolean { return true } + override fun setContainerEnable(enable: Boolean) = Unit + override fun transformCompatibility() { super.transformCompatibility() } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/VMBuildContainer.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/VMBuildContainer.kt index 71719508b5f..ce5fcb100d1 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/VMBuildContainer.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/VMBuildContainer.kt @@ -164,10 +164,14 @@ data class VMBuildContainer( return matrixContext } - override fun isContainerEnable(): Boolean { + override fun containerEnabled(): Boolean { return jobControlOption?.enable ?: true } + override fun setContainerEnable(enable: Boolean) { + jobControlOption = jobControlOption?.copy(enable = enable) ?: JobControlOption(enable) + } + override fun transformCompatibility() { if (jobControlOption?.timeoutVar.isNullOrBlank()) { jobControlOption?.timeoutVar = jobControlOption?.timeout.toString() diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt index a2c6dae9966..958c099aeda 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt @@ -43,6 +43,8 @@ interface ModelCheckPlugin { /** * 检查[model]编排的完整性，并返回[JobSize + ElementSize = MetaSize]所有元素数量 + * @param userId 操作人 + * @param oauthUser 当前流水线权限代持人 * @throws RuntimeException 子类 将检查失败或异常的以[ErrorCodeException]类抛出 */ @Throws(ErrorCodeException::class) @@ -51,6 +53,7 @@ interface ModelCheckPlugin { projectId: String?, userId: String, isTemplate: Boolean = false, + oauthUser: String? = null, pipelineId: String = "" ): Int diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/TemplateInstanceCreateRequest.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/TemplateInstanceCreateRequest.kt index c9febe8f1a4..c9bea63c3e8 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/TemplateInstanceCreateRequest.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/TemplateInstanceCreateRequest.kt @@ -47,8 +47,6 @@ data class TemplateInstanceCreateRequest( var instanceType: String? = PipelineInstanceTypeEnum.FREEDOM.type, @get:Schema(title = "是否为空模板", required = false) var emptyTemplate: Boolean? = false, - @get:Schema(title = "标签", required = false) - var labels: List = emptyList(), @get:Schema(title = "静态流水线组", required = false) var staticViews: List = emptyList() ) diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/Element.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/Element.kt index c076fbd5176..c1891fd4c62 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/Element.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/Element.kt @@ -167,7 +167,7 @@ abstract class Element( open fun transferYaml(defaultValue: JSONObject?): PreStep? = null - open fun isElementEnable(): Boolean { + open fun elementEnabled(): Boolean { return additionalOptions?.enable ?: true } @@ -186,11 +186,11 @@ abstract class Element( open fun findFirstTaskIdByStartType(startType: StartType): String = "" /** - * 除非是本身的[isElementEnable]设置为未启用插件会返回SKIP，或者是设置了失败手动跳过 + * 除非是本身的[elementEnabled]设置为未启用插件会返回SKIP，或者是设置了失败手动跳过 * [rerun]允许对状态进行重置为QUEUE */ fun initStatus(rerun: Boolean = false): BuildStatus { - return if (!isElementEnable()) { // 插件未启用 + return if (!elementEnabled()) { // 插件未启用 BuildStatus.SKIP // 跳过 } else if (rerun) { // 除以上指定跳过或不启用的以外，在final Stage 下的插件都需要重置状态 BuildStatus.QUEUE diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateInElement.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateInElement.kt index 24225d49456..296c443232d 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateInElement.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateInElement.kt @@ -61,7 +61,7 @@ data class QualityGateInElement( taskVar[QualityGateInElement::version.name] = version taskVar[KEY_TASK_ATOM] = getTaskAtom() taskVar[QualityGateInElement::classType.name] = getClassType() - taskVar[KEY_ELEMENT_ENABLE] = isElementEnable() + taskVar[KEY_ELEMENT_ENABLE] = elementEnabled() interceptTask?.let { taskVar[QualityGateInElement::interceptTask.name] = it } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateOutElement.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateOutElement.kt index 1949366f60d..eb1fc9d123b 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateOutElement.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateOutElement.kt @@ -61,7 +61,7 @@ data class QualityGateOutElement( taskVar[QualityGateOutElement::version.name] = version taskVar[KEY_TASK_ATOM] = getTaskAtom() taskVar[QualityGateInElement::classType.name] = getClassType() - taskVar[KEY_ELEMENT_ENABLE] = isElementEnable() + taskVar[KEY_ELEMENT_ENABLE] = elementEnabled() interceptTask?.let { taskVar[QualityGateOutElement::interceptTask.name] = it } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitWebHookTriggerElement.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitWebHookTriggerElement.kt index d9eed37355b..2ded15777e0 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitWebHookTriggerElement.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitWebHookTriggerElement.kt @@ -102,7 +102,9 @@ data class CodeGitWebHookTriggerElement( @get:Schema(title = "第三方应用地址") val thirdUrl: String? = null, @get:Schema(title = "第三方应用鉴权token") - val thirdSecretToken: String? = null + val thirdSecretToken: String? = null, + @get:Schema(title = "跳过WIP") + val skipWip: Boolean? = false ) : WebHookTriggerElement(name, id, status) { companion object { const val classType = "codeGitWebHookTrigger" diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitlabWebHookTriggerElement.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitlabWebHookTriggerElement.kt index 2bded0086f2..2e036ac8943 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitlabWebHookTriggerElement.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeGitlabWebHookTriggerElement.kt @@ -79,7 +79,11 @@ data class CodeGitlabWebHookTriggerElement( @get:Schema(title = "用于包含的提交信息", required = false) val includeCommitMsg: String? = null, @get:Schema(title = "用于排除的提交信息", required = false) - val excludeCommitMsg: String? = null + val excludeCommitMsg: String? = null, + @get:Schema(title = "push事件action") + val includePushAction: List? = null, + @get:Schema(title = "mr事件action") + val includeMrAction: List? = null ) : WebHookTriggerElement(name, id, status) { companion object { const val classType = "codeGitlabWebHookTrigger" @@ -100,6 +104,7 @@ data class CodeGitlabWebHookTriggerElement( val props = when (eventType) { CodeEventType.PUSH -> { listOf( + vuexInput(name = "action", value = joinToString(includePushAction)), vuexInput(name = "branchName", value = branchName), vuexInput(name = "excludeBranchName", value = excludeBranchName), vuexInput(name = "includePaths", value = includePaths), @@ -111,6 +116,7 @@ data class CodeGitlabWebHookTriggerElement( CodeEventType.MERGE_REQUEST -> { listOf( + vuexInput(name = "action", value = joinToString(includeMrAction)), vuexInput(name = "branchName", value = branchName), vuexInput(name = "excludeBranchName", value = excludeBranchName), vuexInput( diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeTGitWebHookTriggerElement.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeTGitWebHookTriggerElement.kt index 5a5c7c957ba..416bc6bb411 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeTGitWebHookTriggerElement.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/trigger/CodeTGitWebHookTriggerElement.kt @@ -215,5 +215,7 @@ data class CodeTGitWebHookTriggerInput( @get:Schema(title = "push事件action") val includePushAction: List? = null, @get:Schema(title = "是否启用第三方过滤") - val enableThirdFilter: Boolean? = false + val enableThirdFilter: Boolean? = false, + @get:Schema(title = "跳过WIP") + val skipWip: Boolean? = false ) diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/PipelineSubscriptionType.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/PipelineSubscriptionType.kt index 999a05752bd..13d2add607a 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/PipelineSubscriptionType.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/PipelineSubscriptionType.kt @@ -36,5 +36,7 @@ enum class PipelineSubscriptionType { WECHAT, SMS, WEWORK, - VOICE + VOICE, + // 企业微信群通知 + WEWORK_GROUP } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/Subscription.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/Subscription.kt index e22799a50a4..e5e7a5655c0 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/Subscription.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/setting/Subscription.kt @@ -47,4 +47,18 @@ data class Subscription( val detailFlag: Boolean = false, @get:Schema(title = "自定义通知内容", required = false) val content: String = "" -) +) { + + // 转换企业微信组通知 + fun fixWeworkGroupType(): Subscription { + val fixTypes = if (wechatGroupFlag && !types.contains(PipelineSubscriptionType.WEWORK_GROUP)) { + val fixTypes = mutableSetOf() + fixTypes.addAll(types) + fixTypes.add(PipelineSubscriptionType.WEWORK_GROUP) + fixTypes + } else { + types + } + return this.copy(types = fixTypes, wechatGroupFlag = false) + } +} diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ElementUtils.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ElementUtils.kt index 6961886f2fc..39f08897893 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ElementUtils.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ElementUtils.kt @@ -50,7 +50,7 @@ object ElementUtils { val elementPostInfo = element.additionalOptions?.elementPostInfo val qualityAtomFlag = element is QualityGateInElement || element is QualityGateOutElement // 当插件已启用或者插件是post插件或者插件是质量红线的插件才允许往Task表添加记录 - val enableFlag = stageEnableFlag && containerEnableFlag && element.isElementEnable() + val enableFlag = stageEnableFlag && containerEnableFlag && element.elementEnabled() return enableFlag || elementPostInfo != null || qualityAtomFlag } } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/MatrixContextUtils.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/MatrixContextUtils.kt index 81abbf7385a..8470a397784 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/MatrixContextUtils.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/MatrixContextUtils.kt @@ -124,7 +124,9 @@ object MatrixContextUtils { } """ - private val yaml = Yaml() + private val yaml = ThreadLocal.withInitial { + Yaml() + } private val schemaFactory = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7)) .objectMapper(YamlUtil.getObjectMapper()) @@ -151,7 +153,7 @@ object MatrixContextUtils { if (originYaml.isBlank()) { return } - val yamlJson = YamlUtil.getObjectMapper().readTree(YamlUtil.toYaml(yaml.load(originYaml))).replaceOn() + val yamlJson = YamlUtil.getObjectMapper().readTree(YamlUtil.toYaml(yaml.get().load(originYaml))).replaceOn() schemaFactory.getSchema(schemaJson).check(yamlJson) } diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelUtils.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelUtils.kt index 743a73a78e0..640812cbcaf 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelUtils.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelUtils.kt @@ -83,7 +83,7 @@ object ModelUtils { fun canManualStartup(triggerContainer: TriggerContainer): Boolean { triggerContainer.elements.forEach { - if (it is ManualTriggerElement && it.isElementEnable()) { + if (it is ManualTriggerElement && it.elementEnabled()) { return true } } @@ -92,7 +92,7 @@ object ModelUtils { fun canRemoteStartup(triggerContainer: TriggerContainer): Boolean { triggerContainer.elements.forEach { - if (it is RemoteTriggerElement && it.isElementEnable()) { + if (it is RemoteTriggerElement && it.elementEnabled()) { return true } } @@ -101,7 +101,7 @@ object ModelUtils { fun stageNeedPause(triggerContainer: TriggerContainer): Boolean { triggerContainer.elements.forEach { - if (it is RemoteTriggerElement && it.isElementEnable()) { + if (it is RemoteTriggerElement && it.elementEnabled()) { return true } } diff --git a/src/backend/ci/core/common/common-pipeline/src/test/kotlin/com/tencent/devops/common/pipeline/pojo/element/ElementTest.kt b/src/backend/ci/core/common/common-pipeline/src/test/kotlin/com/tencent/devops/common/pipeline/pojo/element/ElementTest.kt index 92ec65298b1..4fde8155858 100644 --- a/src/backend/ci/core/common/common-pipeline/src/test/kotlin/com/tencent/devops/common/pipeline/pojo/element/ElementTest.kt +++ b/src/backend/ci/core/common/common-pipeline/src/test/kotlin/com/tencent/devops/common/pipeline/pojo/element/ElementTest.kt @@ -28,8 +28,10 @@ package com.tencent.devops.common.pipeline.pojo.element import com.tencent.devops.common.api.util.JsonUtil +import com.tencent.devops.common.pipeline.enums.BuildScriptType import com.tencent.devops.common.pipeline.enums.BuildStatus import com.tencent.devops.common.pipeline.enums.StartType +import com.tencent.devops.common.pipeline.pojo.element.agent.WindowsScriptElement import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildAtomElement import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildLessAtomElement import com.tencent.devops.common.pipeline.pojo.element.trigger.CodeGitWebHookTriggerElement @@ -46,6 +48,21 @@ import org.junit.jupiter.api.Test class ElementTest { + @Test + fun testElementJsonOrder() { + val jsonFile = ElementTest::class.java.classLoader.getResource("windowsElement.json") + val expected = jsonFile!!.readText().trim('\n') + val wel = WindowsScriptElement( + id = "e-326ce1c320204980a3d2a0f241bccd63", + name = "batch script", + script = "unity build", + scriptType = BuildScriptType.BAT + ) + wel.additionalOptions = elementAdditionalOptions() + val actual = JsonUtil.toSortJson(wel) + assertEquals(expected, actual) + } + @Test fun unknownSubType() { val json = """{ @@ -110,15 +127,15 @@ class ElementTest { } @Test - fun isElementEnable() { + fun elementEnabled() { val element = ManualTriggerElement() - assertTrue(element.isElementEnable()) + assertTrue(element.elementEnabled()) element.additionalOptions = null - assertTrue(element.isElementEnable()) + assertTrue(element.elementEnabled()) element.additionalOptions = elementAdditionalOptions(enable = true) - assertTrue(element.isElementEnable()) + assertTrue(element.elementEnabled()) element.additionalOptions = elementAdditionalOptions(enable = false) - assertFalse(element.isElementEnable()) + assertFalse(element.elementEnabled()) } @Test diff --git a/src/backend/ci/core/common/common-pipeline/src/test/resources/windowsElement.json b/src/backend/ci/core/common/common-pipeline/src/test/resources/windowsElement.json new file mode 100644 index 00000000000..b3690d61e1f --- /dev/null +++ b/src/backend/ci/core/common/common-pipeline/src/test/resources/windowsElement.json @@ -0,0 +1,24 @@ +{ + "@type" : "windowsScript", + "additionalOptions" : { + "continueWhenFailed" : false, + "enable" : true, + "enableCustomEnv" : true, + "manualRetry" : true, + "pauseBeforeExec" : false, + "retryCount" : 0, + "retryWhenFailed" : false, + "runCondition" : "PRE_TASK_SUCCESS", + "subscriptionPauseUser" : "", + "timeout" : 100 + }, + "atomCode" : "windowsScript", + "classType" : "windowsScript", + "executeCount" : 1, + "id" : "e-326ce1c320204980a3d2a0f241bccd63", + "name" : "batch script", + "script" : "unity build", + "scriptType" : "BAT", + "taskAtom" : "", + "version" : "1.*" +} diff --git a/src/backend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/utils/code/git/GitUtils.kt b/src/backend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/utils/code/git/GitUtils.kt index c4f3d9589fa..fcfab354bf5 100644 --- a/src/backend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/utils/code/git/GitUtils.kt +++ b/src/backend/ci/core/common/common-scm/src/main/kotlin/com/tencent/devops/scm/utils/code/git/GitUtils.kt @@ -163,4 +163,13 @@ object GitUtils { Regex("not authorized").containsMatchIn(message) -> GIT_LOGIN_FAIL else -> null } + + fun getHttpUrl(sshUrl: String) = when { + sshUrl.startsWith("http://") || sshUrl.startsWith("https://") -> sshUrl + sshUrl.startsWith("git@") -> { + val (domain, repoName) = getDomainAndRepoName(sshUrl) + "https://$domain/$repoName" + } + else -> throw IllegalArgumentException("Unknown code repository URL") + } } diff --git a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/config/CommonConfig.kt b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/config/CommonConfig.kt index 711102d926b..c909ba3de13 100644 --- a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/config/CommonConfig.kt +++ b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/config/CommonConfig.kt @@ -150,4 +150,10 @@ class CommonConfig { */ @Value("\${bkci.supportLanguages:$DEFAULT_LOCALE_LANGUAGE}") val devopsSupportLanguages: String = DEFAULT_LOCALE_LANGUAGE + + /** + * codecc 访问地址 + */ + @Value("\${devopsGateway.codeccHostGateway:#{null}}") + val codeccHostGateway: String? = null } diff --git a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/HomeHostUtil.kt b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/HomeHostUtil.kt index 8c81d2f472f..265122d1671 100644 --- a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/HomeHostUtil.kt +++ b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/HomeHostUtil.kt @@ -67,4 +67,9 @@ object HomeHostUtil { val commonConfig = SpringContextUtil.getBean(CommonConfig::class.java) return getHost(commonConfig.devopsShortUrlGateway!!) } + + fun innerCodeccHost(): String { + val commonConfig = SpringContextUtil.getBean(CommonConfig::class.java) + return commonConfig.codeccHostGateway ?: getHost(commonConfig.devopsHostGateway!!) + } } diff --git a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/LogUtils.kt b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/LogUtils.kt index eacf41db155..094f0e1544b 100644 --- a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/LogUtils.kt +++ b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/LogUtils.kt @@ -64,4 +64,33 @@ object LogUtils { } } } + + /** + * 获取有限长度的日志内容，默认最大长度为16K + * @param logStr 原始日志内容 + * @return 截取后的日志 + */ + fun getLogWithLengthLimit(logStr: String?): String? { + val defaultMaxLength = 16384 + return getLogWithLengthLimit(logStr, defaultMaxLength) + } + + /** + * 获取有限长度的日志内容 + * @param logStr 原始日志内容 + * @param maxLength 最大长度，若小于0则不生效，返回原始日志 + * @return 截取后的日志 + */ + fun getLogWithLengthLimit(logStr: String?, maxLength: Int): String? { + if (logStr == null) { + return null + } + if (maxLength < 0) { + return logStr + } + return if (logStr.length > maxLength) + logStr.substring(0, maxLength) + else + logStr + } } diff --git a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/RetryUtils.kt b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/RetryUtils.kt index 2fe5bcb5a3c..9145b86b265 100644 --- a/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/RetryUtils.kt +++ b/src/backend/ci/core/common/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/RetryUtils.kt @@ -89,6 +89,25 @@ object RetryUtils { } } + fun retry( + retries: Int, + action: () -> Unit + ) { + var remainingRetries = retries + while (remainingRetries > 0) { + try { + action() + return + } catch (ignore: Exception) { + remainingRetries-- + logger.info("retry execute:$remainingRetries|${ignore.message}") + if (remainingRetries == 0) { + throw ignore + } + } + } + } + interface Action { fun execute(): T diff --git a/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/JerseySwaggerConfig.kt b/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/JerseySwaggerConfig.kt index 6d3c42f250e..51353740841 100644 --- a/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/JerseySwaggerConfig.kt +++ b/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/JerseySwaggerConfig.kt @@ -31,9 +31,9 @@ import io.swagger.v3.oas.integration.SwaggerConfiguration import io.swagger.v3.oas.models.OpenAPI import io.swagger.v3.oas.models.info.Info import io.swagger.v3.oas.models.servers.Server +import javax.annotation.PostConstruct import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Value -import javax.annotation.PostConstruct class JerseySwaggerConfig : JerseyConfig() { @@ -70,6 +70,7 @@ class JerseySwaggerConfig : JerseyConfig() { .info(Info().title(applicationDesc).version(applicationVersion)) .addServersItem(Server().url("/$service")) resourcePackages = setOf(packageName) + scannerClass = "com.tencent.devops.common.web.swagger.BkJaxrsAnnotationScanner" } } else { SwaggerConfiguration().apply { @@ -77,6 +78,7 @@ class JerseySwaggerConfig : JerseyConfig() { .info(Info().title(applicationDesc).version(applicationVersion)) .addServersItem(Server().url("/")) resourcePackages = setOf(packageName) + scannerClass = "com.tencent.devops.common.web.swagger.BkJaxrsAnnotationScanner" } } } diff --git a/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/swagger/BkJaxrsAnnotationScanner.kt b/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/swagger/BkJaxrsAnnotationScanner.kt new file mode 100644 index 00000000000..51662f84fbd --- /dev/null +++ b/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/swagger/BkJaxrsAnnotationScanner.kt @@ -0,0 +1,29 @@ +package com.tencent.devops.common.web.swagger + +import io.swagger.v3.jaxrs2.integration.JaxrsAnnotationScanner +import io.swagger.v3.jaxrs2.integration.JaxrsApplicationAndAnnotationScanner +import org.springframework.aop.support.AopUtils + +/** + * 被JerseySwaggerConfig使用到 , 勿删 + */ +class BkJaxrsAnnotationScanner : JaxrsAnnotationScanner() { + override fun classes(): MutableSet> { + val classes = super.classes() + + val singletons = application.singletons + if (singletons != null) { + for (o in singletons) { + val sourceClass = if (AopUtils.isAopProxy(o)) { + AopUtils.getTargetClass(o) + } else { + o.javaClass + } + if (!isIgnored(sourceClass.name)) { + classes.add(sourceClass) + } + } + } + return classes + } +} \ No newline at end of file diff --git a/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/utils/I18nUtil.kt b/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/utils/I18nUtil.kt index 587d7789f91..f8630486012 100644 --- a/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/utils/I18nUtil.kt +++ b/src/backend/ci/core/common/common-web/src/main/kotlin/com/tencent/devops/common/web/utils/I18nUtil.kt @@ -103,6 +103,22 @@ object I18nUtil { } } + /** + * 获取蓝鲸标准的语言Header Key + */ + fun getBKLanguageKey(): String { + return BK_LANGUAGE + } + + /** + * 获取Http Cookie中用户携带的语言（蓝鲸标准） + * @return 语言,如果没有,则为空 + */ + fun getBKLanguageFromCookie(): String? { + val request = BkApiUtil.getHttpServletRequest() + return request?.let { CookieUtil.getCookieValue(request, BK_LANGUAGE) } + } + /** * 获取Http Cookie中用户携带的语言 * @return 语言,如果没有,则为空 diff --git a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/enums/WebhookI18nConstants.kt b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/enums/WebhookI18nConstants.kt index 4dcbdcdf679..eff82662b5e 100644 --- a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/enums/WebhookI18nConstants.kt +++ b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/enums/WebhookI18nConstants.kt @@ -144,6 +144,9 @@ object WebhookI18nConstants { // Github Push操作类型不匹配 const val PUSH_ACTION_NOT_MATCH = "bkRepoTriggerPushActionNotMatch" + // WIP阶段不触发 + const val MR_SKIP_WIP = "bkRepoTriggerSkipWipNotMatch" + // 事件回放 const val EVENT_REPLAY_DESC = "bkEventReplayDesc" } diff --git a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/WebHookParams.kt b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/WebHookParams.kt index 60d4b7896a0..838cba39355 100644 --- a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/WebHookParams.kt +++ b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/WebHookParams.kt @@ -73,5 +73,7 @@ data class WebHookParams( var thirdUrl: String? = null, var thirdSecretToken: String? = null, // 插件版本 - var version: String? = null + var version: String? = null, + // 跳过WIP + var skipWip: Boolean? = false ) diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/GitScmService.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/GitScmService.kt index b328aebd683..8f28471308b 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/GitScmService.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/GitScmService.kt @@ -37,6 +37,7 @@ import com.tencent.devops.repository.api.github.ServiceGithubPRResource import com.tencent.devops.repository.api.scm.ServiceGitResource import com.tencent.devops.repository.api.scm.ServiceScmOauthResource import com.tencent.devops.repository.api.scm.ServiceScmResource +import com.tencent.devops.repository.api.scm.ServiceTGitResource import com.tencent.devops.repository.pojo.CodeGitRepository import com.tencent.devops.repository.pojo.CodeGitlabRepository import com.tencent.devops.repository.pojo.CodeTGitRepository @@ -212,16 +213,30 @@ class GitScmService @Autowired constructor( ) for (i in 1..10) { // 反向进行三点比较可以比较出rebase的真实提交 - val result = client.get(ServiceGitResource::class).getChangeFileList( - token = token, - tokenType = tokenType, - gitProjectId = repo.projectName, - from = from, - to = to, - straight = false, - page = i, - pageSize = 100 - ).data ?: emptyList() + val result = if (repo.getScmType() == ScmType.CODE_TGIT) { + client.get(ServiceTGitResource::class).getChangeFileList( + token = token, + tokenType = tokenType, + gitProjectId = repo.projectName, + from = from, + to = to, + straight = false, + page = i, + pageSize = 100, + url = repo.url + ).data + } else { + client.get(ServiceGitResource::class).getChangeFileList( + token = token, + tokenType = tokenType, + gitProjectId = repo.projectName, + from = from, + to = to, + straight = false, + page = i, + pageSize = 100 + ).data + } ?: emptyList() changeSet.addAll( result.map { if (it.deletedFile) { diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/RepoServiceFactory.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/KeywordSkipFilter.kt similarity index 58% rename from src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/RepoServiceFactory.kt rename to src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/KeywordSkipFilter.kt index bea24d3980c..5eb81b2b434 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/RepoServiceFactory.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/KeywordSkipFilter.kt @@ -25,33 +25,34 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.tencent.devops.worker.common.service +package com.tencent.devops.common.webhook.service.code.filter -import com.tencent.devops.common.api.util.PropertyUtil -import java.util.concurrent.ConcurrentHashMap +import org.slf4j.LoggerFactory -object RepoServiceFactory { +class KeywordSkipFilter( + private val pipelineId: String, + private val keyWord: List, + private val enable: Boolean? = true, + private val triggerOnMessage: String?, + private val failedReason: String = "" +) : WebhookFilter { - private val repoServiceMap = ConcurrentHashMap() - - private const val REPO_CLASS_NAME = "repo.class.name" + companion object { + private val logger = LoggerFactory.getLogger(KeywordSkipFilter::class.java) + val KEYWORD_SKIP_CI = listOf("[skip ci]") + val KEYWORD_SKIP_WIP = listOf("[WIP]", "WIP") + } - private const val AGENT_PROPERTIES_FILE_NAME = "/.agent.properties" + override fun doFilter(response: WebhookFilterResponse): Boolean { + logger.info("$pipelineId|triggerOnMessage:$triggerOnMessage|skipWord:$keyWord|enable:$enable") + return when { + enable == false -> true + keyWord.any { triggerOnMessage?.contains(it) == true } -> { + response.failedReason = failedReason + false + } - /** - * 根据配置文件的类名获取实现RepoService的对象 - * @return 实现RepoService的对象 - */ - fun getInstance(): RepoService { - // 从配置文件读取类名 - val className = PropertyUtil.getPropertyValue(REPO_CLASS_NAME, AGENT_PROPERTIES_FILE_NAME) - // 根据类名从缓存中获取实现RepoService的对象 - var repoService = repoServiceMap[className] - if (repoService == null) { - // 通过反射生成对象并放入缓存中 - repoService = Class.forName(className).newInstance() as RepoService - repoServiceMap[className] = repoService + else -> true } - return repoService } } diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitIssueTriggerHandler.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitIssueTriggerHandler.kt index 0f315180639..b8d00c479c0 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitIssueTriggerHandler.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitIssueTriggerHandler.kt @@ -175,6 +175,7 @@ class TGitIssueTriggerHandler( return listOf(actionFilter) } + @Suppress("ComplexMethod") override fun retrieveParams(event: GitIssueEvent, projectId: String?, repository: Repository?): Map { val startParams = mutableMapOf() with(event.objectAttributes) { diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitMrTriggerHandler.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitMrTriggerHandler.kt index 57e3a7c9811..ab1fbe9eccd 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitMrTriggerHandler.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitMrTriggerHandler.kt @@ -49,6 +49,8 @@ import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_MR_URL import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_REPO_URL import com.tencent.devops.common.webhook.annotation.CodeWebhookHandler import com.tencent.devops.common.webhook.enums.WebhookI18nConstants +import com.tencent.devops.common.webhook.enums.code.tgit.TGitMergeActionKind.UPDATE +import com.tencent.devops.common.webhook.enums.code.tgit.TGitMergeActionKind import com.tencent.devops.common.webhook.enums.code.tgit.TGitMrEventAction import com.tencent.devops.common.webhook.pojo.code.BK_REPO_GIT_MANUAL_UNLOCK import com.tencent.devops.common.webhook.pojo.code.BK_REPO_GIT_WEBHOOK_BRANCH @@ -79,7 +81,9 @@ import com.tencent.devops.common.webhook.service.code.EventCacheService import com.tencent.devops.common.webhook.service.code.filter.BranchFilter import com.tencent.devops.common.webhook.service.code.filter.ContainsFilter import com.tencent.devops.common.webhook.service.code.filter.PathFilterFactory -import com.tencent.devops.common.webhook.service.code.filter.SkipCiFilter +import com.tencent.devops.common.webhook.service.code.filter.KeywordSkipFilter +import com.tencent.devops.common.webhook.service.code.filter.KeywordSkipFilter.Companion.KEYWORD_SKIP_CI +import com.tencent.devops.common.webhook.service.code.filter.KeywordSkipFilter.Companion.KEYWORD_SKIP_WIP import com.tencent.devops.common.webhook.service.code.filter.ThirdFilter import com.tencent.devops.common.webhook.service.code.filter.UserFilter import com.tencent.devops.common.webhook.service.code.filter.WebhookFilter @@ -190,6 +194,13 @@ class TGitMrTriggerHandler( webHookParams: WebHookParams ): List { with(webHookParams) { + val wipFilter = KeywordSkipFilter( + pipelineId = pipelineId, + enable = skipWip, + keyWord = KEYWORD_SKIP_WIP, + triggerOnMessage = getMessage(event), + failedReason = I18Variable(WebhookI18nConstants.MR_SKIP_WIP).toJsonStr() + ) val userId = getUsername(event) val userFilter = UserFilter( pipelineId = pipelineId, @@ -235,14 +246,19 @@ class TGitMrTriggerHandler( params = listOf(sourceBranch) ).toJsonStr() ) - val skipCiFilter = SkipCiFilter( + val skipCiFilter = KeywordSkipFilter( pipelineId = pipelineId, + keyWord = KEYWORD_SKIP_CI, triggerOnMessage = event.object_attributes.last_commit.message ) val actionFilter = ContainsFilter( pipelineId = pipelineId, filterName = "mrAction", - triggerOn = TGitMrEventAction.getActionValue(event) ?: "", + triggerOn = if (repository is CodeGitlabRepository && getAction(event) == UPDATE.value) { + TGitMrEventAction.PUSH_UPDATE.value + } else { + TGitMrEventAction.getActionValue(event) + } ?: "", included = convert(includeMrAction).ifEmpty { listOf("empty-action") }, @@ -303,7 +319,7 @@ class TGitMrTriggerHandler( callbackCircuitBreakerRegistry = callbackCircuitBreakerRegistry ) return listOf( - userFilter, targetBranchFilter, + wipFilter, userFilter, targetBranchFilter, sourceBranchFilter, skipCiFilter, pathFilter, commitMessageFilter, actionFilter, thirdFilter ) @@ -359,7 +375,11 @@ class TGitMrTriggerHandler( startParams[PIPELINE_GIT_MR_ACTION] = event.object_attributes.action ?: "" startParams[PIPELINE_GIT_ACTION] = event.object_attributes.action ?: "" startParams[PIPELINE_GIT_EVENT_URL] = event.object_attributes.url ?: "" - startParams[BK_REPO_GIT_WEBHOOK_BRANCH] = event.object_attributes.source_branch + startParams[BK_REPO_GIT_WEBHOOK_BRANCH] = if (getAction(event) == TGitMergeActionKind.MERGE.value) { + event.object_attributes.target_branch + } else { + event.object_attributes.source_branch + } // 有覆盖风险的上下文做二次确认 startParams.putIfEmpty(GIT_MR_NUMBER, event.object_attributes.iid.toString()) startParams.putIfEmpty(PIPELINE_GIT_MR_ID, event.object_attributes.id.toString()) diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitPushTriggerHandler.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitPushTriggerHandler.kt index 0499fbfeddf..f99f4d30d49 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitPushTriggerHandler.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitPushTriggerHandler.kt @@ -66,7 +66,8 @@ import com.tencent.devops.common.webhook.service.code.GitScmService import com.tencent.devops.common.webhook.service.code.filter.BranchFilter import com.tencent.devops.common.webhook.service.code.filter.ContainsFilter import com.tencent.devops.common.webhook.service.code.filter.PathFilterFactory -import com.tencent.devops.common.webhook.service.code.filter.SkipCiFilter +import com.tencent.devops.common.webhook.service.code.filter.KeywordSkipFilter +import com.tencent.devops.common.webhook.service.code.filter.KeywordSkipFilter.Companion.KEYWORD_SKIP_CI import com.tencent.devops.common.webhook.service.code.filter.ThirdFilter import com.tencent.devops.common.webhook.service.code.filter.UserFilter import com.tencent.devops.common.webhook.service.code.filter.WebhookFilter @@ -96,6 +97,10 @@ class TGitPushTriggerHandler( companion object { private val logger = LoggerFactory.getLogger(TGitPushTriggerHandler::class.java) + // 空提交点，可用于推断是新增/删除分支 + // 新增分支 -> before为此值 + // 删除分支 -> after为此值 + const val EMPTY_COMMIT_ID = "0000000000000000000000000000000000000000" } override fun eventClass(): Class { @@ -135,7 +140,11 @@ class TGitPushTriggerHandler( } override fun getAction(event: GitPushEvent): String? { - return event.action_kind + return when { + event.action_kind.isNullOrBlank() -> event.action_kind + event.before == EMPTY_COMMIT_ID -> TGitPushActionType.NEW_BRANCH.value + else -> TGitPushActionType.PUSH_FILE.value + } } override fun getEventDesc(event: GitPushEvent): String { @@ -208,8 +217,9 @@ class TGitPushTriggerHandler( params = listOf(triggerOnBranchName) ).toJsonStr() ) - val skipCiFilter = SkipCiFilter( + val skipCiFilter = KeywordSkipFilter( pipelineId = pipelineId, + keyWord = KEYWORD_SKIP_CI, triggerOnMessage = event.commits?.get(0)?.message ?: "" ) val commits = event.commits diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitWebhookElementParams.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitWebhookElementParams.kt index 4975a48250f..7d4bed77fc2 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitWebhookElementParams.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitWebhookElementParams.kt @@ -76,7 +76,7 @@ class GitWebhookElementParams : ScmWebhookElementParams { - params.includeMrAction = joinToString( + params.includeMrAction = WebhookUtils.joinToString( listOf( CodeGitWebHookTriggerElement.MERGE_ACTION_OPEN, CodeGitWebHookTriggerElement.MERGE_ACTION_REOPEN, @@ -88,7 +88,7 @@ class GitWebhookElementParams : ScmWebhookElementParams { - params.includePushAction = joinToString( + params.includePushAction = WebhookUtils.joinToString( listOf( CodeGitWebHookTriggerElement.PUSH_ACTION_CREATE_BRANCH, CodeGitWebHookTriggerElement.PUSH_ACTION_PUSH_FILE @@ -97,8 +97,8 @@ class GitWebhookElementParams : ScmWebhookElementParams { - params.includeMrAction = joinToString(element.includeMrAction) - params.includePushAction = joinToString(element.includePushAction) + params.includeMrAction = WebhookUtils.joinToString(element.includeMrAction) + params.includePushAction = WebhookUtils.joinToString(element.includePushAction) } } params.eventType = element.eventType @@ -112,26 +112,19 @@ class GitWebhookElementParams : ScmWebhookElementParams?): String { - return if (list.isNullOrEmpty()) { - "" - } else { - list.joinToString(",") - } - } - private fun isBlock(element: CodeGitWebHookTriggerElement): Boolean { return when { element.enableCheck == false || element.eventType != CodeEventType.MERGE_REQUEST -> false diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitlabWebhookElementParams.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitlabWebhookElementParams.kt index cd82a08d8eb..93dcbb7b1ff 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitlabWebhookElementParams.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/param/GitlabWebhookElementParams.kt @@ -28,10 +28,13 @@ package com.tencent.devops.common.webhook.service.code.param import com.tencent.devops.common.api.util.EnvUtils +import com.tencent.devops.common.pipeline.pojo.element.trigger.CodeGitWebHookTriggerElement import com.tencent.devops.common.pipeline.pojo.element.trigger.CodeGitlabWebHookTriggerElement +import com.tencent.devops.common.pipeline.pojo.element.trigger.enums.CodeEventType import com.tencent.devops.common.pipeline.pojo.element.trigger.enums.CodeType import com.tencent.devops.common.pipeline.utils.RepositoryConfigUtils import com.tencent.devops.common.webhook.pojo.code.WebHookParams +import com.tencent.devops.common.webhook.util.WebhookUtils import org.springframework.stereotype.Service @Service @@ -62,10 +65,42 @@ class GitlabWebhookElementParams : ScmWebhookElementParams { + params.includeMrAction = CodeGitWebHookTriggerElement.MERGE_ACTION_MERGE + } + + element.eventType == CodeEventType.MERGE_REQUEST && + !WebhookUtils.isActionGitTriggerVersion(element.version) && + element.includeMrAction == null -> { + params.includeMrAction = WebhookUtils.joinToString( + listOf( + CodeGitWebHookTriggerElement.MERGE_ACTION_OPEN, + CodeGitWebHookTriggerElement.MERGE_ACTION_REOPEN, + CodeGitWebHookTriggerElement.MERGE_ACTION_PUSH_UPDATE + ) + ) + } + + element.eventType == CodeEventType.PUSH && + !WebhookUtils.isActionGitTriggerVersion(element.version) && + element.includePushAction == null -> { + params.includePushAction = WebhookUtils.joinToString( + listOf( + CodeGitWebHookTriggerElement.PUSH_ACTION_CREATE_BRANCH, + CodeGitWebHookTriggerElement.PUSH_ACTION_PUSH_FILE + ) + ) + } + + else -> { + params.includeMrAction = WebhookUtils.joinToString(element.includeMrAction) + params.includePushAction = WebhookUtils.joinToString(element.includePushAction) + } } - params.branchName = EnvUtils.parseEnv(element.branchName!!, variables) + params.branchName = EnvUtils.parseEnv(element.branchName ?: "", variables) params.codeType = CodeType.GITLAB params.eventType = element.eventType params.block = element.block ?: false diff --git a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/util/WebhookUtils.kt b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/util/WebhookUtils.kt index 4ef086b81e4..9fceb0c9d10 100644 --- a/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/util/WebhookUtils.kt +++ b/src/backend/ci/core/common/common-webhook/biz-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/util/WebhookUtils.kt @@ -356,4 +356,12 @@ object WebhookUtils { )) return startParams } + + fun joinToString(list: List?): String { + return if (list.isNullOrEmpty()) { + "" + } else { + list.joinToString(",") + } + } } diff --git a/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/api/service/ServiceDockerImageResource.kt b/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/api/service/ServiceDockerImageResource.kt new file mode 100644 index 00000000000..743c152ec85 --- /dev/null +++ b/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/api/service/ServiceDockerImageResource.kt @@ -0,0 +1,63 @@ +/* + * 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.dispatch.kubernetes.api.service + +import com.tencent.devops.common.api.annotation.ServiceInterface +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.dispatch.kubernetes.pojo.CheckDockerImageRequest +import com.tencent.devops.dispatch.kubernetes.pojo.CheckDockerImageResponse +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +import javax.ws.rs.HeaderParam +import javax.ws.rs.POST +import javax.ws.rs.Path +import javax.ws.rs.Produces +import javax.ws.rs.core.MediaType + +@Tag(name = "SERVICE_DOCKER_IMAGE", description = "镜像-镜像服务") +@Path("/service/docker-image") +@ServiceInterface("dispatch") // 指明接入到哪个微服务 +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface ServiceDockerImageResource { + + @POST + @Path("/checkDockerImage") + @Operation(summary = "检查镜像信息") + fun checkDockerImage( + @Parameter(description = "用户ID", required = true, example = AUTH_HEADER_USER_ID_DEFAULT_VALUE) + @HeaderParam(AUTH_HEADER_USER_ID) + userId: String, + @Parameter(description = "镜像repo", required = true) + checkDockerImageRequestList: List + ): Result> +} diff --git a/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/CheckDockerImageRequest.kt b/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/CheckDockerImageRequest.kt new file mode 100644 index 00000000000..34967482ed3 --- /dev/null +++ b/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/CheckDockerImageRequest.kt @@ -0,0 +1,41 @@ +/* + * 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.dispatch.kubernetes.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +data class CheckDockerImageRequest( + @get:Schema(title = "镜像名称", required = true) + val imageName: String, + @get:Schema(title = "镜像仓库", required = true) + val registryHost: String, + @get:Schema(title = "用户名", required = false) + val registryUser: String?, + @get:Schema(title = "密码", required = false) + val registryPwd: String? +) diff --git a/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/CheckDockerImageResponse.kt b/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/CheckDockerImageResponse.kt new file mode 100644 index 00000000000..111b7791f22 --- /dev/null +++ b/src/backend/ci/core/dispatch/api-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/CheckDockerImageResponse.kt @@ -0,0 +1,66 @@ +/* + * 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.dispatch.kubernetes.pojo + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import io.swagger.v3.oas.annotations.media.Schema + +@JsonIgnoreProperties(ignoreUnknown = true) +@Schema(title = "检查镜像信息返回模型") +data class CheckDockerImageResponse( + @get:Schema(title = "错误代码") + val errorCode: Int, + @get:Schema(title = "错误信息") + val errorMessage: String? = "", + @get:Schema(title = "架构") + val arch: String? = "", + @get:Schema(title = "作者") + val author: String? = "", + @get:Schema(title = "评论") + val comment: String? = "", + @get:Schema(title = "创建时间") + val created: String? = "", + @get:Schema(title = "docker版本") + val dockerVersion: String? = "", + @get:Schema(title = "id") + val id: String? = "", + @get:Schema(title = "操作系统") + val os: String? = "", + @get:Schema(title = "操作系统版本") + val osVersion: String? = "", + @get:Schema(title = "父容器") + val parent: String? = "", + @get:Schema(title = "大小") + val size: Long? = 0, + @get:Schema(title = "仓库标签") + val repoTags: List? = null, + @get:Schema(title = "image存储属性") + val repoDigests: List? = null, + @get:Schema(title = "虚拟大小") + val virtualSize: Long? = 0 +) diff --git a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/bcs/service/BcsContainerService.kt b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/bcs/service/BcsContainerService.kt index 0461b662af0..4b657fbe8e9 100644 --- a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/bcs/service/BcsContainerService.kt +++ b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/bcs/service/BcsContainerService.kt @@ -313,7 +313,7 @@ class BcsContainerService @Autowired constructor( } } - override fun waitTaskFinish(userId: String, taskId: String): DispatchBuildTaskStatus { + override fun waitTaskFinish(userId: String, taskId: String, needProxy: Boolean): DispatchBuildTaskStatus { val startResult = bcsTaskClient.waitTaskFinish(userId, taskId) if (startResult.first == BcsTaskStatusEnum.SUCCEEDED) { return DispatchBuildTaskStatus(DispatchBuildTaskStatusEnum.SUCCEEDED, null) @@ -395,4 +395,8 @@ class BcsContainerService @Autowired constructor( ) ) } + + override fun inspectDockerImage(userId: String, pool: Pool): String { + return "" + } } diff --git a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesBuilderClient.kt b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesBuilderClient.kt index 32016c406b1..b8ee7e906fa 100644 --- a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesBuilderClient.kt +++ b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesBuilderClient.kt @@ -30,10 +30,14 @@ package com.tencent.devops.dispatch.kubernetes.client import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue +import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.OkhttpUtils import com.tencent.devops.common.dispatch.sdk.BuildFailureException import com.tencent.devops.dispatch.kubernetes.pojo.Builder +import com.tencent.devops.dispatch.kubernetes.pojo.Credential import com.tencent.devops.dispatch.kubernetes.pojo.DeleteBuilderParams +import com.tencent.devops.dispatch.kubernetes.pojo.InspectImageCredential +import com.tencent.devops.dispatch.kubernetes.pojo.InspectImageReq import com.tencent.devops.dispatch.kubernetes.pojo.KubernetesBuilderStatus import com.tencent.devops.dispatch.kubernetes.pojo.KubernetesBuilderStatusEnum import com.tencent.devops.dispatch.kubernetes.pojo.KubernetesResult @@ -46,6 +50,7 @@ import com.tencent.devops.dispatch.kubernetes.pojo.getCodeMessage import com.tencent.devops.dispatch.kubernetes.pojo.isRunning import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import java.net.SocketTimeoutException @@ -318,4 +323,57 @@ class KubernetesBuilderClient @Autowired constructor( ) } } + + fun inspectDockerImage( + userId: String, + imageName: String, + credential: Credential + ): String { + val url = "/api/docker/inspect" + val body = InspectImageReq( + name = "${System.currentTimeMillis()}", + ref = imageName, + cred = InspectImageCredential( + username = credential.user, + password = credential.password + ) + ) + + val request = clientCommon.microBaseRequest(url).post(JsonUtil.toJson(body).toRequestBody()).build() + logger.info("$userId inspectImage: $imageName request url: $url, body: $body") + try { + OkhttpUtils.doHttp(request).use { response -> + val responseContent = response.body!!.string() + if (!response.isSuccessful) { + throw BuildFailureException( + errorType = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_ERROR.errorType, + errorCode = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_ERROR.errorCode, + formatErrorMessage = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_ERROR.getErrorMessage(), + errorMessage = "Fail to inspect image, ResponseCode: ${response.code}" + ) + } + logger.info("$userId inspect image: $imageName response: $responseContent") + val responseData: KubernetesResult = objectMapper.readValue(responseContent) + if (responseData.isOk()) { + return responseData.data!!.taskId + } else { + val msg = "${responseData.message ?: responseData.getCodeMessage()}" + throw BuildFailureException( + errorType = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_FAIL.errorType, + errorCode = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_FAIL.errorCode, + formatErrorMessage = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_FAIL.getErrorMessage(), + errorMessage = "Inspect image interface returns a failure：$msg" + ) + } + } + } catch (e: SocketTimeoutException) { + logger.error("$userId inspect image get SocketTimeoutException.", e) + throw BuildFailureException( + errorType = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_FAIL.errorType, + errorCode = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_FAIL.errorCode, + formatErrorMessage = ErrorCodeEnum.BCS_OPERATE_VM_INTERFACE_FAIL.getErrorMessage(), + errorMessage = "Inspect image interface timed out, url: $url" + ) + } + } } diff --git a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesTaskClient.kt b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesTaskClient.kt index 2f9559856c3..04dfb49b75a 100644 --- a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesTaskClient.kt +++ b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/client/KubernetesTaskClient.kt @@ -60,10 +60,16 @@ class KubernetesTaskClient @Autowired constructor( fun getTasksStatus( userId: String, taskId: String, - retryFlag: Int = 3 + retryFlag: Int = 3, + needProxy: Boolean = true ): KubernetesResult { val url = "/api/tasks/$taskId/status" - val request = clientCommon.baseRequest(userId, url).get().build() + val request = if (needProxy) { + clientCommon.baseRequest(userId, url).get().build() + } else { + clientCommon.microBaseRequest(url).get().build() + } + try { OkhttpUtils.doHttp(request).use { response -> val responseContent = response.body!!.string() @@ -100,7 +106,7 @@ class KubernetesTaskClient @Autowired constructor( } } - fun waitTaskFinish(userId: String, taskId: String): Pair { + fun waitTaskFinish(userId: String, taskId: String, needProxy: Boolean): Pair { val startTime = System.currentTimeMillis() loop@ while (true) { if (System.currentTimeMillis() - startTime > 10 * 60 * 1000) { @@ -111,7 +117,7 @@ class KubernetesTaskClient @Autowired constructor( ) } Thread.sleep(1 * 1000) - val (status, errorMsg) = getTaskResult(userId, taskId).apply { + val (status, msg) = getTaskResult(userId, taskId, needProxy).apply { if (first == null) { return Pair(TaskStatusEnum.FAILED, second) } @@ -119,15 +125,23 @@ class KubernetesTaskClient @Autowired constructor( return when { status!!.isRunning() -> continue@loop status.isSuccess() -> { - Pair(TaskStatusEnum.SUCCEEDED, null) + Pair(TaskStatusEnum.SUCCEEDED, msg) } - else -> Pair(status, errorMsg) + else -> Pair(status, msg) } } } - private fun getTaskResult(userId: String, taskId: String): Pair { - val taskResponse = getTasksStatus(userId, taskId) + private fun getTaskResult( + userId: String, + taskId: String, + needProxy: Boolean + ): Pair { + val taskResponse = getTasksStatus( + userId = userId, + taskId = taskId, + needProxy = needProxy + ) val status = TaskStatusEnum.realNameOf(taskResponse.data?.status) if (taskResponse.isNotOk() || taskResponse.data == null) { // 创建失败 @@ -140,6 +154,6 @@ class KubernetesTaskClient @Autowired constructor( return Pair(status, taskResponse.data.detail) } - return Pair(status, null) + return Pair(status, taskResponse.data.detail) } } diff --git a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/InspectImageReq.kt b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/InspectImageReq.kt new file mode 100644 index 00000000000..ad414a3d96c --- /dev/null +++ b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/InspectImageReq.kt @@ -0,0 +1,12 @@ +package com.tencent.devops.dispatch.kubernetes.pojo + +data class InspectImageReq( + val name: String, + val ref: String, + val cred: InspectImageCredential +) + +data class InspectImageCredential( + val username: String, + val password: String +) diff --git a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt index 31e06fe0769..ed74416a5bc 100644 --- a/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt +++ b/src/backend/ci/core/dispatch/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt @@ -53,6 +53,7 @@ import com.tencent.devops.dispatch.kubernetes.pojo.BK_START_BUILD_CONTAINER_FAIL import com.tencent.devops.dispatch.kubernetes.pojo.BuildAndPushImage import com.tencent.devops.dispatch.kubernetes.pojo.BuildAndPushImageInfo import com.tencent.devops.dispatch.kubernetes.pojo.Builder +import com.tencent.devops.dispatch.kubernetes.pojo.Credential import com.tencent.devops.dispatch.kubernetes.pojo.DeleteBuilderParams import com.tencent.devops.dispatch.kubernetes.pojo.DispatchBuildLog import com.tencent.devops.dispatch.kubernetes.pojo.KubernetesBuilderStatusEnum @@ -298,10 +299,10 @@ class KubernetesContainerService @Autowired constructor( } } - override fun waitTaskFinish(userId: String, taskId: String): DispatchBuildTaskStatus { - val startResult = kubernetesTaskClient.waitTaskFinish(userId, taskId) + override fun waitTaskFinish(userId: String, taskId: String, needProxy: Boolean): DispatchBuildTaskStatus { + val startResult = kubernetesTaskClient.waitTaskFinish(userId, taskId, needProxy) return if (startResult.first == TaskStatusEnum.SUCCEEDED) { - DispatchBuildTaskStatus(DispatchBuildTaskStatusEnum.SUCCEEDED, null) + DispatchBuildTaskStatus(DispatchBuildTaskStatusEnum.SUCCEEDED, startResult.second) } else { DispatchBuildTaskStatus(DispatchBuildTaskStatusEnum.FAILED, startResult.second) } @@ -425,6 +426,17 @@ class KubernetesContainerService @Autowired constructor( return DispatchTaskResp(kubernetesJobClient.buildAndPushImage(userId, info)) } + override fun inspectDockerImage(userId: String, pool: Pool): String { + return kubernetesBuilderClient.inspectDockerImage( + userId = userId, + imageName = pool.container ?: "", + credential = pool.credential ?: Credential( + user = "", + password = "" + ) + ) + } + private fun getBuilderName(): String { return "build${System.currentTimeMillis()}-" + RandomStringUtils.randomAlphabetic(8).lowercase(Locale.getDefault()) diff --git a/src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt b/src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt index d0d8d93806c..5fa689af8ee 100644 --- a/src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt +++ b/src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt @@ -45,6 +45,8 @@ import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentIDDispatchTy import com.tencent.devops.common.pipeline.type.agent.ThirdPartyDevCloudDispatchType import com.tencent.devops.common.redis.RedisLockByValue import com.tencent.devops.common.redis.RedisOperation +import com.tencent.devops.common.service.config.CommonConfig +import com.tencent.devops.common.service.utils.HomeHostUtil import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.dispatch.constants.AGENT_REUSE_MUTEX_REDISPATCH import com.tencent.devops.dispatch.constants.AGENT_REUSE_MUTEX_WAIT_REUSED_ENV @@ -87,13 +89,14 @@ class ThirdPartyDispatchService @Autowired constructor( private val client: Client, private val redisOperation: RedisOperation, private val buildLogPrinter: BuildLogPrinter, + private val commonConfig: CommonConfig, private val thirdPartyAgentBuildRedisUtils: ThirdPartyAgentBuildRedisUtils, private val thirdPartyAgentBuildService: ThirdPartyAgentService ) { fun canDispatch(event: PipelineAgentStartupEvent) = event.dispatchType is ThirdPartyAgentIDDispatchType || - event.dispatchType is ThirdPartyAgentEnvDispatchType || - event.dispatchType is ThirdPartyDevCloudDispatchType + event.dispatchType is ThirdPartyAgentEnvDispatchType || + event.dispatchType is ThirdPartyDevCloudDispatchType fun startUp(dispatchMessage: DispatchMessage) { when (dispatchMessage.event.dispatchType) { @@ -150,11 +153,11 @@ class ThirdPartyDispatchService @Autowired constructor( throw DispatchRetryMQException( errorCodeEnum = ErrorCodeEnum.BUILD_ENV_PREPARATION, errorMessage = "${dispatchMessage.event.buildId}|${dispatchMessage.event.vmSeqId} " + - I18nUtil.getCodeLanMessage( - messageCode = BK_QUEUE_TIMEOUT_MINUTES, - language = I18nUtil.getDefaultLocaleLanguage(), - params = arrayOf("${dispatchMessage.event.queueTimeoutMinutes}") - ) + I18nUtil.getCodeLanMessage( + messageCode = BK_QUEUE_TIMEOUT_MINUTES, + language = I18nUtil.getDefaultLocaleLanguage(), + params = arrayOf("${dispatchMessage.event.queueTimeoutMinutes}") + ) ) } @@ -220,7 +223,7 @@ class ThirdPartyDispatchService @Autowired constructor( errorCode = ErrorCodeEnum.GET_BUILD_AGENT_ERROR.errorCode, formatErrorMessage = ErrorCodeEnum.GET_BUILD_AGENT_ERROR.formatErrorMessage, errorMessage = ErrorCodeEnum.GET_BUILD_AGENT_ERROR.getErrorMessage() + - "(System Error) - ${agentResult.message}" + "(System Error) - ${agentResult.message}" ) } @@ -230,7 +233,7 @@ class ThirdPartyDispatchService @Autowired constructor( errorCode = ErrorCodeEnum.VM_STATUS_ERROR.errorCode, formatErrorMessage = ErrorCodeEnum.VM_STATUS_ERROR.formatErrorMessage, errorMessage = ErrorCodeEnum.VM_STATUS_ERROR.getErrorMessage() + - "- ${dispatchType.displayName}| status: (${agentResult.agentStatus?.name})" + "- ${dispatchType.displayName}| status: (${agentResult.agentStatus?.name})" ) } @@ -240,7 +243,7 @@ class ThirdPartyDispatchService @Autowired constructor( errorCode = ErrorCodeEnum.FOUND_AGENT_ERROR.errorCode, formatErrorMessage = ErrorCodeEnum.FOUND_AGENT_ERROR.formatErrorMessage, errorMessage = ErrorCodeEnum.FOUND_AGENT_ERROR.getErrorMessage() + - "(System Error) - $dispatchType agent is null" + "(System Error) - $dispatchType agent is null" ) } @@ -312,16 +315,7 @@ class ThirdPartyDispatchService @Autowired constructor( ) // 没有拿到锁说明现在这台机被复用互斥占用不能选 if (!lock.tryLock()) { - log( - dispatchMessage.event, - I18nUtil.getCodeLanMessage( - messageCode = AGENT_REUSE_MUTEX_REDISPATCH, - language = I18nUtil.getDefaultLocaleLanguage(), - params = arrayOf( - "${agent.agentId}|${agent.hostname}/${agent.ip}", redisOperation.get(lockKey) ?: "" - ) - ) - ) + logAgentReuse(lockKey, dispatchMessage, agent) return false } try { @@ -357,16 +351,7 @@ class ThirdPartyDispatchService @Autowired constructor( thirdPartyAgentBuildService.getRunningBuilds(agent.agentId)) <= 1 } if (checkRes) { - log( - dispatchMessage.event, - I18nUtil.getCodeLanMessage( - messageCode = AGENT_REUSE_MUTEX_REDISPATCH, - language = I18nUtil.getDefaultLocaleLanguage(), - params = arrayOf( - "${agent.agentId}|${agent.hostname}/${agent.ip}", redisOperation.get(lockKey) ?: "" - ) - ) - ) + logAgentReuse(lockKey, dispatchMessage, agent) return false } } @@ -395,8 +380,7 @@ class ThirdPartyDispatchService @Autowired constructor( saveAgentInfoToBuildDetail(dispatchMessage = dispatchMessage, agent = agent) logger.info( - "${event.buildId}|START_AGENT_BY_ID|j(${event.vmSeqId})|" + - "agent=${agent.agentId}" + "${event.buildId}|START_AGENT_BY_ID|j(${event.vmSeqId})|agent=${agent.agentId}" ) log( dispatchMessage.event, @@ -421,6 +405,52 @@ class ThirdPartyDispatchService @Autowired constructor( } } + private fun logAgentReuse( + lockKey: String, + dispatchMessage: DispatchMessage, + agent: ThirdPartyAgent + ) { + val lockedBuildId = redisOperation.get(lockKey) + if (lockedBuildId.isNullOrBlank()) { + log( + dispatchMessage.event, + I18nUtil.getCodeLanMessage( + messageCode = AGENT_REUSE_MUTEX_REDISPATCH, + language = I18nUtil.getDefaultLocaleLanguage(), + params = arrayOf( + "${agent.agentId}|${agent.hostname}/${agent.ip}", lockedBuildId ?: "" + ) + ) + ) + return + } + val msg = redisOperation.get(AgentReuseMutex.genAgentReuseMutexLinkTipKey(lockedBuildId))?.let { s -> + val endIndex = s.indexOf("_") + val pipelineId = s.substring(0, endIndex) + val linkTip = s.substring(endIndex + 1) + val link = "${ + HomeHostUtil.getHost( + commonConfig.devopsHostGateway!! + ) + }/console/pipeline/${dispatchMessage.event.projectId}/$pipelineId/detail/$lockedBuildId" + if (lockedBuildId != dispatchMessage.event.buildId) { + "$linkTip$lockedBuildId" + } else { + linkTip + } + } ?: "" + logWarn( + dispatchMessage.event, + I18nUtil.getCodeLanMessage( + messageCode = AGENT_REUSE_MUTEX_REDISPATCH, + language = I18nUtil.getDefaultLocaleLanguage(), + params = arrayOf( + "${agent.agentId}|${agent.hostname}/${agent.ip}", lockedBuildId ?: "" + ) + ) + msg + ) + } + private fun inQueue( agent: ThirdPartyAgent, dispatchMessage: DispatchMessage, @@ -530,7 +560,7 @@ class ThirdPartyDispatchService @Autowired constructor( if (agentsResult.status == Response.Status.FORBIDDEN.statusCode) { logger.warn( "${dispatchMessage.event.buildId}|START_AGENT_FAILED_FORBIDDEN|" + - "j(${dispatchMessage.event.vmSeqId})|dispatchType=$dispatchType|err=${agentsResult.message}" + "j(${dispatchMessage.event.vmSeqId})|dispatchType=$dispatchType|err=${agentsResult.message}" ) throw BuildFailureException( @@ -544,7 +574,7 @@ class ThirdPartyDispatchService @Autowired constructor( if (agentsResult.isNotOk()) { logger.warn( "${dispatchMessage.event.buildId}|START_AGENT_FAILED|" + - "j(${dispatchMessage.event.vmSeqId})|dispatchType=$dispatchType|err=${agentsResult.message}" + "j(${dispatchMessage.event.vmSeqId})|dispatchType=$dispatchType|err=${agentsResult.message}" ) logDebug( @@ -558,14 +588,14 @@ class ThirdPartyDispatchService @Autowired constructor( throw DispatchRetryMQException( errorCodeEnum = ErrorCodeEnum.FOUND_AGENT_ERROR, errorMessage = ErrorCodeEnum.GET_BUILD_AGENT_ERROR.getErrorMessage() + - "(System Error) - ${dispatchType.envName}: ${agentsResult.message}" + "(System Error) - ${dispatchType.envName}: ${agentsResult.message}" ) } if (agentsResult.data == null) { logger.warn( "${dispatchMessage.event.buildId}|START_AGENT_FAILED|j(${dispatchMessage.event.vmSeqId})|" + - "dispatchType=$dispatchType|err=null agents" + "dispatchType=$dispatchType|err=null agents" ) logDebug( dispatchMessage.event, @@ -578,7 +608,7 @@ class ThirdPartyDispatchService @Autowired constructor( throw DispatchRetryMQException( errorCodeEnum = ErrorCodeEnum.FOUND_AGENT_ERROR, errorMessage = ErrorCodeEnum.GET_BUILD_AGENT_ERROR.getErrorMessage() + - "System Error) - ${dispatchType.envName}: agent is null" + "System Error) - ${dispatchType.envName}: agent is null" ) } @@ -594,7 +624,7 @@ class ThirdPartyDispatchService @Autowired constructor( if (agentResData.isEmpty()) { logger.warn( "${dispatchMessage.event.buildId}|START_AGENT_FAILED|j(${dispatchMessage.event.vmSeqId})|" + - "dispatchType=$dispatchType|err=empty agents" + "dispatchType=$dispatchType|err=empty agents" ) throw DispatchRetryMQException( errorCodeEnum = ErrorCodeEnum.VM_NODE_NULL, @@ -746,7 +776,7 @@ class ThirdPartyDispatchService @Autowired constructor( logger.warn( "buildByEnvId|{} has singleNodeConcurrency {} but env {}|job {} null", dispatchMessage.event.buildId, - dispatchMessage.event.allNodeConcurrency, + dispatchMessage.event.singleNodeConcurrency, envId, dispatchMessage.event.jobId ) @@ -884,15 +914,15 @@ class ThirdPartyDispatchService @Autowired constructor( logDebug( dispatchMessage.event, "retry: ${dispatchMessage.event.retryTime} | " + - I18nUtil.getCodeLanMessage( - messageCode = BK_SEARCHING_AGENT, - language = I18nUtil.getDefaultLocaleLanguage() - ) + I18nUtil.getCodeLanMessage( + messageCode = BK_SEARCHING_AGENT, + language = I18nUtil.getDefaultLocaleLanguage() + ) ) if (startEmptyAgents(dispatchMessage, dispatchType, pbAgents, hasTryAgents, envId)) { logger.info( "${dispatchMessage.event.buildId}|START_AGENT|j(${dispatchMessage.event.vmSeqId})|" + - "dispatchType=$dispatchType|Get Lv.1" + "dispatchType=$dispatchType|Get Lv.1" ) return true } @@ -900,10 +930,10 @@ class ThirdPartyDispatchService @Autowired constructor( logDebug( dispatchMessage.event, "retry: ${dispatchMessage.event.retryTime} | " + - I18nUtil.getCodeLanMessage( - messageCode = BK_MAX_BUILD_SEARCHING_AGENT, - language = I18nUtil.getDefaultLocaleLanguage() - ) + I18nUtil.getCodeLanMessage( + messageCode = BK_MAX_BUILD_SEARCHING_AGENT, + language = I18nUtil.getDefaultLocaleLanguage() + ) ) /** * 次高优先级的agent: 最近构建机中使用过这个构建机,并且当前有构建任务,选当前正在运行任务最少的构建机(没有达到当前构建机的最大并发数) @@ -911,7 +941,7 @@ class ThirdPartyDispatchService @Autowired constructor( if (startAvailableAgents(dispatchMessage, dispatchType, pbAgents, hasTryAgents, envId)) { logger.info( "${dispatchMessage.event.buildId}|START_AGENT|j(${dispatchMessage.event.vmSeqId})|" + - "dispatchType=$dispatchType|Get Lv.2" + "dispatchType=$dispatchType|Get Lv.2" ) return true } @@ -919,10 +949,10 @@ class ThirdPartyDispatchService @Autowired constructor( logDebug( dispatchMessage.event, "retry: ${dispatchMessage.event.retryTime} | " + - I18nUtil.getCodeLanMessage( - messageCode = BK_SEARCHING_AGENT_MOST_IDLE, - language = I18nUtil.getDefaultLocaleLanguage() - ) + I18nUtil.getCodeLanMessage( + messageCode = BK_SEARCHING_AGENT_MOST_IDLE, + language = I18nUtil.getDefaultLocaleLanguage() + ) ) val allAgents = sortAgent( dispatchMessage = dispatchMessage, @@ -937,7 +967,7 @@ class ThirdPartyDispatchService @Autowired constructor( if (startEmptyAgents(dispatchMessage, dispatchType, allAgents, hasTryAgents, envId)) { logger.info( "${dispatchMessage.event.buildId}|START_AGENT|j(${dispatchMessage.event.vmSeqId})|" + - "dispatchType=$dispatchType|pickup Lv.3" + "dispatchType=$dispatchType|pickup Lv.3" ) return true } @@ -945,10 +975,10 @@ class ThirdPartyDispatchService @Autowired constructor( logDebug( dispatchMessage.event, "retry: ${dispatchMessage.event.retryTime} | " + - I18nUtil.getCodeLanMessage( - messageCode = BK_SEARCHING_AGENT_PARALLEL_AVAILABLE, - language = I18nUtil.getDefaultLocaleLanguage() - ) + I18nUtil.getCodeLanMessage( + messageCode = BK_SEARCHING_AGENT_PARALLEL_AVAILABLE, + language = I18nUtil.getDefaultLocaleLanguage() + ) ) /** * 第四优先级的agent: 当前有构建任务,选当前正在运行任务最少的构建机(没有达到当前构建机的最大并发数) @@ -957,7 +987,7 @@ class ThirdPartyDispatchService @Autowired constructor( ) { logger.info( "${dispatchMessage.event.buildId}|START_AGENT|j(${dispatchMessage.event.vmSeqId})|" + - "dispatchType=$dispatchType|Get Lv.4" + "dispatchType=$dispatchType|Get Lv.4" ) return true } @@ -1020,7 +1050,7 @@ class ThirdPartyDispatchService @Autowired constructor( if (startEnvAgentBuild(dispatchMessage, agent, dispatchType, hasTryAgents, envId)) { logger.info( "[${dispatchMessage.event.projectId}|$[${dispatchMessage.event.pipelineId}|" + - "${dispatchMessage.event.buildId}|${agent.agentId}] Success to start the build" + "${dispatchMessage.event.buildId}|${agent.agentId}] Success to start the build" ) return true } @@ -1092,13 +1122,13 @@ class ThirdPartyDispatchService @Autowired constructor( dockerRunningCnt: Int ): Boolean { return if (dockerBuilder) { - agent.dockerParallelTaskCount != null && - agent.dockerParallelTaskCount!! > 0 && - agent.dockerParallelTaskCount!! > dockerRunningCnt + (agent.dockerParallelTaskCount == 0) || (agent.dockerParallelTaskCount != null && + agent.dockerParallelTaskCount!! > 0 && + agent.dockerParallelTaskCount!! > dockerRunningCnt) } else { - agent.parallelTaskCount != null && - agent.parallelTaskCount!! > 0 && - agent.parallelTaskCount!! > runningCnt + (agent.parallelTaskCount == 0) || (agent.parallelTaskCount != null && + agent.parallelTaskCount!! > 0 && + agent.parallelTaskCount!! > runningCnt) } } } diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/interfaces/ContainerService.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/interfaces/ContainerService.kt index 6c93e6c9656..c407e2d01ff 100644 --- a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/interfaces/ContainerService.kt +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/interfaces/ContainerService.kt @@ -117,7 +117,8 @@ interface ContainerService { */ fun waitTaskFinish( userId: String, - taskId: String + taskId: String, + needProxy: Boolean = true ): DispatchBuildTaskStatus /** @@ -157,4 +158,9 @@ interface ContainerService { buildId: String, dispatchBuildImageReq: DispatchBuildImageReq ): DispatchTaskResp + + /** + * inspect镜像接口 + */ + fun inspectDockerImage(userId: String, pool: Pool): String } diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/builds/DispatchBuildTaskStatus.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/builds/DispatchBuildTaskStatus.kt index deab0613e92..d07422bc079 100644 --- a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/builds/DispatchBuildTaskStatus.kt +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/builds/DispatchBuildTaskStatus.kt @@ -29,7 +29,7 @@ package com.tencent.devops.dispatch.kubernetes.pojo.builds data class DispatchBuildTaskStatus( val status: DispatchBuildTaskStatusEnum, - val errMsg: String? + val msg: String? ) enum class DispatchBuildTaskStatusEnum { diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/image/DockerImageInspection.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/image/DockerImageInspection.kt new file mode 100644 index 00000000000..12da161343d --- /dev/null +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/image/DockerImageInspection.kt @@ -0,0 +1,47 @@ +/* + * 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.dispatch.kubernetes.pojo.image + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties + +@JsonIgnoreProperties(ignoreUnknown = true) +data class DockerImageInspection( + val arch: String? = "", + val author: String? = "", + val comment: String? = "", + val created: String? = "", + val dockerVersion: String? = "", + val id: String? = "", + val os: String? = "", + val osVersion: String? = "", + val parent: String? = "", + val size: Long? = 0, + val repoTags: List? = null, + val repoDigests: List? = null, + val virtualSize: Long? = 0 +) diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/image/InspectImageResp.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/image/InspectImageResp.kt new file mode 100644 index 00000000000..85a569dc946 --- /dev/null +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/pojo/image/InspectImageResp.kt @@ -0,0 +1,12 @@ +package com.tencent.devops.dispatch.kubernetes.pojo.image + +data class InspectImageResp( + val arch: String, // 架构 + val os: String, // 系统 + val size: Long, // 大小 + val created: String, // 创建时间 + val id: String, // HashId + val author: String, // 镜像作者 + val parent: String, // 父级镜像 + val osVersion: String // 系统版本 +) diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/resource/service/ServiceDockerImageResourceImpl.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/resource/service/ServiceDockerImageResourceImpl.kt new file mode 100644 index 00000000000..e521edb22a6 --- /dev/null +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/resource/service/ServiceDockerImageResourceImpl.kt @@ -0,0 +1,49 @@ +/* + * 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.dispatch.kubernetes.resource.service + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.web.RestResource +import com.tencent.devops.dispatch.kubernetes.api.service.ServiceDockerImageResource +import com.tencent.devops.dispatch.kubernetes.service.DispatchBaseImageService +import com.tencent.devops.dispatch.kubernetes.pojo.CheckDockerImageRequest +import com.tencent.devops.dispatch.kubernetes.pojo.CheckDockerImageResponse +import org.springframework.beans.factory.annotation.Autowired + +@RestResource +class ServiceDockerImageResourceImpl @Autowired constructor( + private val dispatchBaseImageService: DispatchBaseImageService +) : ServiceDockerImageResource { + + override fun checkDockerImage( + userId: String, + checkDockerImageRequestList: List + ): Result> { + return Result(dispatchBaseImageService.checkDockerImage(userId, checkDockerImageRequestList)) + } +} diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseDebugService.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseDebugService.kt index 93882de771b..371e473ee8c 100644 --- a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseDebugService.kt +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseDebugService.kt @@ -257,7 +257,7 @@ class DispatchBaseDebugService @Autowired constructor( logger.info("stop debug $debugBuilderName success.") } else { // 停不掉，尝试删除 - logger.info("stop debug $debugBuilderName failed, msg: ${opResult.errMsg}") + logger.info("stop debug $debugBuilderName failed, msg: ${opResult.msg}") logger.info("stop debug $debugBuilderName failed, try to delete it.") containerServiceFactory.load(projectId).operateBuilder( buildId = "", @@ -318,10 +318,10 @@ class DispatchBaseDebugService @Autowired constructor( // 启动成功 logger.info("$userId start ${dockerRoutingType.name} builder success") } else { - logger.error("$userId start ${dockerRoutingType.name} builder failed, msg: ${startResult.errMsg}") + logger.error("$userId start ${dockerRoutingType.name} builder failed, msg: ${startResult.msg}") throw ErrorCodeException( errorCode = BK_BUILD_MACHINE_STARTUP_FAILED, - params = arrayOf(startResult.errMsg ?: "") + params = arrayOf(startResult.msg ?: "") ) } } diff --git a/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseImageService.kt b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseImageService.kt new file mode 100644 index 00000000000..261fd9c6cef --- /dev/null +++ b/src/backend/ci/core/dispatch/common-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/DispatchBaseImageService.kt @@ -0,0 +1,109 @@ +/* + * 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.dispatch.kubernetes.service + +import com.tencent.devops.common.api.util.JsonUtil +import com.tencent.devops.dispatch.kubernetes.pojo.CheckDockerImageRequest +import com.tencent.devops.dispatch.kubernetes.pojo.CheckDockerImageResponse +import com.tencent.devops.dispatch.kubernetes.pojo.Credential +import com.tencent.devops.dispatch.kubernetes.pojo.Pool +import com.tencent.devops.dispatch.kubernetes.pojo.builds.DispatchBuildTaskStatusEnum +import com.tencent.devops.dispatch.kubernetes.pojo.image.InspectImageResp +import com.tencent.devops.dispatch.kubernetes.service.factory.ContainerServiceFactory +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service + +@Service +class DispatchBaseImageService @Autowired constructor( + private val containerServiceFactory: ContainerServiceFactory +) { + + companion object { + private val logger = LoggerFactory.getLogger(DispatchBaseImageService::class.java) + } + + fun checkDockerImage( + userId: String, + checkDockerImageRequestList: List + ): List { + val imageInspectList = mutableListOf() + checkDockerImageRequestList.parallelStream().forEach { + // 拉镜像 + val taskId = containerServiceFactory.load("").inspectDockerImage( + userId = userId, + pool = Pool( + container = it.imageName, + credential = Credential( + user = it.registryUser ?: "", + password = it.registryPwd ?: "" + ) + ) + ) + + val taskResult = containerServiceFactory.load("").waitTaskFinish(userId, taskId, false) + if (taskResult.status == DispatchBuildTaskStatusEnum.SUCCEEDED) { + logger.info("CheckDockerImage $userId pull ${it.imageName} success.") + val inspectImageResp = JsonUtil.to(taskResult.msg ?: "", InspectImageResp::class.java) + imageInspectList.add( + CheckDockerImageResponse( + errorCode = 0, + errorMessage = "", + arch = inspectImageResp.arch, + author = inspectImageResp.author, + created = inspectImageResp.created, + id = inspectImageResp.id, + os = inspectImageResp.os, + osVersion = inspectImageResp.osVersion, + parent = inspectImageResp.parent, + size = inspectImageResp.size + ) + ) + } else { + imageInspectList.add( + CheckDockerImageResponse( + errorCode = -1, + errorMessage = taskResult.msg, + arch = "", + author = "", + created = "", + id = "", + os = "", + osVersion = "", + parent = "", + size = 0 + ) + ) + + return@forEach + } + } + + return imageInspectList + } +} diff --git a/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/DockerHostBuildService.kt b/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/DockerHostBuildService.kt index 3c739cd6087..05264a0e406 100644 --- a/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/DockerHostBuildService.kt +++ b/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/DockerHostBuildService.kt @@ -754,7 +754,7 @@ class DockerHostBuildService( val date = sdf.parse(utcTimeLocal) val startTimestamp = date.time val nowTimestamp = System.currentTimeMillis() - return (nowTimestamp - startTimestamp) > (8 * 3600 * 1000) + return (nowTimestamp - startTimestamp) > (16 * 3600 * 1000) } return false diff --git a/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/container/ContainerCustomizedRunHandler.kt b/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/container/ContainerCustomizedRunHandler.kt index e6201b3edc9..250101f137c 100644 --- a/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/container/ContainerCustomizedRunHandler.kt +++ b/src/backend/ci/core/dockerhost/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/container/ContainerCustomizedRunHandler.kt @@ -57,6 +57,7 @@ class ContainerCustomizedRunHandler( override fun handlerRequest(handlerContext: ContainerHandlerContext) { with(handlerContext) { try { + val containerStartTime = (System.currentTimeMillis() / 1000).toInt() val env = generateEnv(dockerRunParam, this) logger.info("[$buildId]|[$vmSeqId] env is $env") @@ -101,7 +102,7 @@ class ContainerCustomizedRunHandler( dockerRunResponse = DockerRunResponse( containerId = container.id, - startTimeStamp = (System.currentTimeMillis() / 1000).toInt(), + startTimeStamp = containerStartTime, dockerRunPortBindings = dockerRunPortBindingList ) } catch (er: Throwable) { diff --git a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/api/ServiceEnvNodeAuthorizationResource.kt b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/api/ServiceEnvNodeAuthorizationResource.kt new file mode 100644 index 00000000000..76f1d4dd563 --- /dev/null +++ b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/api/ServiceEnvNodeAuthorizationResource.kt @@ -0,0 +1,61 @@ +/* + * 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.environment.api + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +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 + +@Tag(name = "SERVICE_AUTHORIZATION", description = "环境节点授权管理") +@Path("/service/env/node/authorization") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface ServiceEnvNodeAuthorizationResource { + @Operation(summary = "重置环境节点授权管理") + @POST + @Path("/{projectId}/resetEnvNodeAuthorization/{preCheck}") + fun resetEnvNodeAuthorization( + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "是否为预检查", required = true) + @PathParam("preCheck") + preCheck: Boolean, + @Parameter(description = "请求体", required = true) + resourceAuthorizationHandoverDTOs: List + ): Result>> +} diff --git a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/Constants.kt b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/Constants.kt index 78836d90471..921d0aaaaee 100644 --- a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/Constants.kt +++ b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/Constants.kt @@ -42,6 +42,10 @@ const val T_NODE_AGENT_STATUS = "agentStatus" const val T_NODE_PROJECT_ID = "projectId" const val T_NODE_CREATED_USER = "createdUser" const val T_NODE_OS_TYPE = "osType" +const val T_NODE_OS_NAME = "osName" +const val T_NODE_SERVER_ID = "serverId" +const val T_NODE_OPERATOR = "operator" +const val T_NODE_BAK_OPERATOR = "bakOperator" const val T_ENV_ENV_ID = "envId" const val T_ENVIRONMENT_THIRDPARTY_AGENT_NODE_ID = "nodeId" const val T_ENVIRONMENT_THIRDPARTY_AGENT_MASTER_VERSION = "masterVersion" diff --git a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/EnvironmentMessageCode.kt b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/EnvironmentMessageCode.kt index 80645193811..7c47df98395 100644 --- a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/EnvironmentMessageCode.kt +++ b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/constant/EnvironmentMessageCode.kt @@ -94,8 +94,16 @@ object EnvironmentMessageCode { const val ERROR_NODE_NO_USE_PERMISSSION = "2105045" // 环境管理：节点[{0}]没有使用权限 // "2105046" 环境管理: 不在CMDB中的IP [{0}]; 无权限的IP [{1}], 请确认当前用户[{2}]或节点导入人[{3}]是否为这些节点的主备负责人 - 脚本执行｜文件分发 const val ERROR_NODE_IP_ILLEGAL = "2105046" - const val ERROR_CMDB_INTERFACE_TIME_OUT = "2105047" - const val ERROR_CMDB_RESPONSE = "2105048" + const val ERROR_CMDB_INTERFACE_TIME_OUT = "2105047" // 环境管理: CMDB接口请求超时，请重试 + const val ERROR_CMDB_RESPONSE = "2105048" // 环境管理: CMDB接口请求异常，请重试 + const val ERROR_SCRIPT_EXECUTE_HOST_EMPTY = "2105049" // 环境管理: 脚本执行: 主机为空 + const val ERROR_DISTRIBUTE_FILE_EXECUTE_TARGET_HOST_EMPTY = "2105050" // 环境管理: 文件分发: 执行目标主机为空 + const val ERROR_DISTRIBUTE_FILE_FILE_SOURCE_HOST_EMPTY = "2105051" // 环境管理: 文件分发: 文件源主机为空 + const val ERROR_ENV_LIST_NODE_NOT_IN_CC_OR_CMDB = "2105052" // 环境管理: 环境中的[{0}]不在CC/CMDB中 + const val ERROR_NODE_LIST_NODE_NOT_IN_CC_OR_CMDB = "2105053" // 环境管理: 节点中的[{0}]不在CC/CMDB中 + const val ERROR_JOB_INSTANCE_NOT_BELONG_TO_PROJECT = "2105054" // 环境管理: 请求的job实例不属于当前项目或已过期(超过一个月) + const val ERROR_FAIL_TO_CREATE_AGENT_INSTALL_TASK = "2105055" // 环境管理: 创建Agent安装任务失败：{0} + const val ERROR_INPUT_TOO_MANY_IP = "2105056" // 环境管理: 输入的IP数量不可超过{0} const val BK_NORMAL_VERSION = "bkNormalVersion" // 8核16G（普通版） const val BK_INTEL_XEON_SKYLAKE_PROCESSOR = "bkIntelXeonSkylakeProcessor" // 2.5GHz 64核 Intel Xeon Skylake 6133处理器 diff --git a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/CmdbNode.kt b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/CmdbNode.kt index 105308bdcc7..c82e677fc90 100644 --- a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/CmdbNode.kt +++ b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/CmdbNode.kt @@ -46,16 +46,9 @@ data class CmdbNode( @get:Schema(title = "所属业务") val bizId: Long = -1, @get:Schema(title = "节点状态") - var nodeStatus: String?, + var nodeStatus: String? = null, @get:Schema(title = "是否已导入") - var importStatus: Boolean? = false -) { - constructor( - name: String, - operator: String, - bakOperator: String, - ip: String, - displayIp: String, - osName: String - ) : this(name, operator, bakOperator, ip, displayIp, osName, -1L, null, null) -} + var importStatus: Boolean? = false, + @get:Schema(title = "主机id") + val serverId: Long? +) diff --git a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeBaseInfo.kt b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeBaseInfo.kt index 7f9c5be9de1..d19a1eb362a 100644 --- a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeBaseInfo.kt +++ b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeBaseInfo.kt @@ -60,5 +60,7 @@ data class NodeBaseInfo( @get:Schema(title = "所属业务, 默认-1表示没有绑定业务") val bizId: Long? = -1, @get:Schema(title = "当前环境是否启用这个 node") - val envEnableNode: Boolean? + val envEnableNode: Boolean?, + @get:Schema(title = "最后更新时间") + val lastModifyTime: Long? = null ) diff --git a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeWithPermission.kt b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeWithPermission.kt index 3a935eb64fd..9afc5edb615 100644 --- a/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeWithPermission.kt +++ b/src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/pojo/NodeWithPermission.kt @@ -88,5 +88,7 @@ data class NodeWithPermission( @get:Schema(title = "hostID") val bkHostId: Long? = null, @get:Schema(title = "job任务ID") - val taskId: Long? + val taskId: Long?, + @get:Schema(title = "主机serverId") + val serverId: Long? ) diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/dao/NodeDao.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/dao/NodeDao.kt index 58882ef64d5..4f4f3639cff 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/dao/NodeDao.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/dao/NodeDao.kt @@ -236,6 +236,20 @@ class NodeDao { } } + fun countByNodeType( + dslContext: DSLContext, + projectId: String, + nodeType: NodeType + ): Long { + with(TNode.T_NODE) { + return dslContext.selectCount() + .from(this) + .where(PROJECT_ID.eq(projectId)) + .and(NODE_TYPE.`in`(nodeType.name)) + .fetchOne(0, Long::class.java)!! + } + } + fun getByDisplayName( dslContext: DSLContext, projectId: String, @@ -353,7 +367,13 @@ class NodeDao { } } - fun listNodesByType(dslContext: DSLContext, projectId: String, nodeType: String): List { + fun listNodesByType( + dslContext: DSLContext, + projectId: String, + nodeType: String, + limit: Int? = null, + offset: Int? = null + ): List { with(TNode.T_NODE) { return dslContext.selectFrom(this) .where(NODE_TYPE.eq(nodeType)) @@ -361,6 +381,7 @@ class NodeDao { .and(NODE_STATUS.ne(NodeStatus.CREATING.name)) .and(NODE_STATUS.ne(NodeStatus.DELETING.name)) .and(NODE_STATUS.ne(NodeStatus.DELETED.name)) + .let { if (limit != null && offset != null) it.limit(limit).offset(offset) else it } .fetch() } } diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/model/CreateNodeModel.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/model/CreateNodeModel.kt index 32ea37df213..96ef40976f7 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/model/CreateNodeModel.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/model/CreateNodeModel.kt @@ -33,7 +33,7 @@ data class CreateNodeModel( var nodeStringId: String? = "", var projectId: String, var nodeIp: String = "", - var nodeName: String = "", + var nodeName: String? = "", var nodeStatus: String = "", var nodeType: String = "", var nodeClusterId: String? = null, diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/permission/EnvNodeAuthorizationService.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/permission/EnvNodeAuthorizationService.kt new file mode 100644 index 00000000000..568f52129dc --- /dev/null +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/permission/EnvNodeAuthorizationService.kt @@ -0,0 +1,89 @@ +package com.tencent.devops.environment.permission + +import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.auth.api.AuthAuthorizationApi +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverResult +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.environment.service.NodeService +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Service + +@Service +class EnvNodeAuthorizationService constructor( + val authAuthorizationApi: AuthAuthorizationApi, + val nodeService: NodeService +) { + fun batchModifyHandoverFrom( + projectId: String, + resourceAuthorizationHandoverList: List + ) { + authAuthorizationApi.batchModifyHandoverFrom( + projectId = projectId, + resourceAuthorizationHandoverList = resourceAuthorizationHandoverList + ) + } + + fun addResourceAuthorization( + projectId: String, + resourceAuthorizationList: List + ) { + authAuthorizationApi.addResourceAuthorization( + projectId = projectId, + resourceAuthorizationList = resourceAuthorizationList + ) + } + + fun resetEnvNodeAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List + ): Map> { + logger.info("reset env node authorization|$preCheck|$projectId|$resourceAuthorizationHandoverDTOs") + return authAuthorizationApi.resetResourceAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs, + handoverResourceAuthorization = ::handoverEnvNodeAuthorization + ) + } + + private fun handoverEnvNodeAuthorization( + preCheck: Boolean, + resourceAuthorizationHandoverDTO: ResourceAuthorizationHandoverDTO + ): ResourceAuthorizationHandoverResult { + with(resourceAuthorizationHandoverDTO) { + try { + if (preCheck) { + nodeService.checkCmdbOperator( + userId = handoverTo!!, + projectId = projectCode, + nodeHashId = resourceCode + ) + } else { + nodeService.changeCreatedUser( + userId = handoverTo!!, + projectId = projectCode, + nodeHashId = resourceCode + ) + } + } catch (ignore: Exception) { + return ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.FAILED, + message = when (ignore) { + is ErrorCodeException -> ignore.defaultMessage + else -> ignore.message + } + ) + } + } + return ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.SUCCESS + ) + } + + companion object { + private val logger = LoggerFactory.getLogger(EnvNodeAuthorizationService::class.java) + } +} diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvNodeAuthorizationResourceImpl.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvNodeAuthorizationResourceImpl.kt new file mode 100644 index 00000000000..034212eda31 --- /dev/null +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvNodeAuthorizationResourceImpl.kt @@ -0,0 +1,27 @@ +package com.tencent.devops.environment.resources + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.web.RestResource +import com.tencent.devops.environment.api.ServiceEnvNodeAuthorizationResource +import com.tencent.devops.environment.permission.EnvNodeAuthorizationService + +@RestResource +class ServiceEnvNodeAuthorizationResourceImpl constructor( + private val envNodeAuthorizationService: EnvNodeAuthorizationService +) : ServiceEnvNodeAuthorizationResource { + override fun resetEnvNodeAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List + ): Result>> { + return Result( + envNodeAuthorizationService.resetEnvNodeAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs + ) + ) + } +} diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvironmentAuthResourceImpl.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvironmentAuthResourceImpl.kt index 84e53bee9e3..51dbb36992a 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvironmentAuthResourceImpl.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/ServiceEnvironmentAuthResourceImpl.kt @@ -71,16 +71,16 @@ class ServiceEnvironmentAuthResourceImpl @Autowired constructor( val method = callBackInfo.method val page = callBackInfo.page val projectId = callBackInfo.filter.parent?.id ?: "" // FETCH_INSTANCE_INFO场景下iam不会传parentId - when (method) { + return when (method) { CallbackMethodEnum.LIST_INSTANCE -> { - return authNodeService.getNode(projectId, page.offset.toInt(), page.limit.toInt(), token) + authNodeService.getNode(projectId, page.offset.toInt(), page.limit.toInt(), token) } CallbackMethodEnum.FETCH_INSTANCE_INFO -> { val ids = callBackInfo.filter.idList.map { it.toString() } - return authNodeService.getNodeInfo(ids, token) + authNodeService.getNodeInfo(ids, token) } CallbackMethodEnum.SEARCH_INSTANCE -> { - return authNodeService.searchNode( + authNodeService.searchNode( projectId = projectId, keyword = callBackInfo.filter.keyword, limit = page.limit.toInt(), @@ -88,7 +88,17 @@ class ServiceEnvironmentAuthResourceImpl @Autowired constructor( token = token ) } + CallbackMethodEnum.LIST_RESOURCE_AUTHORIZATION -> { + authNodeService.listNodeAuthorization( + projectId = projectId, + limit = page.limit.toInt(), + offset = page.offset.toInt(), + token = token + ) + } + else -> { + null + } } - return null } } diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/UserNodeResourceImpl.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/UserNodeResourceImpl.kt index ebe90bc21fd..62e4afa5b1c 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/UserNodeResourceImpl.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/UserNodeResourceImpl.kt @@ -32,9 +32,12 @@ import com.tencent.bk.audit.annotations.AuditEntry import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.api.util.HashUtil import com.tencent.devops.common.auth.api.ActionId +import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO import com.tencent.devops.common.service.prometheus.BkTimed import com.tencent.devops.common.web.RestResource import com.tencent.devops.environment.api.UserNodeResource +import com.tencent.devops.environment.permission.EnvNodeAuthorizationService import com.tencent.devops.environment.pojo.DisplayName import com.tencent.devops.environment.pojo.NodeWithPermission import com.tencent.devops.environment.service.NodeService @@ -43,7 +46,8 @@ import org.springframework.beans.factory.annotation.Autowired @RestResource class UserNodeResourceImpl @Autowired constructor( - private val nodeService: NodeService + private val nodeService: NodeService, + private val authorizationService: EnvNodeAuthorizationService ) : UserNodeResource { @BkTimed(extraTags = ["operate", "getNode"]) @@ -86,7 +90,19 @@ class UserNodeResourceImpl @Autowired constructor( } override fun changeCreatedUser(userId: String, projectId: String, nodeHashId: String): Result { - nodeService.changeCreatedUser(userId, projectId, nodeHashId) + val nodeDisplayName = nodeService.changeCreatedUser(userId, projectId, nodeHashId) + authorizationService.batchModifyHandoverFrom( + projectId = projectId, + resourceAuthorizationHandoverList = listOf( + ResourceAuthorizationHandoverDTO( + projectCode = projectId, + resourceType = AuthResourceType.ENVIRONMENT_ENV_NODE.value, + resourceName = nodeDisplayName, + resourceCode = nodeHashId, + handoverTo = userId + ) + ) + ) return Result(true) } diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/AuthNodeService.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/AuthNodeService.kt index e2c2a1b1d13..1cf5a9c32e3 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/AuthNodeService.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/AuthNodeService.kt @@ -27,13 +27,18 @@ package com.tencent.devops.environment.service +import com.tencent.bk.sdk.iam.dto.callback.response.BaseDataResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO +import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.auth.api.AuthTokenApi +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse import com.tencent.devops.common.auth.callback.FetchInstanceInfo import com.tencent.devops.common.auth.callback.ListInstanceInfo +import com.tencent.devops.common.auth.callback.ListResourcesAuthorizationDTO import com.tencent.devops.common.auth.callback.SearchInstanceInfo +import com.tencent.devops.environment.pojo.enums.NodeType import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -95,7 +100,8 @@ class AuthNodeService @Autowired constructor( projectId = projectId, offset = offset, limit = limit, - displayName = keyword) + displayName = keyword + ) val result = SearchInstanceInfo() if (nodeInfos?.records == null) { logger.info("$projectId There are no nodes under the project") @@ -112,6 +118,46 @@ class AuthNodeService @Autowired constructor( return result.buildSearchInstanceResult(entityInfo, nodeInfos.count) } + fun listNodeAuthorization( + projectId: String, + offset: Int, + limit: Int, + token: String + ): ListResourcesAuthorizationDTO { + authTokenApi.checkToken(token) + val nodeInfosAndCount = nodeService.getNodeInfosAndCountByType( + projectId = projectId, + nodeType = NodeType.CMDB, + limit = limit, + offset = offset + ) + val nodeList = nodeInfosAndCount.first + val count = nodeInfosAndCount.second + + val data = BaseDataResponseDTO() + val result = ListResourcesAuthorizationDTO(data) + if (nodeList.isEmpty()) { + logger.info("$projectId There is no assembly line under the project") + return result.buildResourcesAuthorizationListResult() + } + val entityInfos = mutableListOf() + nodeList.map { + val entity = ResourceAuthorizationResponse( + projectCode = projectId, + resourceType = AuthResourceType.ENVIRONMENT_ENV_NODE.value, + resourceName = it.displayName!!, + resourceCode = it.nodeHashId, + handoverTime = it.lastModifyTime!!, + handoverFrom = it.createdUser + ) + entityInfos.add(entity) + } + logger.info("entityInfo $entityInfos, count $count") + data.result = entityInfos + data.count = count + return result.buildResourcesAuthorizationListResult() + } + companion object { val logger = LoggerFactory.getLogger(AuthNodeService::class.java) } diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/NodeService.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/NodeService.kt index c9befe0c9d9..672751136d3 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/NodeService.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/NodeService.kt @@ -35,6 +35,7 @@ import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.exception.PermissionForbiddenException import com.tencent.devops.common.api.pojo.Page import com.tencent.devops.common.api.util.HashUtil +import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.common.api.util.PageUtil import com.tencent.devops.common.audit.ActionAuditContent import com.tencent.devops.common.auth.api.ActionId @@ -296,7 +297,8 @@ class NodeService @Autowired constructor( } else { it.osType }, - bkHostId = it.hostId + bkHostId = it.hostId, + serverId = it.serverId ) } } @@ -387,7 +389,8 @@ class NodeService @Autowired constructor( agentHashId = HashUtil.encodeLongId(thirdPartyAgent?.id ?: 0L), cloudAreaId = it.cloudAreaId, taskId = null, - osType = it.osType + osType = it.osType, + serverId = it.serverId ) } } @@ -443,7 +446,8 @@ class NodeService @Autowired constructor( lastModifyUser = it.lastModifyUser ?: "", cloudAreaId = it.cloudAreaId, taskId = null, - osType = it.osType + osType = it.osType, + serverId = it.serverId ) } } @@ -470,7 +474,7 @@ class NodeService @Autowired constructor( return nodeRecords.map { NodeStringIdUtils.getNodeBaseInfo(it) } } - fun changeCreatedUser(userId: String, projectId: String, nodeHashId: String) { + fun changeCreatedUser(userId: String, projectId: String, nodeHashId: String): String { val nodeId = HashUtil.decodeIdToLong(nodeHashId) val node = nodeDao.get(dslContext, projectId, nodeId) ?: throw ErrorCodeException( errorCode = ERROR_NODE_NOT_EXISTS, @@ -483,14 +487,66 @@ class NodeService @Autowired constructor( if (isOperator || isBakOperator) { nodeDao.updateCreatedUser(dslContext, nodeId, userId) } else { - throw ErrorCodeException(errorCode = ERROR_NODE_NO_EDIT_PERMISSSION) + throw ErrorCodeException( + errorCode = ERROR_NODE_NO_EDIT_PERMISSSION, + defaultMessage = MessageUtil.getMessageByLocale( + messageCode = ERROR_NODE_NO_EDIT_PERMISSSION, + language = I18nUtil.getLanguage(userId) + ) + ) } } + else -> { + throw ErrorCodeException( + errorCode = ERROR_NODE_CHANGE_USER_NOT_SUPPORT, + params = arrayOf(NodeType.getTypeName(node.nodeType)), + defaultMessage = MessageUtil.getMessageByLocale( + messageCode = ERROR_NODE_CHANGE_USER_NOT_SUPPORT, + language = I18nUtil.getLanguage(userId), + params = arrayOf(NodeType.getTypeName(node.nodeType)) + ) + ) + } + } + return node.displayName + } + fun checkCmdbOperator( + userId: String, + projectId: String, + nodeHashId: String + ): Boolean { + val nodeId = HashUtil.decodeIdToLong(nodeHashId) + val node = nodeDao.get(dslContext, projectId, nodeId) ?: throw ErrorCodeException( + errorCode = ERROR_NODE_NOT_EXISTS, + defaultMessage = "the node does not exist", + params = arrayOf(nodeHashId) + ) + return when (node.nodeType) { + NodeType.CMDB.name -> { + val isOperator = userId == node.operator + val isBakOperator = node.bakOperator.split(";").contains(userId) + if (isOperator || isBakOperator) { + true + } else { + throw ErrorCodeException( + errorCode = ERROR_NODE_NO_EDIT_PERMISSSION, + defaultMessage = MessageUtil.getMessageByLocale( + messageCode = ERROR_NODE_NO_EDIT_PERMISSSION, + language = I18nUtil.getLanguage(userId) + ) + ) + } + } else -> { throw ErrorCodeException( errorCode = ERROR_NODE_CHANGE_USER_NOT_SUPPORT, - params = arrayOf(NodeType.getTypeName(node.nodeType)) + params = arrayOf(NodeType.getTypeName(node.nodeType)), + defaultMessage = MessageUtil.getMessageByLocale( + messageCode = ERROR_NODE_CHANGE_USER_NOT_SUPPORT, + language = I18nUtil.getLanguage(userId), + params = arrayOf(NodeType.getTypeName(node.nodeType)) + ) ) } } @@ -634,7 +690,8 @@ class NodeService @Autowired constructor( }, cloudAreaId = it.cloudAreaId, taskId = null, - osType = it.osType + osType = it.osType, + serverId = it.serverId ) } } @@ -650,6 +707,28 @@ class NodeService @Autowired constructor( } } + fun getNodeInfosAndCountByType( + projectId: String, + nodeType: NodeType, + limit: Int, + offset: Int + ): Pair, Long> { + val nodeInfos = nodeDao.listNodesByType( + dslContext = dslContext, + projectId = projectId, + nodeType = NodeType.CMDB.name, + offset = offset, + limit = limit + ).map { NodeStringIdUtils.getNodeBaseInfo(it) } + + val count = nodeDao.countByNodeType( + dslContext = dslContext, + projectId = projectId, + nodeType = NodeType.CMDB + ) + return Pair(nodeInfos, count) + } + fun addHashId() { val startTime = System.currentTimeMillis() logger.debug("OPRepositoryService:begin addHashId-----------") diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/slave/SlaveGatewayService.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/slave/SlaveGatewayService.kt index 6479ee65c24..3a1d52e9319 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/slave/SlaveGatewayService.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/slave/SlaveGatewayService.kt @@ -87,7 +87,10 @@ class SlaveGatewayService @Autowired constructor( // @return gateway,filegateway private fun getConfigGateway(zoneName: String?): Pair { if (zoneName.isNullOrBlank()) { - return Pair(agentUrlService.fixGateway(commonConfig.devopsBuildGateway!!), null) + return Pair( + agentUrlService.fixGateway(commonConfig.devopsBuildGateway!!), + agentUrlService.fixGateway(commonConfig.fileDevnetGateway!!) + ) } val gateways = getGateway() gateways.forEach { @@ -98,7 +101,10 @@ class SlaveGatewayService @Autowired constructor( ) } } - return Pair(agentUrlService.fixGateway(commonConfig.devopsBuildGateway!!), null) + return Pair( + agentUrlService.fixGateway(commonConfig.devopsBuildGateway!!), + agentUrlService.fixGateway(commonConfig.fileDevnetGateway!!) + ) } fun getGateway(): List { diff --git a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/utils/NodeStringIdUtils.kt b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/utils/NodeStringIdUtils.kt index d11ab58b6df..4ab8d75e4c5 100644 --- a/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/utils/NodeStringIdUtils.kt +++ b/src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/utils/NodeStringIdUtils.kt @@ -28,6 +28,7 @@ package com.tencent.devops.environment.utils import com.tencent.devops.common.api.util.HashUtil +import com.tencent.devops.common.api.util.timestampmilli import com.tencent.devops.environment.pojo.NodeBaseInfo import com.tencent.devops.environment.pojo.enums.NodeType import com.tencent.devops.model.environment.tables.records.TNodeRecord @@ -66,7 +67,8 @@ object NodeStringIdUtils { bakOperator = nodeRecord.bakOperator, gateway = "", displayName = getRefineDisplayName(nodeStringId, nodeRecord.displayName), - envEnableNode = null + envEnableNode = null, + lastModifyTime = (nodeRecord.lastModifyTime ?: nodeRecord.createdTime).timestampmilli() ) } } diff --git a/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsCacheService.kt b/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsCacheService.kt index 7f0f6075241..06ce9fc887a 100644 --- a/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsCacheService.kt +++ b/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsCacheService.kt @@ -72,7 +72,12 @@ class MetricsCacheService @Autowired constructor( cache.addPropertyChangeListener { change: PropertyChangeEvent -> when { change is ObservableMap.PropertyAddedEvent && this::addFunction.isInitialized -> { - addFunction(change.propertyName, change.newValue as MetricsUserPO) + kotlin.runCatching { + addFunction(change.propertyName, change.newValue as MetricsUserPO) + }.onFailure { + logger.error("cache error while adding " + change.propertyName, it) + removeCache(change.propertyName) + } } change is ObservableMap.PropertyUpdatedEvent && this::updateFunction.isInitialized -> { @@ -84,7 +89,9 @@ class MetricsCacheService @Autowired constructor( } change is ObservableMap.PropertyRemovedEvent && this::removeFunction.isInitialized -> { - removeFunction(change.propertyName, change.oldValue as MetricsUserPO) + if (change.oldValue != null) { + removeFunction(change.propertyName, change.oldValue as MetricsUserPO) + } } } } diff --git a/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsUserService.kt b/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsUserService.kt index 0ef3de632e9..3e2a5e4afcc 100644 --- a/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsUserService.kt +++ b/src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/builds/MetricsUserService.kt @@ -145,6 +145,7 @@ class MetricsUserService @Autowired constructor( override fun run() { while (true) { kotlin.runCatching { execute() } + .onFailure { logger.error("DeleteDelayProcess error ${it.message}", it) } Thread.sleep(SLEEP) } } @@ -195,7 +196,7 @@ class MetricsUserService @Autowired constructor( } CallBackEvent.BUILD_JOB_START -> { - if (event.jobId == null) { + if (event.jobId.isNullOrBlank()) { // job id 用户没填写将不会上报指标 return } @@ -210,7 +211,7 @@ class MetricsUserService @Autowired constructor( CallBackEvent.BUILD_TASK_START -> { date.startTime = checkNotNull(event.eventTime) - if (event.stepId == null) { + if (event.stepId.isNullOrBlank()) { // stepId id 用户没填写将不会上报指标 return } @@ -228,7 +229,7 @@ class MetricsUserService @Autowired constructor( } CallBackEvent.BUILD_JOB_END -> { - if (event.jobId == null) { + if (event.jobId.isNullOrBlank()) { // job id 用户没填写将不会上报指标 return } @@ -243,7 +244,7 @@ class MetricsUserService @Autowired constructor( CallBackEvent.BUILD_TASK_END -> { date.endTime = checkNotNull(event.eventTime) - if (event.stepId == null) { + if (event.stepId.isNullOrBlank()) { // stepId id 用户没填写将不会上报指标 return } diff --git a/src/backend/ci/core/misc/biz-image/build.gradle.kts b/src/backend/ci/core/misc/biz-image/build.gradle.kts index 374abc7b040..38a93609e06 100644 --- a/src/backend/ci/core/misc/biz-image/build.gradle.kts +++ b/src/backend/ci/core/misc/biz-image/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { api(project(":core:common:common-web")) api(project(":core:common:common-auth:common-auth-api")) api(project(":core:log:api-log")) + api(project(":core:dispatch:api-dispatch-kubernetes")) api("org.apache.commons:commons-compress") api("com.github.docker-java:docker-java") api("org.glassfish.jersey.core:jersey-client") diff --git a/src/backend/ci/core/misc/biz-image/src/main/kotlin/com/tencent/devops/image/service/InspectImageService.kt b/src/backend/ci/core/misc/biz-image/src/main/kotlin/com/tencent/devops/image/service/InspectImageService.kt index 6772dc29788..6641e759f0e 100644 --- a/src/backend/ci/core/misc/biz-image/src/main/kotlin/com/tencent/devops/image/service/InspectImageService.kt +++ b/src/backend/ci/core/misc/biz-image/src/main/kotlin/com/tencent/devops/image/service/InspectImageService.kt @@ -30,17 +30,13 @@ package com.tencent.devops.image.service import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import com.github.dockerjava.api.model.PullResponseItem -import com.github.dockerjava.core.DefaultDockerClientConfig -import com.github.dockerjava.core.DockerClientBuilder -import com.github.dockerjava.core.command.PullImageResultCallback import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.OkhttpUtils -import com.tencent.devops.image.config.DockerConfig +import com.tencent.devops.common.client.Client +import com.tencent.devops.dispatch.kubernetes.api.service.ServiceDockerImageResource import com.tencent.devops.image.pojo.CheckDockerImageRequest import com.tencent.devops.image.pojo.CheckDockerImageResponse -import com.tencent.devops.image.utils.CommonUtils import okhttp3.Headers.Companion.toHeaders import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request @@ -49,23 +45,17 @@ import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service +import java.util.stream.Collectors @Service class InspectImageService @Autowired constructor( - dockerConfig: DockerConfig + private val client: Client ) { companion object { private val logger = LoggerFactory.getLogger(InspectImageService::class.java) } - private val config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withDockerConfig(dockerConfig.dockerConfig) - .withApiVersion(dockerConfig.apiVersion) - .build() - - private val dockerCli = DockerClientBuilder.getInstance(config).build() - @Value("\${image.checkImageUrl:}") var checkImageUrl: String? = null @@ -77,75 +67,9 @@ class InspectImageService @Autowired constructor( if (!checkImageUrl.isNullOrBlank()) { return checkRemoteDockerImage(userId, checkDockerImageRequestList) + } else { + return checkKubernetesDockerImage(userId, checkDockerImageRequestList) } - - val imageInspectList = mutableListOf() - checkDockerImageRequestList.parallelStream().forEach { - // 判断用户录入的镜像信息是否能正常拉取到镜像 - val imageName = it.imageName - try { - val authConfig = CommonUtils.getAuthConfig( - imageName = imageName, - registryHost = it.registryHost, - registryUser = it.registryUser, - registryPwd = it.registryPwd - ) - logger.info("Start pulling the image, image name：$imageName") - dockerCli.pullImageCmd(imageName).withAuthConfig(authConfig) - .exec(MyPullImageResultCallback(userId)).awaitCompletion() - logger.info("The image was pulled successfully. Image name：$imageName") - } catch (t: Throwable) { - logger.warn("Fail to pull the image $imageName of userId $userId", t) - imageInspectList.add( - CheckDockerImageResponse( - errorCode = -1, - errorMessage = t.message, - arch = "", - author = "", - comment = "", - created = "", - dockerVersion = "", - id = "", - os = "", - osVersion = "", - parent = "", - size = 0, - repoTags = null, - repoDigests = null, - virtualSize = 0 - ) - ) - return@forEach - } - - // 查询镜像详细信息 - val imageInfo = dockerCli.inspectImageCmd(imageName).exec() - logger.info("imageInfo: $imageInfo") - imageInspectList.add( - CheckDockerImageResponse( - errorCode = 0, - errorMessage = "", - arch = imageInfo.arch, - author = imageInfo.author, - comment = imageInfo.comment, - created = imageInfo.created, - dockerVersion = imageInfo.dockerVersion, - id = imageInfo.id, - os = imageInfo.os, - osVersion = imageInfo.osVersion, - parent = imageInfo.parent, - size = imageInfo.size, - repoTags = imageInfo.repoTags, - repoDigests = imageInfo.repoDigests, - virtualSize = imageInfo.virtualSize - ) - ) - logger.info("==========================") - } - - logger.info("imageInspectList: $imageInspectList") - - return imageInspectList } fun checkRemoteDockerImage( @@ -164,7 +88,7 @@ class InspectImageService @Autowired constructor( ) .build() - OkhttpUtils.doHttp(request).use { response -> + OkhttpUtils.doLongHttp(request).use { response -> val responseContent = response.body!!.string() logger.info("$userId check remoteImage: $responseContent") if (!response.isSuccessful) { @@ -182,36 +106,47 @@ class InspectImageService @Autowired constructor( } } - inner class MyPullImageResultCallback internal constructor( - private val userId: String - ) : PullImageResultCallback() { - private val totalList = mutableListOf() - private val step = mutableMapOf() - override fun onNext(item: PullResponseItem?) { - val text = item?.progressDetail - if (null != text && text.current != null && text.total != 0L) { - val lays = if (!totalList.contains(text.total!!)) { - totalList.add(text.total!!) - totalList.size + 1 - } else { - totalList.indexOf(text.total!!) + 1 - } - var currentProgress = text.current!! * 100 / text.total!! - if (currentProgress > 100) { - currentProgress = 100 - } + fun checkKubernetesDockerImage( + userId: String, + checkDockerImageRequestList: List + ): List { + try { + val dispatchCheckDockerImageRequestList = + checkDockerImageRequestList.stream().map { checkDockerImageRequest -> + com.tencent.devops.dispatch.kubernetes.pojo.CheckDockerImageRequest( + imageName = checkDockerImageRequest.imageName, + registryHost = checkDockerImageRequest.registryHost, + registryUser = checkDockerImageRequest.registryUser, + registryPwd = checkDockerImageRequest.registryPwd + ) + }.collect(Collectors.toList()) - if (currentProgress >= step[lays]?.plus(25) ?: 5) { - logger.info("$userId pulling images, $lays layer, progress: $currentProgress%") - step[lays] = currentProgress - } - } - super.onNext(item) + val response = client.getWithoutRetry(ServiceDockerImageResource::class).checkDockerImage( + userId = userId, + checkDockerImageRequestList = dispatchCheckDockerImageRequestList + ).data + + return response?.stream()?.map { + CheckDockerImageResponse( + errorCode = it.errorCode, + errorMessage = it.errorMessage, + arch = it.arch, + author = it.author, + comment = it.comment, + created = it.created, + dockerVersion = it.dockerVersion, + id = it.id, + os = it.os, + osVersion = it.osVersion, + parent = it.parent, + size = it.size, + repoTags = it.repoTags, + repoDigests = it.repoDigests, + virtualSize = it.virtualSize + ) }?.collect(Collectors.toList()) ?: emptyList() + } catch (e: Exception) { + logger.error("Check dispatch image error: ${e.message}") + return emptyList() } } } - -// fun main(args: Array) { -// println(SecurityUtil.decrypt("7Rq3q4+3wRSkYX78nrcWNw==")) -// println(SecurityUtil.encrypt("!@#098Bcs")) -// } diff --git a/src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDao.kt b/src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDao.kt index da4dd1f095a..291832d9cc3 100644 --- a/src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDao.kt +++ b/src/backend/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDao.kt @@ -336,6 +336,7 @@ class ProcessDao { with(T_PIPELINE_RESOURCE_VERSION) { val baseStep = dslContext.update(this) .set(REFER_COUNT, referCount) + .set(UPDATE_TIME, UPDATE_TIME) referFlag?.let { baseStep.set(REFER_FLAG, referFlag) } baseStep.where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId)).and(VERSION.eq(version))).execute() } diff --git a/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/ScmCheckService.kt b/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/ScmCheckService.kt index 040284a6dfa..d9de888ecc9 100644 --- a/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/ScmCheckService.kt +++ b/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/ScmCheckService.kt @@ -35,7 +35,10 @@ import com.tencent.devops.common.api.exception.OperationException import com.tencent.devops.common.api.exception.ParamBlankException import com.tencent.devops.common.api.util.DHUtil import com.tencent.devops.common.api.util.EnvUtils +import com.tencent.devops.common.api.util.timestampmilli import com.tencent.devops.common.client.Client +import com.tencent.devops.common.pipeline.enums.ChannelCode +import com.tencent.devops.common.pipeline.enums.StartType import com.tencent.devops.plugin.api.pojo.GitCommitCheckEvent import com.tencent.devops.plugin.utils.QualityUtils import com.tencent.devops.process.utils.Credential @@ -51,6 +54,7 @@ import com.tencent.devops.repository.pojo.GithubCheckRuns import com.tencent.devops.repository.pojo.GithubCheckRunsResponse import com.tencent.devops.repository.pojo.GithubRepository import com.tencent.devops.repository.pojo.Repository +import com.tencent.devops.repository.sdk.github.pojo.CheckRunOutput import com.tencent.devops.scm.pojo.CommitCheckRequest import com.tencent.devops.scm.pojo.RepoSessionRequest import com.tencent.devops.ticket.api.ServiceCredentialResource @@ -59,6 +63,9 @@ import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service import java.net.URLEncoder +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.format.DateTimeFormatter import java.util.Base64 import javax.ws.rs.NotFoundException @@ -72,7 +79,8 @@ class ScmCheckService @Autowired constructor(private val client: Client) { targetUrl: String, context: String, description: String, - targetBranch: List? = null + targetBranch: List? = null, + channelCode: ChannelCode ): String { with(event) { logger.info("Project($$projectId) add git commit($commitId) commit check.") @@ -117,7 +125,16 @@ class ScmCheckService @Autowired constructor(private val client: Client) { description = description, block = block, mrRequestId = event.mergeRequestId, - reportData = QualityUtils.getQualityGitMrResult(client, event), + reportData = QualityUtils.getQualityGitMrResult( + client = client, + projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, + startTime = startTime, + eventStatus = status, + triggerType = triggerType, + channelCode = channelCode + ), targetBranch = targetBranch ) if (isOauth) { @@ -131,15 +148,17 @@ class ScmCheckService @Autowired constructor(private val client: Client) { fun addGithubCheckRuns( projectId: String, + pipelineId: String, + buildId: String, repositoryConfig: RepositoryConfig, name: String, commitId: String, detailUrl: String, externalId: String, status: String, - startedAt: String?, + startedAt: LocalDateTime?, conclusion: String?, - completedAt: String? + completedAt: LocalDateTime? ): GithubCheckRunsResponse { logger.info("Project($projectId) add github commit($commitId) check runs") @@ -153,9 +172,9 @@ class ScmCheckService @Autowired constructor(private val client: Client) { detailsUrl = detailUrl, externalId = externalId, status = status, - startedAt = startedAt, + startedAt = startedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT), conclusion = conclusion, - completedAt = completedAt + completedAt = completedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT) ) return client.get(ServiceGithubResource::class).addCheckRuns( @@ -168,15 +187,19 @@ class ScmCheckService @Autowired constructor(private val client: Client) { fun updateGithubCheckRuns( checkRunId: Long, projectId: String, + pipelineId: String, + buildId: String, repositoryConfig: RepositoryConfig, name: String, commitId: String, detailUrl: String, externalId: String, status: String, - startedAt: String?, + startedAt: LocalDateTime?, conclusion: String?, - completedAt: String? + completedAt: LocalDateTime?, + pipelineName: String, + channelCode: ChannelCode ) { logger.info("Project($projectId) update github commit($commitId) check runs") @@ -190,9 +213,24 @@ class ScmCheckService @Autowired constructor(private val client: Client) { detailsUrl = detailUrl, externalId = externalId, status = status, - startedAt = startedAt, + startedAt = startedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT), conclusion = conclusion, - completedAt = completedAt + completedAt = completedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT), + output = CheckRunOutput( + summary = "This check concluded as $conclusion.", + text = null, // github + title = pipelineName, + reportData = QualityUtils.getQualityGitMrResult( + client = client, + projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, + startTime = startedAt?.timestampmilli() ?: 0L, + eventStatus = status, + triggerType = StartType.WEB_HOOK.name, + channelCode = channelCode + ) + ) ) client.get(ServiceGithubResource::class).updateCheckRuns( diff --git a/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/git/CodeWebhookService.kt b/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/git/CodeWebhookService.kt index 8fa0d8a3de8..f06b59264fe 100644 --- a/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/git/CodeWebhookService.kt +++ b/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/service/git/CodeWebhookService.kt @@ -79,7 +79,6 @@ import org.springframework.stereotype.Service import java.time.Instant import java.time.LocalDateTime import java.time.ZoneId -import java.time.format.DateTimeFormatter @Service @Suppress("ALL") @@ -232,7 +231,7 @@ class CodeWebhookService @Autowired constructor( repositoryConfig = repositoryConfig, commitId = commitId, status = status, - startedAt = null, + startedAt = (event.startTime ?: 0L) / 1000, // 毫秒 -> 秒 conclusion = conclusion, completedAt = LocalDateTime.now().timestamp(), userId = event.userId, @@ -280,8 +279,10 @@ class CodeWebhookService @Autowired constructor( return } - if (variables[PIPELINE_START_CHANNEL] != ChannelCode.BS.name) { - logger.warn("Process instance($buildId) is not bs channel") + if (variables[PIPELINE_START_CHANNEL] != ChannelCode.BS.name && + variables[PIPELINE_START_CHANNEL] != ChannelCode.GONGFENGSCAN.name + ) { + logger.warn("Process instance($buildId) is not bs or gongfengscan channel") return } @@ -406,9 +407,9 @@ class CodeWebhookService @Autowired constructor( logger.warn("Build($buildId) number is null") return } + val channelCode = variables[PIPELINE_START_CHANNEL]?.let { ChannelCode.getChannel(it) } ?: ChannelCode.BS + val targetUrl = "${HomeHostUtil.innerServerHost()}/console/pipeline/$projectId/$pipelineId/detail/$buildId" - val serverHost = HomeHostUtil.innerServerHost() - val targetUrl = "$serverHost/console/pipeline/$projectId/$pipelineId/detail/$buildId" val description = when (state) { GIT_COMMIT_CHECK_STATE_PENDING -> "Your pipeline [$pipelineName] is running" GIT_COMMIT_CHECK_STATE_ERROR -> "Your pipeline [$pipelineName] is failed" @@ -454,7 +455,8 @@ class CodeWebhookService @Autowired constructor( mutableListOf(targetBranch!!) } else { null - } + }, + channelCode = channelCode ) pluginGitCheckDao.create( dslContext = dslContext, @@ -476,7 +478,8 @@ class CodeWebhookService @Autowired constructor( event = event, targetUrl = targetUrl, pipelineName = pipelineName, - description = description + description = description, + channelCode = channelCode ) } // mr锁定并且状态为pending时才需要解锁hook锁 @@ -495,7 +498,8 @@ class CodeWebhookService @Autowired constructor( event: GitCommitCheckEvent, targetUrl: String, pipelineName: String, - description: String + description: String, + channelCode: ChannelCode ) { if (record == null) { logger.warn("Illegal pluginGitCheck data,Failed to add commit check information") @@ -511,7 +515,8 @@ class CodeWebhookService @Autowired constructor( mutableListOf(record.targetBranch) } else { null - } + }, + channelCode = channelCode ) pluginGitCheckDao.update( dslContext = dslContext, @@ -615,6 +620,8 @@ class CodeWebhookService @Autowired constructor( val pipelineName = buildInfo.pipelineName val webhookEventType = variables[BK_REPO_GIT_WEBHOOK_EVENT_TYPE] val name = "$pipelineName@$webhookEventType" + + val channelCode = variables[PIPELINE_START_CHANNEL]?.let { ChannelCode.getChannel(it) } ?: ChannelCode.BS val detailUrl = "${HomeHostUtil.innerServerHost()}/console/pipeline/$projectId/$pipelineId/detail/$buildId" while (true) { @@ -637,9 +644,11 @@ class CodeWebhookService @Autowired constructor( detailUrl = detailUrl, externalId = "${userId}_${projectId}_${pipelineId}_$buildId", status = status, - startedAt = startedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT), + startedAt = startedAt, conclusion = conclusion, - completedAt = completedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT) + completedAt = completedAt, + pipelineId = pipelineId, + buildId = buildId ) pluginGithubCheckDao.create( dslContext = dslContext, @@ -658,25 +667,25 @@ class CodeWebhookService @Autowired constructor( val checkRunId = if (conclusion == null) { val result = scmCheckService.addGithubCheckRuns( projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, repositoryConfig = repositoryConfig, name = record.checkRunName ?: "$pipelineName #$buildNum", commitId = commitId, detailUrl = detailUrl, externalId = "${userId}_${projectId}_${pipelineId}_$buildId", status = status, - startedAt = startedAt?.atZone(ZoneId.systemDefault())?.format( - DateTimeFormatter.ISO_INSTANT - ), + startedAt = startedAt, conclusion = conclusion, - completedAt = completedAt?.atZone(ZoneId.systemDefault())?.format( - DateTimeFormatter.ISO_INSTANT - ) + completedAt = completedAt ) result.id } else { scmCheckService.updateGithubCheckRuns( checkRunId = record.checkRunId, projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, repositoryConfig = repositoryConfig, // 兼容历史数据 name = record.checkRunName ?: "$pipelineName #$buildNum", @@ -684,13 +693,11 @@ class CodeWebhookService @Autowired constructor( detailUrl = detailUrl, externalId = "${userId}_${projectId}_${pipelineId}_$buildId", status = status, - startedAt = startedAt?.atZone(ZoneId.systemDefault())?.format( - DateTimeFormatter.ISO_INSTANT - ), + startedAt = startedAt, conclusion = conclusion, - completedAt = completedAt?.atZone(ZoneId.systemDefault())?.format( - DateTimeFormatter.ISO_INSTANT - ) + completedAt = completedAt, + pipelineName = pipelineName, + channelCode = channelCode ) record.checkRunId } diff --git a/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/utils/QualityUtils.kt b/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/utils/QualityUtils.kt index 81beaf3e557..5194a2c100c 100644 --- a/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/utils/QualityUtils.kt +++ b/src/backend/ci/core/misc/biz-plugin/src/main/kotlin/com/tencent/devops/plugin/utils/QualityUtils.kt @@ -29,11 +29,11 @@ package com.tencent.devops.plugin.utils import com.tencent.devops.common.api.util.DateTimeUtil import com.tencent.devops.common.client.Client +import com.tencent.devops.common.pipeline.enums.ChannelCode import com.tencent.devops.common.pipeline.enums.StartType import com.tencent.devops.common.quality.pojo.enums.QualityOperation import com.tencent.devops.common.service.utils.HomeHostUtil import com.tencent.devops.common.web.utils.I18nUtil -import com.tencent.devops.plugin.api.pojo.GitCommitCheckEvent import com.tencent.devops.plugin.codecc.CodeccUtils import com.tencent.devops.plugin.constant.PluginMessageCode.BK_CI_PIPELINE import com.tencent.devops.process.api.service.ServicePipelineResource @@ -45,31 +45,57 @@ import com.tencent.devops.quality.constant.codeccToolUrlPathMap @Suppress("ALL") object QualityUtils { + /** + * 获取质量红线结果 + * @param client + * @param projectId 项目ID + * @param pipelineId 流水线ID + * @param buildId 流水线构建ID + * @param eventStatus 事件状态 + * @param startTime 事件开始时间 + * @param triggerType 触发类型 + * @param insertUrl 是否插入链接地址[github 不需要插入链接] + */ fun getQualityGitMrResult( client: Client, - event: GitCommitCheckEvent + projectId: String, + pipelineId: String, + buildId: String, + eventStatus: String, + startTime: Long, + triggerType: String, + channelCode: ChannelCode ): Pair, MutableMap>>> { - val projectId = event.projectId - val pipelineId = event.pipelineId - val buildId = event.buildId val pipelineName = client.get(ServicePipelineResource::class) - .getPipelineNameByIds(projectId, setOf(pipelineId)) - .data?.get(pipelineId) ?: "" - - val titleData = mutableListOf(event.status, - DateTimeUtil.formatMilliTime(System.currentTimeMillis() - event.startTime), - StartType.toReadableString( - event.triggerType, - null, - I18nUtil.getLanguage(I18nUtil.getRequestUserId()) - ), - pipelineName, - "${HomeHostUtil.innerServerHost()}/console/pipeline/$projectId/$pipelineId/detail/$buildId", - I18nUtil.getCodeLanMessage(BK_CI_PIPELINE) + .getPipelineNameByIds(projectId, setOf(pipelineId)) + .data?.get(pipelineId) ?: "" + // github 不需要插入链接, 仅在插件名处插入链接，链接地址用codecc插件输出变量 + val titleData = mutableListOf( + eventStatus, + DateTimeUtil.formatMilliTime(System.currentTimeMillis() - startTime), + StartType.toReadableString( + triggerType, + null, + I18nUtil.getLanguage(I18nUtil.getRequestUserId()) + ), + pipelineName, + if (ChannelCode.isNeedAuth(channelCode)) { + "${HomeHostUtil.innerServerHost()}/console/pipeline/$projectId/$pipelineId/detail/$buildId" + } else { + "" + }, + I18nUtil.getCodeLanMessage(BK_CI_PIPELINE) ) val ruleName = mutableSetOf() - + // 插件输出变量 + val reportUrl = getBuildVar( + client = client, + projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, + varName = CodeccUtils.BK_CI_CODECC_REPORT_URL + ) // key：质量红线产出插件 // value：指标、预期、结果、状态 val resultMap = mutableMapOf>>() @@ -79,19 +105,26 @@ object QualityUtils { val indicator = client.get(ServiceQualityIndicatorResource::class) .get(projectId, interceptItem.indicatorId).data val indicatorElementName = indicator?.elementType ?: "" - val elementCnName = ElementUtils.getElementCnName(indicatorElementName, projectId) + + val elementCnName = ElementUtils.getElementCnName(indicatorElementName, projectId).let { + if (!ChannelCode.isNeedAuth(channelCode) && !reportUrl.isNullOrBlank()) { + "$it" + } else { + it + } + } val resultList = resultMap[elementCnName] ?: mutableListOf() - val actualValue = if (CodeccUtils.isCodeccAtom(indicatorElementName)) { - getActualValue( + val actualValue = when { + CodeccUtils.isCodeccAtom(indicatorElementName) -> getActualValue( projectId = projectId, pipelineId = pipelineId, buildId = buildId, detail = indicator?.elementDetail, value = interceptItem.actualValue ?: "null", - client = client + client = client, + channelCode = channelCode ) - } else { - interceptItem.actualValue ?: "null" + else -> interceptItem.actualValue ?: "null" } resultList.add( listOf( @@ -116,15 +149,16 @@ object QualityUtils { buildId: String, detail: String?, value: String, - client: Client + client: Client, + channelCode: ChannelCode ): String { - val variable = client.get(ServiceVarResource::class).getBuildVar( + val taskId = getBuildVar( + client = client, projectId = projectId, pipelineId = pipelineId, buildId = buildId, varName = CodeccUtils.BK_CI_CODECC_TASK_ID - ).data - val taskId = variable?.get(CodeccUtils.BK_CI_CODECC_TASK_ID) + ) return if (detail.isNullOrBlank() || detail.split(",").size > 1) { "$value" @@ -134,7 +168,28 @@ object QualityUtils { .replace("##taskId##", taskId.toString()) .replace("##buildId##", buildId) .replace("##detail##", detail) - "$value" + if (ChannelCode.isNeedAuth(channelCode)) { + "$value" + } else { + "$value" + } } } + + private fun getBuildVar( + client: Client, + projectId: String, + pipelineId: String, + buildId: String, + varName: String + ): String? { + val variable = client.get(ServiceVarResource::class).getBuildVar( + projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, + varName = varName + ).data + val taskId = variable?.get(varName) + return taskId + } } diff --git a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/CMSApi.kt b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/CMSApi.kt index d530b3c724d..be591335f38 100644 --- a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/CMSApi.kt +++ b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/CMSApi.kt @@ -61,6 +61,7 @@ import javax.net.ssl.SSLContext import javax.net.ssl.SSLSocketFactory import javax.net.ssl.TrustManager import javax.net.ssl.X509TrustManager +import okhttp3.Headers.Companion.toHeaders class CMSApi(private val notifyProperties: NotifyProperties) { @@ -171,6 +172,7 @@ class CMSApi(private val notifyProperties: NotifyProperties) { val request = Request.Builder() .url(url) + .headers(body.toMap().toHeaders()) .post(requestBody) .build() val result = this.doRequest(request) diff --git a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt index d628898bd5f..6d7ebd9398e 100644 --- a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt +++ b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt @@ -32,4 +32,15 @@ abstract class ApiReq( open var bk_app_secret: String?, open var bk_token: String?, open val bk_username: String? -) +) { + fun toMap(): Map { + return mapOf( + "X-Bkapi-Authorization" to """{ + "bk_app_code":"$bk_app_code", + "bk_app_secret":"$bk_app_secret", + "bk_username":"$bk_username", + "bk_token":"$bk_token" + }""".trimIndent().replace("\\s".toRegex(), "") + ) + } +} diff --git a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/service/notifier/WeworkGroupNotifier.kt b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/service/notifier/WeworkGroupNotifier.kt index 2aac7ff87ee..14d86a869f2 100644 --- a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/service/notifier/WeworkGroupNotifier.kt +++ b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/service/notifier/WeworkGroupNotifier.kt @@ -31,7 +31,7 @@ class WeworkGroupNotifier @Autowired constructor( commonNotifyMessageTemplateRecord: TCommonNotifyMessageTemplateRecord ) { logger.info("send WEWORK_GROUP msg: $commonNotifyMessageTemplateRecord.id") - val groups = request.bodyParams?.get(NotifyUtils.WEWORK_GROUP_KEY)?.split(",") + val groups = request.bodyParams?.get(NotifyUtils.WEWORK_GROUP_KEY)?.split("[,;]".toRegex()) if (groups.isNullOrEmpty()) { logger.info("wework group is empty, so return.") return diff --git a/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwBuildResourceV4.kt b/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwBuildResourceV4.kt index da13e54e453..59d88faf91b 100644 --- a/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwBuildResourceV4.kt +++ b/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwBuildResourceV4.kt @@ -234,19 +234,19 @@ interface ApigwBuildResourceV4 { ) @QueryParam("updateTimeDesc") updateTimeDesc: Boolean? = null, - @Parameter(description = "代码库别名", required = false) + @Parameter(description = "源材料代码库别名", required = false) @QueryParam("materialAlias") materialAlias: List?, @Parameter(description = "代码库URL", required = false) @QueryParam("materialUrl") materialUrl: String?, - @Parameter(description = "分支", required = false) + @Parameter(description = "源材料分支", required = false) @QueryParam("materialBranch") materialBranch: List?, - @Parameter(description = "commitId", required = false) + @Parameter(description = "源材料commitId", required = false) @QueryParam("materialCommitId") materialCommitId: String?, - @Parameter(description = "commitMessage", required = false) + @Parameter(description = "源材料commitMessage", required = false) @QueryParam("materialCommitMessage") materialCommitMessage: String?, @Parameter(description = "状态", required = false) @@ -296,7 +296,13 @@ interface ApigwBuildResourceV4 { startUser: List?, @Parameter(description = "是否查询归档数据", required = false) @QueryParam("archiveFlag") - archiveFlag: Boolean? = false + archiveFlag: Boolean? = false, + @Parameter(description = "触发代码库", required = false) + @QueryParam("triggerAlias") + triggerAlias: List? = null, + @Parameter(description = "触发分支", required = false) + @QueryParam("triggerBranch") + triggerBranch: List? = null ): Result> @Operation(summary = "获取流水线手动启动参数", tags = ["v4_app_build_startInfo", "v4_user_build_startInfo"]) diff --git a/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwRepositoryResourceV4.kt b/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwRepositoryResourceV4.kt index 6653a81555f..8d9ae930658 100644 --- a/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwRepositoryResourceV4.kt +++ b/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/api/apigw/v4/ApigwRepositoryResourceV4.kt @@ -243,4 +243,46 @@ interface ApigwRepositoryResourceV4 { @QueryParam("repositoryType") repositoryType: RepositoryType? ): Result + + @Operation(summary = "开启PAC", tags = ["v4_app_repository_enable_pac", "v4_user_repository_enable_pac"]) + @PUT + @Path("/{repositoryHashId}/pac/enable") + fun enablePac( + @Parameter(description = "appCode", required = true, example = AUTH_HEADER_DEVOPS_APP_CODE_DEFAULT_VALUE) + @HeaderParam(AUTH_HEADER_DEVOPS_APP_CODE) + appCode: String?, + @Parameter(description = "apigw Type", required = true) + @PathParam("apigwType") + apigwType: String?, + @Parameter(description = "用户ID", required = true, example = AUTH_HEADER_DEVOPS_USER_ID_DEFAULT_VALUE) + @HeaderParam(AUTH_HEADER_DEVOPS_USER_ID) + userId: String, + @Parameter(description = "项目ID(项目英文名)", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "代码库哈希ID", required = true) + @PathParam("repositoryHashId") + repositoryHashId: String + ): Result + + @Operation(summary = "关闭PAC", tags = ["v4_app_repository_disable_pac", "v4_user_repository_disable_pac"]) + @PUT + @Path("/{repositoryHashId}/pac/disable") + fun disablePac( + @Parameter(description = "appCode", required = true, example = AUTH_HEADER_DEVOPS_APP_CODE_DEFAULT_VALUE) + @HeaderParam(AUTH_HEADER_DEVOPS_APP_CODE) + appCode: String?, + @Parameter(description = "apigw Type", required = true) + @PathParam("apigwType") + apigwType: String?, + @Parameter(description = "用户ID", required = true, example = AUTH_HEADER_DEVOPS_USER_ID_DEFAULT_VALUE) + @HeaderParam(AUTH_HEADER_DEVOPS_USER_ID) + userId: String, + @Parameter(description = "项目ID(项目英文名)", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "代码库哈希ID", required = true) + @PathParam("repositoryHashId") + repositoryHashId: String + ): Result } diff --git a/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/constant/OpenAPIMessageCode.kt b/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/constant/OpenAPIMessageCode.kt index ccc3dfdad92..de4d3f7f217 100644 --- a/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/constant/OpenAPIMessageCode.kt +++ b/src/backend/ci/core/openapi/api-openapi/src/main/kotlin/com/tencent/devops/openapi/constant/OpenAPIMessageCode.kt @@ -91,4 +91,5 @@ object OpenAPIMessageCode { const val BK_THE_FIELD_IS_READ_ONLY = "bkTheFieldIsReadOnly" // 该字段只读 const val BK_OBJECT_PROPERTY_ILLUSTRATE = "bkObjectPropertyIllustrate" // Any 任意类型，参照实际请求或返回 const val BK_NO_SUCH_PARAMETER = "bkNoSuchParameter" // 无此参数 + const val APP_CODE_PERMISSION_DENIED_MESSAGE = "appCodePermissionDeniedMessage" } diff --git a/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/aspect/ApiAspect.kt b/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/aspect/ApiAspect.kt index 3bf300210db..852b472560f 100644 --- a/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/aspect/ApiAspect.kt +++ b/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/aspect/ApiAspect.kt @@ -37,6 +37,7 @@ import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.service.BkTag import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.openapi.IgnoreProjectId +import com.tencent.devops.openapi.constant.OpenAPIMessageCode import com.tencent.devops.openapi.constant.OpenAPIMessageCode.PARAM_VERIFY_FAIL import com.tencent.devops.openapi.es.ESMessage import com.tencent.devops.openapi.es.IESService @@ -183,7 +184,11 @@ class ApiAspect( if (appCode != null && apigwType == "apigw-app" && !appCodeService.validAppCode(appCode, projectId)) { throw PermissionForbiddenException( - message = "Permission denied: apigwType[$apigwType],appCode[$appCode],ProjectId[$projectId]" + message = "Permission denied: apigwType[$apigwType]," + + "appCode[$appCode],ProjectId[$projectId] " + I18nUtil.getCodeLanMessage( + messageCode = OpenAPIMessageCode.APP_CODE_PERMISSION_DENIED_MESSAGE, + language = I18nUtil.getLanguage(userId) + ) ) } } diff --git a/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwBuildResourceV4Impl.kt b/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwBuildResourceV4Impl.kt index 074d54d28b3..8d484cc457a 100644 --- a/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwBuildResourceV4Impl.kt +++ b/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwBuildResourceV4Impl.kt @@ -128,7 +128,9 @@ class ApigwBuildResourceV4Impl @Autowired constructor( buildNoEnd: Int?, buildMsg: String?, startUser: List?, - archiveFlag: Boolean? + archiveFlag: Boolean?, + triggerAlias: List?, + triggerBranch: List? ): Result> { logger.info( "OPENAPI_BUILD_V4|$userId|get history build|$projectId|$pipelineId|$page|$pageSize" + @@ -165,7 +167,9 @@ class ApigwBuildResourceV4Impl @Autowired constructor( buildNoEnd = buildNoEnd, buildMsg = buildMsg, startUser = startUser, - archiveFlag = archiveFlag + archiveFlag = archiveFlag, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch ) } diff --git a/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwRepositoryResourceV4Impl.kt b/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwRepositoryResourceV4Impl.kt index df6157e8e97..cb645581dca 100644 --- a/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwRepositoryResourceV4Impl.kt +++ b/src/backend/ci/core/openapi/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/resources/apigw/v4/ApigwRepositoryResourceV4Impl.kt @@ -33,6 +33,7 @@ import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.client.Client import com.tencent.devops.common.web.RestResource import com.tencent.devops.openapi.api.apigw.v4.ApigwRepositoryResourceV4 +import com.tencent.devops.repository.api.ServiceRepositoryPacResource import com.tencent.devops.repository.api.ServiceRepositoryResource import com.tencent.devops.repository.pojo.Repository import com.tencent.devops.repository.pojo.RepositoryId @@ -126,6 +127,36 @@ class ApigwRepositoryResourceV4Impl @Autowired constructor(private val client: C ) } + override fun enablePac( + appCode: String?, + apigwType: String?, + userId: String, + projectId: String, + repositoryHashId: String + ): Result { + logger.info("OPENAPI_REPOSITORY_V4|$userId|enable PAC of repo in project|$projectId|$repositoryHashId") + return client.get(ServiceRepositoryPacResource::class).enablePac( + userId = userId, + projectId = projectId, + repositoryHashId = repositoryHashId + ) + } + + override fun disablePac( + appCode: String?, + apigwType: String?, + userId: String, + projectId: String, + repositoryHashId: String + ): Result { + logger.info("OPENAPI_REPOSITORY_V4|$userId|disable PAC of repo in project|$projectId|$repositoryHashId") + return client.get(ServiceRepositoryPacResource::class).disablePac( + userId = userId, + projectId = projectId, + repositoryHashId = repositoryHashId + ) + } + companion object { private val logger = LoggerFactory.getLogger(ApigwRepositoryResourceV4Impl::class.java) } diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/engine/api/BuildJobResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/engine/api/BuildJobResource.kt index a4d2d8dd753..2b8514919e5 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/engine/api/BuildJobResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/engine/api/BuildJobResource.kt @@ -37,6 +37,7 @@ import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.pipeline.pojo.JobHeartbeatRequest import com.tencent.devops.common.web.annotation.BkField import com.tencent.devops.engine.api.pojo.HeartBeatInfo +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTaskResult import com.tencent.devops.process.pojo.BuildVariables @@ -132,7 +133,9 @@ interface BuildJobResource { vmSeqId: String, @Parameter(description = "构建机名称", required = true) @HeaderParam(AUTH_HEADER_DEVOPS_VM_NAME) - vmName: String + vmName: String, + @Parameter(description = "执行结果", required = false) + result: BuildJobResult? = null ): Result @Operation(summary = "Job超时触发") diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResource.kt index 99f0888e629..5a895eb73a7 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResource.kt @@ -347,6 +347,15 @@ interface AppPipelineBuildResource { buildMsg: String?, @Parameter(description = "查看指定版本调试数据", required = false, example = "false") @QueryParam("version") - customVersion: Int? = null + customVersion: Int? = null, + @Parameter(description = "触发代码库", required = false) + @QueryParam("triggerAlias") + triggerAlias: List?, + @Parameter(description = "触发分支", required = false) + @QueryParam("triggerBranch") + triggerBranch: List?, + @Parameter(description = "触发人", required = false) + @QueryParam("triggerUser") + triggerUser: List? ): Result> } diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt index dc354308da1..1449fbf041f 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt @@ -161,7 +161,13 @@ interface BuildSubPipelineResource { includeConst: Boolean? = true, @Parameter(description = "是否包含非入参", required = false, example = "") @QueryParam("includeNotRequired") - includeNotRequired: Boolean? = true + includeNotRequired: Boolean? = true, + @Parameter(description = "项目ID", required = true) + @HeaderParam(AUTH_HEADER_DEVOPS_PROJECT_ID) + parentProjectId: String, + @Parameter(description = "当前流水线ID", required = true) + @HeaderParam(AUTH_HEADER_DEVOPS_PIPELINE_ID) + parentPipelineId: String ): Result> @Operation(summary = "根据流水线名称获取流水线ID") diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResource.kt index 7d94a76612c..5ddbb049a65 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResource.kt @@ -59,6 +59,9 @@ interface ExternalScmResource { @Parameter(description = "X-Token") @HeaderParam("X-Token") secret: String? = null, + @Parameter(description = "来源类型,是否是测试请求") + @HeaderParam("X-Source-Type") + sourceType: String? = null, @Parameter(description = "X-TRACE-ID") @HeaderParam("X-TRACE-ID") traceId: String, diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceBuildResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceBuildResource.kt index 7b22149b9c5..6751c48ca3f 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceBuildResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceBuildResource.kt @@ -496,7 +496,7 @@ interface ServiceBuildResource { @Parameter(description = "构建信息", required = false) @QueryParam("buildMsg") buildMsg: String? = null, - @Parameter(description = "触发人", required = false) + @Parameter(description = "执行人", required = false) @QueryParam("startUser") startUser: List? = null, @Parameter(description = "是否查询归档数据", required = false) @@ -504,7 +504,16 @@ interface ServiceBuildResource { archiveFlag: Boolean? = false, @Parameter(description = "查看指定版本调试数据", required = false, example = "false") @QueryParam("version") - customVersion: Int? = null + customVersion: Int? = null, + @Parameter(description = "触发代码库", required = false) + @QueryParam("triggerAlias") + triggerAlias: List? = null, + @Parameter(description = "触发分支", required = false) + @QueryParam("triggerBranch") + triggerBranch: List? = null, + @Parameter(description = "触发人", required = false) + @QueryParam("triggerUser") + triggerUser: List? = null ): Result> @Operation(summary = "获取构建详情") diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServicePipelineAuthorizationResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServicePipelineAuthorizationResource.kt new file mode 100644 index 00000000000..d962967c2e9 --- /dev/null +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServicePipelineAuthorizationResource.kt @@ -0,0 +1,61 @@ +/* + * 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.service + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +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 + +@Tag(name = "SERVICE_AUTHORIZATION", description = "流水线授权管理") +@Path("/service/pipeline/authorization") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface ServicePipelineAuthorizationResource { + @Operation(summary = "重置流水线授权管理") + @POST + @Path("/{projectId}/resetPipelineAuthorization/{preCheck}") + fun resetPipelineAuthorization( + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "是否为预检查", required = true) + @PathParam("preCheck") + preCheck: Boolean, + @Parameter(description = "请求体", required = true) + resourceAuthorizationHandoverDTOs: List + ): Result>> +} diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserBuildResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserBuildResource.kt index 6a744d74b60..85a4c979ad5 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserBuildResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserBuildResource.kt @@ -38,6 +38,7 @@ import com.tencent.devops.common.pipeline.pojo.BuildParameters import com.tencent.devops.common.pipeline.pojo.StageReviewRequest import com.tencent.devops.common.pipeline.pojo.element.Element import com.tencent.devops.common.web.annotation.BkField +import com.tencent.devops.process.enums.HistorySearchType import com.tencent.devops.process.pojo.BuildHistory import com.tencent.devops.process.pojo.BuildHistoryRemark import com.tencent.devops.process.pojo.BuildId @@ -400,13 +401,13 @@ interface UserBuildResource { @Parameter(description = "每页多少条", required = false, example = "20") @QueryParam("pageSize") pageSize: Int?, - @Parameter(description = "代码库别名", required = false) + @Parameter(description = "源材料代码库别名", required = false) @QueryParam("materialAlias") materialAlias: List?, @Parameter(description = "代码库URL", required = false) @QueryParam("materialUrl") materialUrl: String?, - @Parameter(description = "分支", required = false) + @Parameter(description = "源材料分支", required = false) @QueryParam("materialBranch") materialBranch: List?, @Parameter(description = "commitId", required = false) @@ -462,7 +463,16 @@ interface UserBuildResource { archiveFlag: Boolean? = false, @Parameter(description = "查看指定版本调试数据", required = false, example = "false") @QueryParam("version") - customVersion: Int? = null + customVersion: Int? = null, + @Parameter(description = "触发代码库", required = false) + @QueryParam("triggerAlias") + triggerAlias: List?, + @Parameter(description = "触发分支", required = false) + @QueryParam("triggerBranch") + triggerBranch: List?, + @Parameter(description = "触发方式", required = false) + @QueryParam("triggerUser") + triggerUser: List? ): Result> @Operation(summary = "修改流水线备注") @@ -534,7 +544,13 @@ interface UserBuildResource { pipelineId: String, @Parameter(description = "查看指定版本调试数据", required = false, example = "false") @QueryParam("version") - debugVersion: Int? = null + debugVersion: Int? = null, + @Parameter(description = "搜索分支关键字", required = false) + @QueryParam("search") + search: String?, + @Parameter(description = "搜索类型, 触发/源材料", required = false) + @QueryParam("type") + type: HistorySearchType? ): Result> @Operation(summary = "获取流水线构建中的查询条件-分支") @@ -556,7 +572,13 @@ interface UserBuildResource { alias: List?, @Parameter(description = "查看指定版本调试数据", required = false, example = "false") @QueryParam("debugVersion") - debugVersion: Int? = null + debugVersion: Int? = null, + @Parameter(description = "搜索分支关键字", required = false) + @QueryParam("search") + search: String?, + @Parameter(description = "搜索类型,触发/源材料", required = false) + @QueryParam("type") + type: HistorySearchType? ): Result> @Operation(summary = "触发审核") diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt index 558494122b0..857d93b9b7f 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt @@ -287,10 +287,10 @@ object ProcessMessageCode { const val ERROR_NO_PERMISSION_PLUGIN_IN_TEMPLATE = "2101176" // 模版下存在无权限的插件 const val PIPELINE_ORCHESTRATIONS_NUMBER_ILLEGAL = "2101177" // 流水线编排数量非法 const val MAXIMUM_NUMBER_CONCURRENCY_ILLEGAL = "2101178" // 最大并发数量非法 - const val PIPELINE_BUILD_HAS_ENDED_CANNOT_BE_CANCELED = "2101179" // 流水线: 流水线构建已结束，不能取消 - const val GET_PIPELINE_ATOM_INFO_NO_PERMISSION = "2101180" // 无权访问插件{0}的流水线信息，请联系组件管理员 - const val GROUP_IS_EXIST = "2101181" // 分组({0})已存在/group ({0}) is already exist - const val GROUP_LABEL_IS_EXIST = "2101182" // 分组标签({0})已存在/group label ({0}) is already exist + const val GET_PIPELINE_ATOM_INFO_NO_PERMISSION = "2101179" // 无权访问插件{0}的流水线信息，请联系组件管理员 + const val GROUP_IS_EXIST = "2101180" // 分组({0})已存在/group ({0}) is already exist + const val GROUP_LABEL_IS_EXIST = "2101181" // 分组标签({0})已存在/group label ({0}) is already exist + const val PIPELINE_BUILD_HAS_ENDED_CANNOT_BE_OPERATE = "2101182" // 流水线: 流水线构建已结束，不能操作 const val ERROR_NO_PERMISSION_OPERATION_TEMPLATE = "2101183" // 用户没有操作模板的权限 const val ERROR_NO_PIPELINE_VERSION_EXISTS_BY_ID = "2101184" // 流水线版本[{0}]不存在 @@ -334,6 +334,11 @@ object ProcessMessageCode { const val ERROR_TASK_NOT_ALLOWED_TO_BE_SKIPPED = "2101221" // task不允许被跳过 const val ERROR_INCORRECT_NOTIFICATION_TYPE = "2101230" // 通知类型配置不正确，请检查 const val ERROR_INCORRECT_NOTIFICATION_MESSAGE_CONTENT = "2101231" // 通知内容为空，请检查 + const val ERROR_AGENT_REUSE_MUTEX_JOB_NULL = "2101232" // {0}使用流水线构建机复用互斥组需要声明具体的JobId，不能为空 + // 流水线构建机复用互斥组节点 {0} 复用的 {1} 不存在，或非第三方构建机节点 + const val ERROR_AGENT_REUSE_MUTEX_DEP_NULL_NODE = "2101233" + // 在 {0} 下，构建机复用互斥组节点 {1} 与被复用的 {2} 节点调度类型不同，AgentId和AgentEnv不能互相复用 + const val ERROR_AGENT_REUSE_MUTEX_DEP_ERROR = "2101234" const val ERROR_YAML_PUSH_CREATE_BRANCH = "2101235" // 创建分支失败: {0} const val ERROR_YAML_PUSH_CREATE_BRANCH_NO_PERMISSION = "2101236" // 用户{0}没有代码库{1}的创建分支权限 const val ERROR_YAML_PUSH_CREATE_FILE = "2101237" // 创建文件失败: {0} @@ -343,12 +348,6 @@ object ProcessMessageCode { const val ERROR_GIT_PROJECT_NOT_FOUND_OR_NOT_PERMISSION = "2101241" // 工蜂仓库({0})不存在或没有权限访问 const val ERROR_TGIT_SERVER_EXCEPTION = "2101242" // 工蜂服务异常 - const val ERROR_AGENT_REUSE_MUTEX_JOB_NULL = "2101232" // {0}使用流水线构建机复用互斥组需要声明具体的JobId，不能为空 - // 流水线构建机复用互斥组节点 {0} 复用的 {1} 不存在，或非第三方构建机节点 - const val ERROR_AGENT_REUSE_MUTEX_DEP_NULL_NODE = "2101233" - // 在 {0} 下，构建机复用互斥组节点 {1} 与被复用的 {2} 节点调度类型不同，AgentId和AgentEnv不能互相复用 - const val ERROR_AGENT_REUSE_MUTEX_DEP_ERROR = "2101234" - const val ERROR_TIMER_TRIGGER_SVN_BRANCH_NOT_EMPTY = "2101243" // 定时触发SVN分支不能为空 const val ERROR_PIPELINE_ELEMENT_CHECK_FAILED = "2101244" // 流水线有效性校验失败 const val ERROR_TIMER_TRIGGER_REPO_NOT_FOUND = "2101245" // 定时触发代码库不存在 @@ -356,13 +355,12 @@ object ProcessMessageCode { const val ERROR_PIPELINE_TIMER_BRANCH_IS_EMPTY = "2101247" // 流水线定时触发分支为空 const val ERROR_PIPELINE_TIMER_BRANCH_NO_CHANGE = "2101248" // 定时触发分支{0}代码没有变更 const val ERROR_PIPELINE_TIMER_BRANCH_NOT_FOUND = "2101249" // 定时触发分支{0}不存在 - const val ERROR_PIPELINE_TIMER_BRANCH_UNKNOWN = "2101252" // 定时触发分支{0}未知错误 - const val ERROR_PIPELINE_JOB_ID_FORMAT = "2101250" // 流水线Job:{0}的jobId为空或长度超过{1}位 const val ERROR_PIPELINE_JOB_CONTROL_NODECURR = "2101251" // 流水线Job:{0}的单节点或总结点并发配置需要为小于1000的正整数 - + const val ERROR_PIPELINE_TIMER_BRANCH_UNKNOWN = "2101252" // 定时触发分支{0}未知错误 const val ERROR_PIPELINE_CONDITION_EXPRESSION_TOO_LONG = "2101253" // 自定义条件表达式{0}的长度超过{1}位 const val ERROR_PIPELINE_BUILD_START_PARAM_NO_EMPTY = "2101254" // 构建启动参数如果必填，不能为空 + const val ERROR_REPEATEDLY_START_VM = "2101255" // 重复启动构建机，当前构建机的状态为：{0} const val BK_SUCCESSFULLY_DISTRIBUTED = "bkSuccessfullyDistributed" // 跨项目构件分发成功，共分发了{0}个文件 const val BK_SUCCESSFULLY_FAILED = "bkSuccessfullyFailed" // 跨项目构件分发失败， @@ -541,7 +539,6 @@ object ProcessMessageCode { const val BK_PIPELINE_RUN_CONDITION_NOT_MATCH = "bkPipelineRunConditionNotMatch" // 执行条件为满足，将跳过 const val BK_PIPELINE_RUN_CONDITION_WITH_ERROR = "bkPipelineRunConditionWithError" // 执行条件计算报错 - // TODO: AgentReuseMutex const val BK_AGENT_REUSE_MUTEX = "bkAgentReuseMutex" const val BK_AGENT_REUSE_MUTEX_AGENT_ID_NULL = "bkAgentReuseMutexAgentIdNull" const val BK_MERGE_YAML_CREATE_FILE_TITLE = "bkMergeYamlCreateFileTitle" // 新增流水线发布mr标题 @@ -555,6 +552,10 @@ object ProcessMessageCode { const val BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_ERROR_TITLE = "bkNotSubPipelineExecutePermissionErrorTitle" // 没有子流水线执行权限错误消息 const val BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_ERROR_MESSAGE = "bkNotSubPipelineExecutePermissionErrorMessage" + + // 用户[xxx] 没有如下子流水线的执行权限，重置授权失败 + const val BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_RESET_ERROR_TITLE = + "bkNotSubPipelineExecutePermissionResetErrorTitle" // 子流水线循环依赖错误标题 const val BK_SUB_PIPELINE_CIRCULAR_DEPENDENCY_ERROR_TITLE = "bkSubPipelineCircularDependencyErrorTitle" diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildInfo.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildInfo.kt index d2cbd2e65e3..9511786a11e 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildInfo.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildInfo.kt @@ -63,7 +63,7 @@ data class BuildInfo( val debug: Boolean, @Deprecated("后续只用executeCount做判断") val retryFlag: Boolean? = null, - val executeCount: Int? = 1, + val executeCount: Int = 1, var concurrencyGroup: String? = null, val webhookType: String?, val webhookInfo: WebhookInfo? = null, diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildRetryInfo.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildRetryInfo.kt index b6f91eff3be..3a6274ce497 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildRetryInfo.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/BuildRetryInfo.kt @@ -36,5 +36,6 @@ data class BuildRetryInfo( var nowTime: LocalDateTime, var status: BuildStatus, var buildParameters: List?, - var concurrencyGroup: String? + var concurrencyGroup: String?, + val executeCount: Int ) diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/HistorySearchType.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/HistorySearchType.kt new file mode 100644 index 00000000000..10e00ed6517 --- /dev/null +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/HistorySearchType.kt @@ -0,0 +1,39 @@ +/* + * 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.enums + +/** + * 构建历史搜索类型 + */ +enum class HistorySearchType { + // 触发器 + TRIGGER, + + // 源材料 + MATERIAL +} diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/VariableType.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/VariableType.kt index 1926d56be1a..32c16489613 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/VariableType.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/enums/VariableType.kt @@ -33,8 +33,10 @@ enum class VariableType(val hasPrefix: Boolean = false, val alisName: String = " BK_CI_START_TYPE, BK_CI_PROJECT_NAME, BK_CI_PIPELINE_NAME, + BK_CI_BUILD_URL, BK_CI_BUILD_ID, BK_CI_BUILD_NUM, + BK_CI_BUILD_NUM_ALIAS, BK_CI_BUILD_JOB_ID(alisName = "job.id"), BK_CI_BUILD_MSG, BK_CI_BUILD_TASK_ID(alisName = "step.id"), @@ -52,6 +54,7 @@ enum class VariableType(val hasPrefix: Boolean = false, val alisName: String = " BK_CI_START_CHANNEL, BK_CI_START_USER_ID, BK_CI_START_USER_NAME, + BK_CI_PARENT_PROJECT_ID, BK_CI_PARENT_PIPELINE_ID, BK_CI_PARENT_BUILD_ID, BK_CI_START_PIPELINE_USER_ID, @@ -62,6 +65,19 @@ enum class VariableType(val hasPrefix: Boolean = false, val alisName: String = " BK_CI_TASK_NAME(alisName = "step.name"), BK_CI_ATOM_NAME(alisName = "step.atom_name"), + // GIT拉取常量 + BK_CI_GIT_REPO_URL, + BK_CI_GIT_REPO_NAME, + BK_CI_GIT_REPO_ALIAS_NAME, + BK_CI_GIT_REPO_BRANCH, + BK_CI_GIT_REPO_TAG, + BK_CI_GIT_REPO_CODE_PATH, + BK_CI_GIT_REPO_LAST_COMMIT_ID, + BK_CI_GIT_REPO_HEAD_COMMIT_ID, + BK_CI_GIT_REPO_HEAD_COMMIT_COMMENT, + BK_CI_GIT_REPO_HEAD_COMMIT_AUTHOR, + BK_CI_GIT_REPO_HEAD_COMMIT_COMMITTER, + // GIT事件触发公共变量 BK_CI_REPO_WEBHOOK_REPO_TYPE, BK_CI_REPO_WEBHOOK_REPO_URL, diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/BuildJobResult.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/BuildJobResult.kt new file mode 100644 index 00000000000..38741477c2a --- /dev/null +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/BuildJobResult.kt @@ -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.process.pojo + +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "流水线模型-job执行结果") +data class BuildJobResult( + @get:Schema(title = "错误原因", required = false) + val message: String? = null +) diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/PipelineDetail.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/PipelineDetail.kt index 98e08b733c1..b689006e170 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/PipelineDetail.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/PipelineDetail.kt @@ -51,6 +51,8 @@ data class PipelineDetail( val instanceFromTemplate: Boolean, @get:Schema(title = "当前模板的ID", required = false) var templateId: String?, + @get:Schema(title = "关联模板版本", required = false) + var templateVersion: Long?, @get:Schema(title = "草稿或最新的发布版本") val version: Int, @get:Schema(title = "草稿或最新的发布版本名称") diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordContainer.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordContainer.kt index 2a61c463cb4..5b91c251132 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordContainer.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordContainer.kt @@ -128,7 +128,7 @@ data class BuildRecordContainer( if (buildStatus == BuildStatus.SKIP && !ElementUtils.getTaskAddFlag( element = element, stageEnableFlag = stageEnableFlag, - containerEnableFlag = container.isContainerEnable(), + containerEnableFlag = container.containerEnabled(), originMatrixContainerFlag = container.fetchGroupContainers() != null ) ) { diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordStage.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordStage.kt index 6835ed435c6..f795025c2b4 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordStage.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/record/BuildRecordStage.kt @@ -90,7 +90,7 @@ data class BuildRecordStage( stage.containers.forEach { container -> containerBuildRecords.addRecords( stageId = stage.id!!, - stageEnableFlag = stage.isStageEnable(), + stageEnableFlag = stage.stageEnabled(), container = container, context = context, buildStatus = buildStatus, diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/template/OptionalTemplate.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/template/OptionalTemplate.kt index 1285f3a850e..8a1db0eefe1 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/template/OptionalTemplate.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/template/OptionalTemplate.kt @@ -66,7 +66,9 @@ data class OptionalTemplate( @get:Schema(title = "阶段集合", required = true) val stages: List, @get:Schema(title = "克隆模板设置项是否存在", required = false) - val cloneTemplateSettingExist: CloneTemplateSettingExist? = null + val cloneTemplateSettingExist: CloneTemplateSettingExist? = null, + @get:Schema(title = "模版描述", required = false) + val desc: String? = null ) @Schema(title = "克隆模板设置") diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/Constants.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/Constants.kt index 40a3cdca327..db7dd3584b0 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/Constants.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/Constants.kt @@ -131,6 +131,8 @@ const val BK_CI_MATERIAL_ID = "BK_CI_MATERIAL_ID" // 触发材料ID const val BK_CI_MATERIAL_NAME = "BK_CI_MATERIAL_NAME" // 触发材料名称 const val BK_CI_MATERIAL_URL = "BK_CI_MATERIAL_URL" // 触发材料链接 +const val BK_CI_AUTHORIZER = "BK_CI_AUTHORIZER" // 流水线权限代持人 + /** * 流水线设置-最大排队数量-默认值 */ diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt index e6eceb71110..ba94030ae69 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt @@ -287,7 +287,8 @@ object PipelineVarUtil { "ci.create_ref" to BK_REPO_GITHUB_WEBHOOK_CREATE_REF_NAME, "ci.create_type" to BK_REPO_GITHUB_WEBHOOK_CREATE_REF_TYPE, "ci.failed_tasks" to BK_CI_BUILD_FAIL_TASKS, - "ci.failed_tasknames" to BK_CI_BUILD_FAIL_TASKNAMES + "ci.failed_tasknames" to BK_CI_BUILD_FAIL_TASKNAMES, + "ci.authorizer" to BK_CI_AUTHORIZER ) /** diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVersionUtils.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVersionUtils.kt index 481a6218aa8..0892a3beaa6 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVersionUtils.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVersionUtils.kt @@ -87,7 +87,7 @@ object PipelineVersionUtils { originTrigger.elements.forEachIndexed { index, origin -> val new = newTrigger.elements[index] if (origin != new) changed = true - if (origin.isElementEnable() != new.isElementEnable()) changed = true + if (origin.elementEnabled() != new.elementEnabled()) changed = true } } else { changed = true diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingDao.kt index d1874116543..3cab8b6165d 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingDao.kt @@ -354,9 +354,16 @@ class PipelineSettingDao { override fun map(record: TPipelineSettingRecord?): PipelineSetting? { return record?.let { t -> val successType = t.successType?.split(",")?.filter { i -> i.isNotBlank() } - ?.map { type -> PipelineSubscriptionType.valueOf(type) }?.toSet() ?: emptySet() + ?.map { type -> PipelineSubscriptionType.valueOf(type) }?.toMutableSet() ?: mutableSetOf() + // 老数据兼容,老数据的启用企业微信群通知,转换成微信组通知类型 + if (t.successWechatGroupFlag == true) { + successType.add(PipelineSubscriptionType.WEWORK_GROUP) + } val failType = t.failType?.split(",")?.filter { i -> i.isNotBlank() } - ?.map { type -> PipelineSubscriptionType.valueOf(type) }?.toSet() ?: emptySet() + ?.map { type -> PipelineSubscriptionType.valueOf(type) }?.toMutableSet() ?: mutableSetOf() + if (t.failWechatGroupFlag == true) { + failType.add(PipelineSubscriptionType.WEWORK_GROUP) + } var oldSuccessSubscription = Subscription( types = successType, groups = t.successGroup?.split(",")?.toSet() ?: emptySet(), @@ -382,14 +389,14 @@ class PipelineSettingDao { val list = JsonUtil.to(it, object : TypeReference>() {}) if (list.isNotEmpty()) { oldSuccessSubscription = list.first() - list + list.map { s -> s.fixWeworkGroupType() } } else null } ?: oldSuccessSubscription?.let { listOf(it) } val failSubscriptionList = t.failureSubscription?.let { val list = JsonUtil.to(it, object : TypeReference>() {}) if (list.isNotEmpty()) { oldFailSubscription = list.first() - list + list.map { s -> s.fixWeworkGroupType() } } else null } ?: oldFailSubscription?.let { listOf(it) } PipelineSetting( @@ -413,7 +420,8 @@ class PipelineSettingDao { cleanVariablesWhenRetry = t.cleanVariablesWhenRetry, pipelineAsCodeSettings = t.pipelineAsCodeSettings?.let { self -> JsonUtil.to(self, PipelineAsCodeSettings::class.java) - } + }, + version = t.version ?: 1 ) } } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingVersionDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingVersionDao.kt index b914748f01b..0debcb1618d 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingVersionDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingVersionDao.kt @@ -205,9 +205,11 @@ class PipelineSettingVersionDao { runLockType = t.runLockType?.let { PipelineRunLockType.valueOf(it) }, successSubscriptionList = t.successSubscription?.let { JsonUtil.to(it, object : TypeReference>() {}) + .map { s -> s.fixWeworkGroupType() } }, failSubscriptionList = t.failureSubscription?.let { JsonUtil.to(it, object : TypeReference>() {}) + .map { s -> s.fixWeworkGroupType() } }, version = t.version, labels = t.labels?.let { self -> diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordContainerDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordContainerDao.kt index 5cde459c9da..11dcfa47c54 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordContainerDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordContainerDao.kt @@ -129,6 +129,27 @@ class BuildRecordContainerDao { } } + fun flushEndTimeWhenRetry( + dslContext: DSLContext, + projectId: String, + pipelineId: String, + buildId: String, + containerId: String, + executeCount: Int + ) { + with(TPipelineBuildRecordContainer.T_PIPELINE_BUILD_RECORD_CONTAINER) { + dslContext.update(this) + .setNull(END_TIME) + .where( + BUILD_ID.eq(buildId) + .and(PROJECT_ID.eq(projectId)) + .and(PIPELINE_ID.eq(pipelineId)) + .and(EXECUTE_COUNT.eq(executeCount)) + .and(CONTAINER_ID.eq(containerId)) + ).execute() + } + } + fun getRecord( dslContext: DSLContext, projectId: String, @@ -243,13 +264,22 @@ class BuildRecordContainerDao { val conditions = BUILD_ID.eq(buildId) .and(PROJECT_ID.eq(projectId)) .and(PIPELINE_ID.eq(pipelineId)) - .and(EXECUTE_COUNT.eq(executeCount)) + .and(EXECUTE_COUNT.lessOrEqual(executeCount)) .and(MATRIX_GROUP_ID.isNotNull) + // 获取每个最大执行次数 + val max = DSL.select( + CONTAINER_ID.`as`(KEY_CONTAINER_ID), + DSL.max(EXECUTE_COUNT).`as`(KEY_EXECUTE_COUNT) + ).from(this).where(conditions).groupBy(CONTAINER_ID) val result = dslContext.select( BUILD_ID, PROJECT_ID, PIPELINE_ID, RESOURCE_VERSION, STAGE_ID, CONTAINER_ID, CONTAINER_VAR, EXECUTE_COUNT, CONTAINER_TYPE, STATUS, MATRIX_GROUP_FLAG, MATRIX_GROUP_ID, START_TIME, END_TIME, TIMESTAMPS - ).from(this).where(conditions).orderBy(CONTAINER_ID.asc()).fetch() + ).from(this).join(max).on( + CONTAINER_ID.eq(max.field(KEY_CONTAINER_ID, String::class.java)) + .and(EXECUTE_COUNT.eq(max.field(KEY_EXECUTE_COUNT, Int::class.java))) + ).where(conditions).orderBy(CONTAINER_ID.asc()) + .fetch() return result.map { record -> generateBuildRecordContainer(record) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordTaskDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordTaskDao.kt index 7104801792a..57193756576 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordTaskDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/record/BuildRecordTaskDao.kt @@ -321,6 +321,27 @@ class BuildRecordTaskDao { } } + fun flushEndTimeWhenRetry( + dslContext: DSLContext, + projectId: String, + pipelineId: String, + buildId: String, + taskId: String, + executeCount: Int + ) { + with(TPipelineBuildRecordTask.T_PIPELINE_BUILD_RECORD_TASK) { + dslContext.update(this) + .setNull(END_TIME) + .where( + BUILD_ID.eq(buildId) + .and(PROJECT_ID.eq(projectId)) + .and(PIPELINE_ID.eq(pipelineId)) + .and(EXECUTE_COUNT.eq(executeCount)) + .and(TASK_ID.eq(taskId)) + ).execute() + } + } + class BuildRecordTaskJooqMapper : RecordMapper { override fun map(record: TPipelineBuildRecordTaskRecord?): BuildRecordTask? { return record?.run { diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/api/BuildJobResourceImpl.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/api/BuildJobResourceImpl.kt index c0d2ddbf3b4..2d895c970d6 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/api/BuildJobResourceImpl.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/api/BuildJobResourceImpl.kt @@ -37,6 +37,7 @@ import com.tencent.devops.engine.api.BuildJobResource import com.tencent.devops.engine.api.pojo.HeartBeatInfo import com.tencent.devops.process.bean.PipelineUrlBean import com.tencent.devops.process.engine.service.vmbuild.EngineVMBuildService +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTaskResult import com.tencent.devops.process.pojo.BuildVariables @@ -99,14 +100,21 @@ class BuildJobResourceImpl @Autowired constructor( return Result(true) } - override fun jobEnd(projectId: String, buildId: String, vmSeqId: String, vmName: String): Result { + override fun jobEnd( + projectId: String, + buildId: String, + vmSeqId: String, + vmName: String, + result: BuildJobResult? + ): Result { checkParam(buildId = buildId, vmSeqId = vmSeqId, vmName = vmName) return Result( vMBuildService.buildEndTask( projectId = projectId, buildId = buildId, vmSeqId = vmSeqId, - vmName = vmName + vmName = vmName, + buildJobResult = result ) ) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/IElementBizPluginService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/IElementBizPluginService.kt index a3fc555a2e7..bf06da22f45 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/IElementBizPluginService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/IElementBizPluginService.kt @@ -50,6 +50,7 @@ interface IElementBizPluginService { contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): ElementCheckResult } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildAtomElementBizPlugin.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildAtomElementBizPlugin.kt index a4ad1356f00..6724b4d916c 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildAtomElementBizPlugin.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildAtomElementBizPlugin.kt @@ -73,6 +73,7 @@ class MarketBuildAtomElementBizPlugin @Autowired constructor( contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): ElementCheckResult { return elementBizPluginServices.find { @@ -86,6 +87,7 @@ class MarketBuildAtomElementBizPlugin @Autowired constructor( contextMap = contextMap, appearedCnt = appearedCnt, isTemplate = isTemplate, + oauthUser = oauthUser, pipelineId = pipelineId ) ?: ElementCheckResult(true) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildLessAtomElementBizPlugin.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildLessAtomElementBizPlugin.kt index 577c1b41a24..705d78cad5a 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildLessAtomElementBizPlugin.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildLessAtomElementBizPlugin.kt @@ -73,6 +73,7 @@ class MarketBuildLessAtomElementBizPlugin @Autowired constructor( contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): ElementCheckResult { return elementBizPluginServices.find { @@ -86,6 +87,7 @@ class MarketBuildLessAtomElementBizPlugin @Autowired constructor( contextMap = contextMap, appearedCnt = appearedCnt, isTemplate = isTemplate, + oauthUser = oauthUser, pipelineId = pipelineId ) ?: ElementCheckResult(true) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/SubPipelineCallElementBizPlugin.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/SubPipelineCallElementBizPlugin.kt index 12d9be5ab5f..da06c4291d7 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/SubPipelineCallElementBizPlugin.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/SubPipelineCallElementBizPlugin.kt @@ -56,6 +56,7 @@ class SubPipelineCallElementBizPlugin @Autowired constructor( contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): ElementCheckResult { return elementBizPluginServices.find { @@ -69,6 +70,7 @@ class SubPipelineCallElementBizPlugin @Autowired constructor( contextMap = contextMap, appearedCnt = appearedCnt, isTemplate = isTemplate, + oauthUser = oauthUser, pipelineId = pipelineId ) ?: ElementCheckResult(true) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildDao.kt index 7fd58fb4ad4..98ca32c996d 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildDao.kt @@ -49,13 +49,11 @@ import com.tencent.devops.model.process.tables.records.TPipelineBuildHistoryReco import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.engine.pojo.BuildInfo import com.tencent.devops.process.engine.pojo.BuildRetryInfo +import com.tencent.devops.process.enums.HistorySearchType import com.tencent.devops.process.pojo.BuildStageStatus import com.tencent.devops.process.pojo.PipelineBuildMaterial import com.tencent.devops.process.pojo.app.StartBuildContext import com.tencent.devops.process.pojo.code.WebhookInfo -import java.sql.Timestamp -import java.time.LocalDateTime -import javax.ws.rs.core.Response import org.jooq.Condition import org.jooq.DSLContext import org.jooq.DatePart @@ -64,6 +62,9 @@ import org.jooq.RecordMapper import org.jooq.SelectConditionStep import org.jooq.impl.DSL import org.springframework.stereotype.Repository +import java.sql.Timestamp +import java.time.LocalDateTime +import javax.ws.rs.core.Response @Suppress("ALL") @Repository @@ -72,7 +73,7 @@ class PipelineBuildDao { companion object { private val mapper = PipelineBuildInfoJooqMapper() private val debugMapper = PipelineDebugBuildInfoJooqMapper() - private const val DEFAULT_PAGE_SIZE = 10 + private const val DEFAULT_PAGE_SIZE = 50 } fun create(dslContext: DSLContext, startBuildContext: StartBuildContext) { @@ -103,7 +104,8 @@ class PipelineBuildDao { BUILD_NUM_ALIAS, CONCURRENCY_GROUP, VERSION_NAME, - YAML_VERSION + YAML_VERSION, + EXECUTE_COUNT ).values( startBuildContext.buildId, startBuildContext.buildNum, @@ -127,7 +129,8 @@ class PipelineBuildDao { startBuildContext.buildNumAlias, startBuildContext.concurrencyGroup, startBuildContext.versionName, - startBuildContext.yamlVersion + startBuildContext.yamlVersion, + startBuildContext.executeCount ).execute() } } else { @@ -156,7 +159,8 @@ class PipelineBuildDao { BUILD_NUM_ALIAS, CONCURRENCY_GROUP, YAML_VERSION, - RESOURCE_MODEL + RESOURCE_MODEL, + EXECUTE_COUNT ).values( startBuildContext.buildId, startBuildContext.buildNum, @@ -180,7 +184,8 @@ class PipelineBuildDao { startBuildContext.buildNumAlias, startBuildContext.concurrencyGroup, startBuildContext.yamlVersion, - startBuildContext.debugModelStr + startBuildContext.debugModelStr, + startBuildContext.executeCount ).execute() } } @@ -206,7 +211,7 @@ class PipelineBuildDao { .set(QUEUE_TIME, retryInfo.nowTime) .set(STATUS, retryInfo.status.ordinal) .set(CONCURRENCY_GROUP, retryInfo.concurrencyGroup) - + .set(EXECUTE_COUNT, retryInfo.executeCount) retryInfo.buildParameters?.let { update.set(BUILD_PARAMETERS, JsonUtil.toJson(it, formatted = false)) } @@ -222,7 +227,7 @@ class PipelineBuildDao { .set(QUEUE_TIME, retryInfo.nowTime) .set(STATUS, retryInfo.status.ordinal) .set(CONCURRENCY_GROUP, retryInfo.concurrencyGroup) - + .set(EXECUTE_COUNT, retryInfo.executeCount) retryInfo.buildParameters?.let { update.set(BUILD_PARAMETERS, JsonUtil.toJson(it, formatted = false)) } @@ -472,6 +477,8 @@ class PipelineBuildDao { val select = dslContext.selectFrom(this) .where(PROJECT_ID.eq(projectId)) .and(PIPELINE_ID.eq(pipelineId)) + // 增加过滤，插件按照构建号的查询也屏蔽已删除构建 + .and(DELETE_TIME.isNull) if (!statusSet.isNullOrEmpty()) { select.and(STATUS.`in`(statusSet.map { it.ordinal })) } @@ -572,14 +579,12 @@ class PipelineBuildDao { projectId: String, buildId: String, startTime: LocalDateTime?, - executeCount: Int?, debug: Boolean? ) { if (debug != true) { with(T_PIPELINE_BUILD_HISTORY) { val update = dslContext.update(this).set(STATUS, BuildStatus.RUNNING.ordinal) startTime?.let { update.set(START_TIME, startTime) } - executeCount?.let { update.set(EXECUTE_COUNT, executeCount) } update.setNull(ERROR_INFO) update.setNull(EXECUTE_TIME) update.where(PROJECT_ID.eq(projectId).and(BUILD_ID.eq(buildId))).execute() @@ -588,7 +593,6 @@ class PipelineBuildDao { with(T_PIPELINE_BUILD_HISTORY_DEBUG) { val update = dslContext.update(this).set(STATUS, BuildStatus.RUNNING.ordinal) startTime?.let { update.set(START_TIME, startTime) } - executeCount?.let { update.set(EXECUTE_COUNT, executeCount) } update.setNull(ERROR_INFO) update.setNull(EXECUTE_TIME) update.where(PROJECT_ID.eq(projectId).and(BUILD_ID.eq(buildId))).execute() @@ -952,7 +956,10 @@ class PipelineBuildDao { buildNoEnd: Int?, buildMsg: String?, startUser: List?, - debugVersion: Int? + debugVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): Int { return if (debugVersion == null) { with(T_PIPELINE_BUILD_HISTORY) { @@ -979,7 +986,10 @@ class PipelineBuildDao { remark = remark, buildNoStart = buildNoStart, buildNoEnd = buildNoEnd, - buildMsg = buildMsg + buildMsg = buildMsg, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) where.fetchOne(0, Int::class.java)!! } @@ -1010,7 +1020,10 @@ class PipelineBuildDao { remark = remark, buildNoStart = buildNoStart, buildNoEnd = buildNoEnd, - buildMsg = buildMsg + buildMsg = buildMsg, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) where.fetchOne(0, Int::class.java)!! } @@ -1044,7 +1057,10 @@ class PipelineBuildDao { buildMsg: String?, startUser: List?, updateTimeDesc: Boolean? = null, - debugVersion: Int? + debugVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): Collection { return if (debugVersion == null) { with(T_PIPELINE_BUILD_HISTORY) { @@ -1070,7 +1086,10 @@ class PipelineBuildDao { remark = remark, buildNoStart = buildNoStart, buildNoEnd = buildNoEnd, - buildMsg = buildMsg + buildMsg = buildMsg, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) when (updateTimeDesc) { @@ -1107,7 +1126,10 @@ class PipelineBuildDao { remark = remark, buildNoStart = buildNoStart, buildNoEnd = buildNoEnd, - buildMsg = buildMsg + buildMsg = buildMsg, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) when (updateTimeDesc) { true -> where.orderBy(UPDATE_TIME.desc(), BUILD_ID) @@ -1141,7 +1163,10 @@ class PipelineBuildDao { remark: String?, buildNoStart: Int?, buildNoEnd: Int?, - buildMsg: String? + buildMsg: String?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ) { if (!materialAlias.isNullOrEmpty() && materialAlias.first().isNotBlank()) { var conditionsOr: Condition @@ -1239,6 +1264,39 @@ class PipelineBuildDao { if (!buildMsg.isNullOrBlank()) { where.and(BUILD_MSG.like("%$buildMsg%")) } + if (!triggerAlias.isNullOrEmpty() && triggerAlias.first().isNotBlank()) { + var conditionsOr: Condition + + conditionsOr = JooqUtils.jsonExtract(t1 = WEBHOOK_INFO, t2 = "\$.webhookAliasName", lower = true) + .like("%${triggerAlias.first().lowercase()}%") + + triggerAlias.forEachIndexed { index, s -> + if (index == 0) return@forEachIndexed + conditionsOr = conditionsOr.or( + JooqUtils.jsonExtract(WEBHOOK_INFO, "\$.webhookAliasName", lower = true) + .like("%${s.lowercase()}%") + ) + } + where.and(conditionsOr) + } + if (!triggerBranch.isNullOrEmpty() && triggerBranch.first().isNotBlank()) { + var conditionsOr: Condition + + conditionsOr = JooqUtils.jsonExtract(WEBHOOK_INFO, "\$.webhookBranch", lower = true) + .like("%${triggerBranch.first().lowercase()}%") + + triggerBranch.forEachIndexed { index, s -> + if (index == 0) return@forEachIndexed + conditionsOr = conditionsOr.or( + JooqUtils.jsonExtract(WEBHOOK_INFO, "\$.webhookBranch", lower = true) + .like("%${s.lowercase()}%") + ) + } + where.and(conditionsOr) + } + if (!triggerUser.isNullOrEmpty()) { // filterNotNull不能删 + where.and(TRIGGER_USER.`in`(triggerUser)) + } } private fun TPipelineBuildHistoryDebug.makeDebugCondition( @@ -1262,7 +1320,10 @@ class PipelineBuildDao { remark: String?, buildNoStart: Int?, buildNoEnd: Int?, - buildMsg: String? + buildMsg: String?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ) { // 增加过滤，对前端屏蔽已删除的构建 where.and(DELETE_TIME.isNull) @@ -1362,6 +1423,39 @@ class PipelineBuildDao { if (!buildMsg.isNullOrBlank()) { where.and(BUILD_MSG.like("%$buildMsg%")) } + if (!triggerAlias.isNullOrEmpty() && triggerAlias.first().isNotBlank()) { + var conditionsOr: Condition + + conditionsOr = JooqUtils.jsonExtract(t1 = WEBHOOK_INFO, t2 = "\$.webhookAliasName", lower = true) + .like("%${triggerAlias.first().lowercase()}%") + + triggerAlias.forEachIndexed { index, s -> + if (index == 0) return@forEachIndexed + conditionsOr = conditionsOr.or( + JooqUtils.jsonExtract(WEBHOOK_INFO, "\$.webhookAliasName", lower = true) + .like("%${s.lowercase()}%") + ) + } + where.and(conditionsOr) + } + if (!triggerBranch.isNullOrEmpty() && triggerBranch.first().isNotBlank()) { + var conditionsOr: Condition + + conditionsOr = JooqUtils.jsonExtract(WEBHOOK_INFO, "\$.webhookBranch", lower = true) + .like("%${triggerBranch.first().lowercase()}%") + + triggerBranch.forEachIndexed { index, s -> + if (index == 0) return@forEachIndexed + conditionsOr = conditionsOr.or( + JooqUtils.jsonExtract(WEBHOOK_INFO, "\$.webhookBranch", lower = true) + .like("%${s.lowercase()}%") + ) + } + where.and(conditionsOr) + } + if (!triggerUser.isNullOrEmpty()) { // filterNotNull不能删 + where.and(TRIGGER_USER.`in`(triggerUser)) + } } fun updateBuildRemark( @@ -1406,25 +1500,43 @@ class PipelineBuildDao { } } - fun getBuildHistoryMaterial( + /** + * 构建历史搜索下拉框 + */ + fun listHistorySearchOptions( dslContext: DSLContext, projectId: String, pipelineId: String, - debugVersion: Int? + debugVersion: Int?, + type: HistorySearchType ): Collection { return if (debugVersion == null) { with(T_PIPELINE_BUILD_HISTORY) { - dslContext.selectFrom(this) + val where = dslContext.selectFrom(this) .where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId))) - .orderBy(BUILD_NUM.desc()).limit(DEFAULT_PAGE_SIZE) + when (type) { + HistorySearchType.MATERIAL -> + where.and(MATERIAL.isNotNull) + + HistorySearchType.TRIGGER -> + where.and(WEBHOOK_INFO.isNotNull) + } + where.orderBy(BUILD_NUM.desc()).limit(DEFAULT_PAGE_SIZE) .fetch(mapper) } } else { with(T_PIPELINE_BUILD_HISTORY_DEBUG) { - dslContext.selectFrom(this) + val where = dslContext.selectFrom(this) .where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId))) .and(VERSION.eq(debugVersion)) - .orderBy(BUILD_NUM.desc()).limit(DEFAULT_PAGE_SIZE) + when (type) { + HistorySearchType.MATERIAL -> + where.and(MATERIAL.isNotNull) + + HistorySearchType.TRIGGER -> + where.and(WEBHOOK_INFO.isNotNull) + } + where.orderBy(BUILD_NUM.desc()).limit(DEFAULT_PAGE_SIZE) .fetch(debugMapper) } } @@ -1801,7 +1913,7 @@ class PipelineBuildDao { JsonUtil.getObjectMapper().readValue(self) as List }, retryFlag = t.isRetry, - executeCount = t.executeCount, + executeCount = t.executeCount ?: 1, executeTime = t.executeTime ?: 0, concurrencyGroup = t.concurrencyGroup, webhookType = t.webhookType, @@ -1860,7 +1972,7 @@ class PipelineBuildDao { JsonUtil.getObjectMapper().readValue(self) as List }, retryFlag = t.isRetry, - executeCount = t.executeCount, + executeCount = t.executeCount ?: 1, executeTime = t.executeTime ?: 0, concurrencyGroup = t.concurrencyGroup, webhookType = t.webhookType, diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildStageDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildStageDao.kt index 18c58fad31d..cdbbc0134d7 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildStageDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildStageDao.kt @@ -37,6 +37,7 @@ import com.tencent.devops.model.process.tables.records.TPipelineBuildStageRecord import com.tencent.devops.process.engine.common.Timeout import com.tencent.devops.process.engine.pojo.PipelineBuildStage import com.tencent.devops.process.engine.pojo.PipelineBuildStageControlOption +import org.jooq.Condition import org.jooq.DSLContext import org.jooq.DatePart import org.jooq.RecordMapper @@ -198,11 +199,25 @@ class PipelineBuildStageDao { } } - fun listBuildStages(dslContext: DSLContext, projectId: String, buildId: String): List { + fun listBuildStages( + dslContext: DSLContext, + projectId: String, + buildId: String, + statusSet: Set? = null, + num: Int? = null + ): List { return with(T_PIPELINE_BUILD_STAGE) { - dslContext.selectFrom(this) - .where(BUILD_ID.eq(buildId).and(PROJECT_ID.eq(projectId))) - .orderBy(SEQ.asc()).fetch(mapper) + val conditions = mutableListOf() + conditions.add(BUILD_ID.eq(buildId)) + conditions.add(PROJECT_ID.eq(projectId)) + if (!statusSet.isNullOrEmpty()) { + conditions.add(STATUS.`in`(statusSet.map { it.ordinal })) + } + val baseStep = dslContext.selectFrom(this).where(conditions).orderBy(SEQ.asc()) + if (num != null) { + baseStep.limit(num) + } + baseStep.fetch(mapper) } } @@ -263,12 +278,13 @@ class PipelineBuildStageDao { buildId: String, statusSet: Set ): PipelineBuildStage? { - with(T_PIPELINE_BUILD_STAGE) { - return dslContext.selectFrom(this) - .where(PROJECT_ID.eq(projectId)).and(BUILD_ID.eq(buildId)) - .and(STATUS.`in`(statusSet.map { it.ordinal })) - .orderBy(SEQ.asc()).limit(1).fetchOne(mapper) - } + return listBuildStages( + dslContext = dslContext, + projectId = projectId, + buildId = buildId, + statusSet = statusSet, + num = 1 + ).getOrNull(0) } class PipelineBuildStageJooqMapper : RecordMapper { diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt index 2b1cfc17319..a4829972d63 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt @@ -491,31 +491,44 @@ class PipelineBuildSummaryDao { fun startLatestRunningBuild( dslContext: DSLContext, latestRunningBuild: LatestRunningBuild, - executeCount: Int + executeCount: Int, + debug: Boolean ): Int { return with(latestRunningBuild) { - with(T_PIPELINE_BUILD_SUMMARY) { - dslContext.update(this) - .let { - if (executeCount == 1) { - // 只有首次才写入LATEST_BUILD_ID - it.set(LATEST_BUILD_ID, buildId).set(LATEST_STATUS, status.ordinal) - } else { - // 重试时只有最新的构建才能刷新LATEST_STATUS - it.set( - LATEST_STATUS, - DSL.`when`(LATEST_BUILD_ID.eq(buildId), status.ordinal).otherwise(LATEST_STATUS) - ) + if (debug) { + /* debug 下只更新计数 */ + with(T_PIPELINE_BUILD_SUMMARY) { + dslContext.update(this) + .set(QUEUE_COUNT, QUEUE_COUNT - 1) + .set(RUNNING_COUNT, RUNNING_COUNT + 1) + .where(PROJECT_ID.eq(projectId)) + .and(PIPELINE_ID.eq(pipelineId)) + .execute() + } + } else { + with(T_PIPELINE_BUILD_SUMMARY) { + dslContext.update(this) + .let { + if (executeCount == 1) { + // 只有首次才写入LATEST_BUILD_ID + it.set(LATEST_BUILD_ID, buildId).set(LATEST_STATUS, status.ordinal) + } else { + // 重试时只有最新的构建才能刷新LATEST_STATUS + it.set( + LATEST_STATUS, + DSL.`when`(LATEST_BUILD_ID.eq(buildId), status.ordinal).otherwise(LATEST_STATUS) + ) + } } - } - .set(LATEST_TASK_COUNT, taskCount) - .set(LATEST_START_USER, userId) - .set(QUEUE_COUNT, QUEUE_COUNT - 1) - .set(RUNNING_COUNT, RUNNING_COUNT + 1) - .set(LATEST_START_TIME, LocalDateTime.now()) - .where(PROJECT_ID.eq(projectId)) - .and(PIPELINE_ID.eq(pipelineId)) // 并发的情况下，不再考虑LATEST_BUILD_ID，没有意义，而且会造成Slow SQL - .execute() + .set(LATEST_TASK_COUNT, taskCount) + .set(LATEST_START_USER, userId) + .set(QUEUE_COUNT, QUEUE_COUNT - 1) + .set(RUNNING_COUNT, RUNNING_COUNT + 1) + .set(LATEST_START_TIME, LocalDateTime.now()) + .where(PROJECT_ID.eq(projectId)) + .and(PIPELINE_ID.eq(pipelineId)) // 并发的情况下，不再考虑LATEST_BUILD_ID，没有意义，而且会造成Slow SQL + .execute() + } } } } @@ -550,7 +563,8 @@ class PipelineBuildSummaryDao { fun finishLatestRunningBuild( dslContext: DSLContext, latestRunningBuild: LatestRunningBuild, - isStageFinish: Boolean + isStageFinish: Boolean, + debug: Boolean ) { return with(latestRunningBuild) { with(T_PIPELINE_BUILD_SUMMARY) { @@ -559,12 +573,14 @@ class PipelineBuildSummaryDao { .set( LATEST_STATUS, DSL.`when`(LATEST_BUILD_ID.eq(buildId), status.ordinal).otherwise(LATEST_STATUS) - ) // 不一定是FINISH，也有可能其它失败的status - .set(LATEST_END_TIME, endTime) // 结束时间 + ) + if (!debug) { + // 不一定是FINISH，也有可能其它失败的status + update.set(LATEST_END_TIME, endTime) // 结束时间 .set(LATEST_TASK_ID, "") // 结束时清空 .set(LATEST_TASK_NAME, "") // 结束时清空 .set(FINISH_COUNT, FINISH_COUNT + 1) - + } if (!isStageFinish) update.set(RUNNING_COUNT, RUNNING_COUNT - 1) update.where(PROJECT_ID.eq(projectId)) .and(PIPELINE_ID.eq(pipelineId)) // 并发的情况下，不用考虑是否是当前的LATEST_BUILD_ID，而且会造成Slow SQL @@ -581,21 +597,24 @@ class PipelineBuildSummaryDao { projectId: String, pipelineId: String, buildId: String, - runningIncrement: Int = 1 + runningIncrement: Int = 1, + debug: Boolean ) { with(T_PIPELINE_BUILD_SUMMARY) { val update = dslContext.update(this).set(RUNNING_COUNT, RUNNING_COUNT + runningIncrement) - - if (runningIncrement > 0) { - update.set( - LATEST_STATUS, - DSL.`when`(LATEST_BUILD_ID.eq(buildId), BuildStatus.RUNNING.ordinal).otherwise(LATEST_STATUS) - ) - } else { - update.set( - LATEST_STATUS, - DSL.`when`(LATEST_BUILD_ID.eq(buildId), BuildStatus.STAGE_SUCCESS.ordinal).otherwise(LATEST_STATUS) - ).set(LATEST_END_TIME, LocalDateTime.now()) + if (!debug) { + if (runningIncrement > 0) { + update.set( + LATEST_STATUS, + DSL.`when`(LATEST_BUILD_ID.eq(buildId), BuildStatus.RUNNING.ordinal).otherwise(LATEST_STATUS) + ) + } else { + update.set( + LATEST_STATUS, + DSL.`when`(LATEST_BUILD_ID.eq(buildId), BuildStatus.STAGE_SUCCESS.ordinal) + .otherwise(LATEST_STATUS) + ).set(LATEST_END_TIME, LocalDateTime.now()) + } } update.where(PROJECT_ID.eq(projectId)) .and(PIPELINE_ID.eq(pipelineId)) // 并发的情况下，不用考虑是否是当前的LATEST_BUILD_ID，而且会造成Slow SQL diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildVarDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildVarDao.kt index d674f74a442..0bba047b9b7 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildVarDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildVarDao.kt @@ -114,36 +114,6 @@ class PipelineBuildVarDao @Autowired constructor() { } } - fun getBuildVarMap( - dslContext: DSLContext, - projectId: String, - buildId: String, - keys: Set? = null - ): Map { - with(T_PIPELINE_BUILD_VAR) { - val where = dslContext.selectFrom(this) - .where(BUILD_ID.eq(buildId).and(PROJECT_ID.eq(projectId))) - if (!keys.isNullOrEmpty()) { - where.and(KEY.`in`(keys)) - } - return where.fetch().associateBy( - { it.key }, - { - if (it.varType != null) { - BuildParameters( - key = it.key, - value = it.value, - valueType = BuildFormPropertyType.valueOf(it.varType), - readOnly = it.readOnly - ) - } else { - BuildParameters(key = it.key, value = it.value, readOnly = it.readOnly) - } - } - ) - } - } - fun getVarsWithType( dslContext: DSLContext, projectId: String, diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineResourceVersionDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineResourceVersionDao.kt index a80262393b2..e5c54b9773a 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineResourceVersionDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineResourceVersionDao.kt @@ -75,6 +75,11 @@ class PipelineResourceVersionDao { ): TPipelineResourceVersionRecord? { with(T_PIPELINE_RESOURCE_VERSION) { val modelStr = JsonUtil.toJson(model, formatted = false) + val createTime = LocalDateTime.now() + val releaseTime = createTime.takeIf { + // 发布时间根据版本转为RELEASED状态为准，默认也是发布 + versionStatus == VersionStatus.RELEASED || versionStatus == null + } return dslContext.insertInto(this) .set(PROJECT_ID, projectId) .set(PIPELINE_ID, pipelineId) @@ -85,7 +90,7 @@ class PipelineResourceVersionDao { .set(YAML_VERSION, yamlVersion) .set(CREATOR, userId) .set(UPDATER, userId) - .set(CREATE_TIME, LocalDateTime.now()) + .set(CREATE_TIME, createTime) .set(VERSION_NUM, versionNum) .set(PIPELINE_VERSION, pipelineVersion) .set(TRIGGER_VERSION, triggerVersion) @@ -95,6 +100,7 @@ class PipelineResourceVersionDao { .set(DESCRIPTION, description) .set(BASE_VERSION, baseVersion) .set(REFER_FLAG, false) + .set(RELEASE_TIME, releaseTime) .onDuplicateKeyUpdate() .set(MODEL, modelStr) .set(YAML, yamlStr) @@ -109,6 +115,7 @@ class PipelineResourceVersionDao { .set(STATUS, versionStatus?.name) .set(BRANCH_ACTION, branchAction?.name) .set(DESCRIPTION, description) + .set(RELEASE_TIME, releaseTime) .returning() .fetchOne() } @@ -266,7 +273,6 @@ class PipelineResourceVersionDao { with(T_PIPELINE_RESOURCE_VERSION) { val update = dslContext.update(this) .set(BRANCH_ACTION, BranchVersionAction.INACTIVE.name) - .set(UPDATE_TIME, UPDATE_TIME) .where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId))) .and(STATUS.eq(VersionStatus.BRANCH.name)) .and( @@ -298,7 +304,6 @@ class PipelineResourceVersionDao { return with(T_PIPELINE_RESOURCE_VERSION) { dslContext.update(this) .set(STATUS, VersionStatus.DELETE.name) - .set(UPDATE_TIME, UPDATE_TIME) .where(PIPELINE_ID.eq(pipelineId)) .and(VERSION.eq(version)) .and(PROJECT_ID.eq(projectId)) @@ -358,7 +363,7 @@ class PipelineResourceVersionDao { query.and(VERSION.le(maxQueryVersion)) } val list = query.orderBy( - UPDATE_TIME.desc(), VERSION_NUM.desc(), VERSION.desc() + RELEASE_TIME.desc(), VERSION.desc() ).limit(limit).offset(offset).fetch(sampleMapper) list.forEach { if (it.version == pipelineInfo.version) it.latestReleasedFlag = true } return list @@ -468,7 +473,6 @@ class PipelineResourceVersionDao { with(T_PIPELINE_RESOURCE_VERSION) { return dslContext.update(this) .set(DEBUG_BUILD_ID, debugBuildId) - .set(UPDATE_TIME, UPDATE_TIME) .where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId)).and(VERSION.eq(version))) .execute() == 1 } @@ -506,7 +510,6 @@ class PipelineResourceVersionDao { with(T_PIPELINE_RESOURCE_VERSION) { val baseStep = dslContext.update(this) .set(REFER_COUNT, referCount) - .set(UPDATE_TIME, UPDATE_TIME) referFlag?.let { baseStep.set(REFER_FLAG, referFlag) } baseStep.where(PIPELINE_ID.eq(pipelineId).and(PROJECT_ID.eq(projectId)).and(VERSION.`in`(versions))) .execute() diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt index ae164c2cad0..b5f4962ff5c 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt @@ -525,7 +525,8 @@ class TemplateDao { tTemplate.UPDATE_TIME, tTemplate.SRC_TEMPLATE_ID, tTemplate.CATEGORY, - tTemplate.PROJECT_ID + tTemplate.PROJECT_ID, + tTemplate.DESC ) if (queryModelFlag) { // 查询模板model内容 diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/extend/DefaultModelCheckPlugin.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/extend/DefaultModelCheckPlugin.kt index 4af750d9557..7858f625377 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/extend/DefaultModelCheckPlugin.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/extend/DefaultModelCheckPlugin.kt @@ -90,6 +90,7 @@ open class DefaultModelCheckPlugin constructor( projectId: String?, userId: String, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): Int { var metaSize = 0 @@ -179,6 +180,7 @@ open class DefaultModelCheckPlugin constructor( atomInputParamList = atomInputParamList, elementCheckResults = elementCheckResults, isTemplate = isTemplate, + oauthUser = oauthUser, pipelineId = pipelineId ) if (!projectId.isNullOrEmpty() && atomVersions.isNotEmpty()) { @@ -257,6 +259,7 @@ open class DefaultModelCheckPlugin constructor( atomInputParamList: MutableList, elementCheckResults: MutableList, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): Int /* MetaSize*/ { var metaSize = 0 @@ -307,6 +310,7 @@ open class DefaultModelCheckPlugin constructor( contextMap = contextMap, elementCheckResults = elementCheckResults, isTemplate = isTemplate, + oauthUser = oauthUser, pipelineId = pipelineId ) } @@ -325,6 +329,7 @@ open class DefaultModelCheckPlugin constructor( contextMap: Map, elementCheckResults: MutableList, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ) { val eCnt = elementCnt.computeIfPresent(element.getAtomCode()) { _, oldValue -> oldValue + 1 } @@ -338,6 +343,7 @@ open class DefaultModelCheckPlugin constructor( contextMap = contextMap, appearedCnt = eCnt, isTemplate = isTemplate, + oauthUser = oauthUser, pipelineId = pipelineId ) if (elementCheckResult?.result == false) { diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/QueueInterceptor.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/QueueInterceptor.kt index 4df7300c810..b9dd0745d15 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/QueueInterceptor.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/QueueInterceptor.kt @@ -31,21 +31,21 @@ import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatcher import com.tencent.devops.common.log.utils.BuildLogPrinter import com.tencent.devops.common.pipeline.enums.BuildStatus +import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.process.bean.PipelineUrlBean +import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.constant.ProcessMessageCode.BK_MAX_PARALLEL import com.tencent.devops.process.constant.ProcessMessageCode.ERROR_PIPELINE_QUEUE_FULL import com.tencent.devops.process.constant.ProcessMessageCode.ERROR_PIPELINE_SUMMARY_NOT_FOUND -import com.tencent.devops.process.engine.control.lock.PipelineNextQueueLock +import com.tencent.devops.process.engine.control.lock.ConcurrencyGroupLock import com.tencent.devops.process.engine.pojo.Response import com.tencent.devops.process.engine.pojo.event.PipelineBuildCancelEvent import com.tencent.devops.process.engine.service.PipelineRedisService import com.tencent.devops.process.engine.service.PipelineRuntimeExtService import com.tencent.devops.process.engine.service.PipelineRuntimeService import com.tencent.devops.process.engine.service.PipelineTaskService -import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType -import com.tencent.devops.process.constant.ProcessMessageCode import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component @@ -206,7 +206,7 @@ class QueueInterceptor @Autowired constructor( task: InterceptData ) { // 因为排队队列是流水线级别，所以是取消当前流水线下同一并发组最早排队的构建，不一定是项目级别下同一并发组最早的构建。 - val buildInfo = PipelineNextQueueLock(redisOperation, pipelineId).use { pipelineLock -> + val buildInfo = ConcurrencyGroupLock(redisOperation, projectId, groupName).use { pipelineLock -> pipelineLock.lock() pipelineRuntimeExtService.popNextConcurrencyGroupQueueCanPend2Start( projectId = projectId, diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/TimerTriggerScmChangeInterceptor.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/TimerTriggerScmChangeInterceptor.kt index 7a82437905b..79a4b804407 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/TimerTriggerScmChangeInterceptor.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/TimerTriggerScmChangeInterceptor.kt @@ -115,7 +115,7 @@ class TimerTriggerScmChangeInterceptor @Autowired constructor( } else if (noScm && container is VMBuildContainer) { container.elements.forEach ele@{ ele -> // 插件没有启用或者是post action不需要比较变更 - if (!ele.isElementEnable() || ele.additionalOptions?.elementPostInfo != null) { + if (!ele.elementEnabled() || ele.additionalOptions?.elementPostInfo != null) { return@ele } val (existScmElement, codeChange) = scmElementCheck( diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/AgentReuseMutexTree.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/AgentReuseMutexTree.kt index dcf9db07325..d9c21e6fe2d 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/AgentReuseMutexTree.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/AgentReuseMutexTree.kt @@ -14,12 +14,15 @@ import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentEnvDispatchT import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentIDDispatchType import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.engine.control.VmOperateTaskGenerator.Companion.START_VM_TASK_ATOM +import com.tencent.devops.process.pojo.app.StartBuildContext +import com.tencent.devops.process.utils.PIPELINE_NAME /** * AgentReuseMutexTree 组装流水线时通过生成树可以更好地拿到复用互斥关系 */ @Suppress("ComplexCondition") data class AgentReuseMutexTree( + val executeCount: Int, val rootNodes: MutableList, var maxStageIndex: Int = 0 ) { @@ -247,7 +250,9 @@ data class AgentReuseMutexTree( // @return false 说明存在节点没填充 fun checkVirtualRootAndResetJobType() { rootNodes.filter { it.children.size > 0 }.forEach { root -> - if (root.virtual) { + // 如果是重试部分步骤导致 root 节点存在的 stage 或者 job 没有被重试，这时直接放开到下面执行，因为部分重试不会清空 + // 如果是全部重试，因为重试不会修改 model，所以可以直接放开 + if (executeCount == 1 && root.virtual) { throw ErrorCodeException( errorCode = ProcessMessageCode.ERROR_AGENT_REUSE_MUTEX_DEP_NULL_NODE, params = arrayOf(root.getAllChildJobId().joinToString("|"), root.jobId) @@ -268,6 +273,7 @@ data class AgentReuseMutexTree( } fun rewriteModel( + context: StartBuildContext, buildContainersWithDetail: MutableList>, fullModel: Model, buildTaskList: MutableList @@ -276,7 +282,10 @@ data class AgentReuseMutexTree( buildContainersWithDetail.forEach { (bc, c) -> if (treeMap.containsKey(c.jobId)) { - bc.controlOption.agentReuseMutex = treeMap[c.jobId]?.first + bc.controlOption.agentReuseMutex = treeMap[c.jobId]?.first?.copy( + linkTip = "${context.pipelineId}_Pipeline" + + "[${context.variables[PIPELINE_NAME]}]Job[${c.name}]" + ) } } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/event/PipelineBuildStartEvent.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/event/PipelineBuildStartEvent.kt index f1ffa1c778b..9a8213c5f73 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/event/PipelineBuildStartEvent.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/event/PipelineBuildStartEvent.kt @@ -51,6 +51,6 @@ data class PipelineBuildStartEvent( override var actionType: ActionType, override var delayMills: Int = 0, val buildNoType: BuildNoType? = null, - val executeCount: Int? = 1, + val executeCount: Int = 1, val debug: Boolean? = false ) : IPipelineEvent(actionType, source, projectId, pipelineId, userId, delayMills) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/EngineConfigService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/EngineConfigService.kt new file mode 100644 index 00000000000..ec37b01fc32 --- /dev/null +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/EngineConfigService.kt @@ -0,0 +1,33 @@ +package com.tencent.devops.process.engine.service + +import com.github.benmanes.caffeine.cache.Caffeine +import com.github.benmanes.caffeine.cache.LoadingCache +import com.tencent.devops.common.redis.RedisOperation +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service +import java.time.Duration + +/** + * 流水线引擎动态配置管理类 + * 用来放一些引擎中需要动态配置的参数方法 + */ +@Service +class EngineConfigService @Autowired constructor( + private val redisOperation: RedisOperation +) { + private val localCache: LoadingCache = Caffeine.newBuilder() + .maximumSize(CACHE_SIZE) + .expireAfterWrite(Duration.ofMinutes(CACHE_EXPIRE_MIN)) + .build { key -> redisOperation.get(key, isDistinguishCluster = false) ?: "" } + + fun getMutexMaxQueue() = + localCache.get(ENGINE_CONFIG_MUTEX_MAX_QUEUE_KEY)?.ifBlank { null }?.toIntOrNull() ?: MUTEX_MAX_QUEUE_DEFAULT + + companion object { + private const val ENGINE_CONFIG_MUTEX_MAX_QUEUE_KEY = "engine:config:mutex:maxQueue" + const val MUTEX_MAX_QUEUE_DEFAULT = 50 + + private const val CACHE_EXPIRE_MIN = 10L + private const val CACHE_SIZE = 100L + } +} \ No newline at end of file diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineContainerService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineContainerService.kt index fb65b842b26..64589314c9a 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineContainerService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineContainerService.kt @@ -298,6 +298,7 @@ class PipelineContainerService @Autowired constructor( ): PipelineBuildContainer { var startVMTaskSeq = -1 // 启动构建机位置，解决如果在执行人工审核插件时，无编译环境不需要提前无意义的启动 var taskSeq = 0 + var needStartVM = false // 是否需要启动构建 val parentElements = container.elements parentElements.forEach nextElement@{ atomElement -> @@ -327,8 +328,8 @@ class PipelineContainerService @Autowired constructor( resourceVersion?.let { if (ElementUtils.getTaskAddFlag( element = atomElement, - stageEnableFlag = stage.isStageEnable(), - containerEnableFlag = container.isContainerEnable(), + stageEnableFlag = stage.stageEnabled(), + containerEnableFlag = container.containerEnabled(), originMatrixContainerFlag = ContainerUtils.isOriginMatrixContainer(container) ) ) { @@ -359,23 +360,30 @@ class PipelineContainerService @Autowired constructor( ) } } + // 确认是否要启动构建机/无编译环境 + if (!needStartVM && startVMTaskSeq > 0) { + needStartVM = true + } } container.startVMTaskSeq = startVMTaskSeq // 填入: 构建机或无编译环境的环境处理，需要启动和结束构建机/环境的插件任务 - supplyVMTask( - projectId = projectId, - pipelineId = pipelineId, - buildId = buildId, - userId = context.userId, - stage = stage, - container = container, - containerSeq = context.containerSeq, - startVMTaskSeq = startVMTaskSeq, - lastTimeBuildTasks = listOf(), - updateExistsTask = mutableListOf(), - buildTaskList = buildTaskList, - executeCount = context.executeCount - ) + // 判断是否为无编译环境的写法保持和 prepareBuildContainerTasks() 一致 + if (needStartVM) { + supplyVMTask( + projectId = projectId, + pipelineId = pipelineId, + buildId = buildId, + userId = context.userId, + stage = stage, + container = container, + containerSeq = context.containerSeq, + startVMTaskSeq = startVMTaskSeq, + lastTimeBuildTasks = listOf(), + updateExistsTask = mutableListOf(), + buildTaskList = buildTaskList, + executeCount = context.executeCount + ) + } return PipelineBuildContainer( projectId = projectId, @@ -421,6 +429,17 @@ class PipelineContainerService @Autowired constructor( val containerElements = container.elements val newBuildFlag = lastTimeBuildTasks.isEmpty() + // #4245 直接将启动时跳过的插件置为不可用，减少存储变量 + // #10751 如果不存在需要运行的插件，则直接将container设为不启用 + var containerEnable = false + containerElements.forEach { atomElement -> + atomElement.disableBySkipVar(variables = context.variables) + if (atomElement.additionalOptions?.enable != false) { + containerEnable = true + } + } + if (!containerEnable) container.setContainerEnable(false) + containerElements.forEach nextElement@{ atomElement -> modelCheckPlugin.checkElementTimeoutVar(container, atomElement, contextMap = context.variables) taskSeq++ // 跳过的也要+1，Seq不需要连续性 @@ -432,9 +451,6 @@ class PipelineContainerService @Autowired constructor( } } - // #4245 直接将启动时跳过的插件置为不可用，减少存储变量 - atomElement.disableBySkipVar(variables = context.variables) - val status = atomElement.initStatus( rerun = context.needRerunTask(stage = stage, container = container) ) @@ -443,8 +459,8 @@ class PipelineContainerService @Autowired constructor( atomElement.status = status.name if (newBuildFlag && ElementUtils.getTaskAddFlag( element = atomElement, - stageEnableFlag = stage.isStageEnable(), - containerEnableFlag = container.isContainerEnable(), + stageEnableFlag = stage.stageEnabled(), + containerEnableFlag = container.containerEnabled(), originMatrixContainerFlag = ContainerUtils.isOriginMatrixContainer(container) ) ) { @@ -563,7 +579,7 @@ class PipelineContainerService @Autowired constructor( container.startVMTaskSeq = startVMTaskSeq // 构建矩阵永远跟随stage重试，在需要重试的stage中，单独增加重试记录 - if (container.matrixGroupFlag == true && !context.needSkipContainerWhenFailRetry(stage, container)) { + if (context.needRerunStage(stage = stage) && container.matrixGroupFlag == true) { container.retryFreshMatrixOption() cleanContainersInMatrixGroup( transactionContext = dslContext, @@ -1032,7 +1048,7 @@ class PipelineContainerService @Autowired constructor( // ) // ) container.elements.forEachIndexed { index, atomElement -> - if (context.firstTaskId.isBlank() && atomElement.isElementEnable()) { + if (context.firstTaskId.isBlank() && atomElement.elementEnabled()) { context.firstTaskId = atomElement.findFirstTaskIdByStartType(context.startType) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt index db9c690921e..8d858ca6a62 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt @@ -28,6 +28,7 @@ package com.tencent.devops.process.engine.service import com.tencent.bk.audit.context.ActionAuditContext +import com.tencent.devops.auth.api.service.ServiceAuthAuthorizationResource import com.tencent.devops.common.api.constant.CommonMessageCode import com.tencent.devops.common.api.exception.DependNotFoundException import com.tencent.devops.common.api.exception.ErrorCodeException @@ -37,6 +38,7 @@ import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.common.api.util.Watcher import com.tencent.devops.common.audit.ActionAuditContent +import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.client.Client import com.tencent.devops.common.db.utils.JooqUtils import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatcher @@ -105,6 +107,7 @@ import com.tencent.devops.process.pojo.pipeline.PipelineYamlVo import com.tencent.devops.process.pojo.pipeline.TemplateInfo import com.tencent.devops.process.pojo.setting.PipelineModelVersion import com.tencent.devops.process.service.PipelineOperationLogService +import com.tencent.devops.process.service.label.PipelineGroupService import com.tencent.devops.process.service.pipeline.PipelineSettingVersionService import com.tencent.devops.process.service.pipeline.PipelineTransferYamlService import com.tencent.devops.process.utils.PIPELINE_MATRIX_CON_RUNNING_SIZE_MAX @@ -159,7 +162,8 @@ class PipelineRepositoryService constructor( private val client: Client, private val transferService: PipelineTransferYamlService, private val redisOperation: RedisOperation, - private val pipelineYamlInfoDao: PipelineYamlInfoDao + private val pipelineYamlInfoDao: PipelineYamlInfoDao, + private val pipelineGroupService: PipelineGroupService ) { companion object { @@ -249,7 +253,7 @@ class PipelineRepositoryService constructor( var canElementSkip = false run lit@{ triggerContainer.elements.forEach { - if (it is ManualTriggerElement && it.isElementEnable()) { + if (it is ManualTriggerElement && it.elementEnabled()) { canManualStartup = true canElementSkip = it.canElementSkip ?: false return@lit @@ -284,27 +288,29 @@ class PipelineRepositoryService constructor( ) result } else { - val result = create( - projectId = projectId, - pipelineId = pipelineId, - model = model, - customSetting = setting, - yaml = yaml, - userId = userId, - channelCode = channelCode, - canManualStartup = canManualStartup, - canElementSkip = canElementSkip, - buildNo = buildNo, - modelTasks = modelTasks, - useSubscriptionSettings = useSubscriptionSettings, - useLabelSettings = useLabelSettings, - useConcurrencyGroup = useConcurrencyGroup, - templateId = templateId, - versionStatus = versionStatus, - branchName = branchName, - description = description, - baseVersion = baseVersion - ) + val result = JooqUtils.retryWhenDeadLock(3) { + create( + projectId = projectId, + pipelineId = pipelineId, + model = model, + customSetting = setting, + yaml = yaml, + userId = userId, + channelCode = channelCode, + canManualStartup = canManualStartup, + canElementSkip = canElementSkip, + buildNo = buildNo, + modelTasks = modelTasks, + useSubscriptionSettings = useSubscriptionSettings, + useLabelSettings = useLabelSettings, + useConcurrencyGroup = useConcurrencyGroup, + templateId = templateId, + versionStatus = versionStatus, + branchName = branchName, + description = description, + baseVersion = baseVersion + ) + } operationLogService.addOperationLog( userId = userId, projectId = projectId, @@ -333,11 +339,11 @@ class PipelineRepositoryService constructor( channelCode: ChannelCode, yamlInfo: PipelineYamlVo? = null ): List { - val metaSize = modelCheckPlugin.checkModelIntegrity( model = model, projectId = projectId, userId = userId, + oauthUser = getPipelineOauthUser(projectId, pipelineId), pipelineId = pipelineId ) // 去重id @@ -663,6 +669,7 @@ class PipelineRepositoryService constructor( pipelineName = model.name, desc = model.desc ?: "" ) ?: run { + // 空白流水线设置初始化 val maxPipelineResNum = if ( channelCode.name in versionConfigure.specChannels.split(",") ) { @@ -690,9 +697,15 @@ class PipelineRepositoryService constructor( if (model.instanceFromTemplate != true) { if (null == pipelineSettingDao.getSetting(transactionContext, projectId, pipelineId)) { - if (templateId != null && (useSubscriptionSettings == true || useConcurrencyGroup == true)) { + if (useTemplateSettings( + templateId = templateId, + useSubscriptionSettings = useSubscriptionSettings, + useLabelSettings = useLabelSettings, + useConcurrencyGroup = useConcurrencyGroup + ) + ) { // 沿用模板的配置 - val setting = getSetting(projectId, templateId) + val setting = getSetting(projectId, templateId!!) ?: throw ErrorCodeException(errorCode = ProcessMessageCode.PIPELINE_SETTING_NOT_EXISTS) setting.pipelineId = pipelineId setting.pipelineName = model.name @@ -710,23 +723,26 @@ class PipelineRepositoryService constructor( } if (useLabelSettings != true) { setting.labels = listOf() + } else { + val groups = pipelineGroupService.getGroups(userId, projectId, templateId) + val labels = ArrayList() + groups.forEach { + labels.addAll(it.labels) + } + setting.labels = labels } setting.pipelineAsCodeSettings = PipelineAsCodeSettings() newSetting = setting } // 如果不需要覆盖模板内容，则直接保存传值或默认值 - JooqUtils.retryWhenDeadLock { - pipelineSettingDao.saveSetting(transactionContext, newSetting) - } - JooqUtils.retryWhenDeadLock { - pipelineSettingVersionDao.saveSetting( - dslContext = transactionContext, - setting = newSetting, - id = client.get(ServiceAllocIdResource::class) - .generateSegmentId(PIPELINE_SETTING_VERSION_BIZ_TAG_NAME).data, - version = settingVersion - ) - } + pipelineSettingDao.saveSetting(transactionContext, newSetting) + pipelineSettingVersionDao.saveSetting( + dslContext = transactionContext, + setting = newSetting, + id = client.get(ServiceAllocIdResource::class) + .generateSegmentId(PIPELINE_SETTING_VERSION_BIZ_TAG_NAME).data, + version = settingVersion + ) } else { pipelineSettingDao.updateSetting( dslContext = transactionContext, @@ -735,16 +751,14 @@ class PipelineRepositoryService constructor( name = model.name, desc = model.desc ?: "" )?.let { setting -> - JooqUtils.retryWhenDeadLock { - pipelineSettingVersionDao.saveSetting( - dslContext = transactionContext, - setting = setting, - id = client.get(ServiceAllocIdResource::class) - .generateSegmentId(PIPELINE_SETTING_VERSION_BIZ_TAG_NAME) - .data, - version = settingVersion - ) - } + pipelineSettingVersionDao.saveSetting( + dslContext = transactionContext, + setting = setting, + id = client.get(ServiceAllocIdResource::class) + .generateSegmentId(PIPELINE_SETTING_VERSION_BIZ_TAG_NAME) + .data, + version = settingVersion + ) newSetting = setting } } @@ -829,6 +843,16 @@ class PipelineRepositoryService constructor( ) } + private fun useTemplateSettings( + templateId: String? = null, + useSubscriptionSettings: Boolean? = false, + useLabelSettings: Boolean? = false, + useConcurrencyGroup: Boolean? = false + ): Boolean { + return templateId != null && + (useSubscriptionSettings == true || useConcurrencyGroup == true || useLabelSettings == true) + } + private fun update( projectId: String, pipelineId: String, @@ -1356,7 +1380,7 @@ class PipelineRepositoryService constructor( userId: String, projectId: String, pipelineId: String, - version: Int, + targetVersion: PipelineResourceVersion, ignoreBase: Boolean? = false, transactionContext: DSLContext? = null ): PipelineResourceVersion { @@ -1372,9 +1396,9 @@ class PipelineRepositoryService constructor( ) ?: throw ErrorCodeException( statusCode = Response.Status.NOT_FOUND.statusCode, errorCode = ProcessMessageCode.ERROR_PIPELINE_NOT_EXISTS, - params = arrayOf(version.toString()) + params = arrayOf(pipelineId) ) - // 删除草稿并获取最新版本用于版本计算 + // 删除草稿并获取最新版本用于版本号计算 pipelineResourceVersionDao.clearDraftVersion( dslContext = context, projectId = projectId, @@ -1385,17 +1409,6 @@ class PipelineRepositoryService constructor( projectId = projectId, pipelineId = pipelineId ) ?: releaseResource - // 获取目标的版本用于更新草稿 - val targetVersion = pipelineResourceVersionDao.getVersionResource( - dslContext = context, - projectId = projectId, - pipelineId = pipelineId, - version = version - ) ?: throw ErrorCodeException( - statusCode = Response.Status.NOT_FOUND.statusCode, - errorCode = ProcessMessageCode.ERROR_NO_PIPELINE_VERSION_EXISTS_BY_ID, - params = arrayOf(version.toString()) - ) // 计算版本号 val now = LocalDateTime.now() @@ -1630,6 +1643,28 @@ class PipelineRepositoryService constructor( ) } + return JooqUtils.retryWhenDeadLock(3) { + transactionSaveSetting( + context = context, + setting = setting, + versionStatus = versionStatus, + userId = userId, + updateLastModifyUser = updateLastModifyUser, + version = version, + isTemplate = isTemplate + ) + } + } + + private fun transactionSaveSetting( + context: DSLContext?, + setting: PipelineSetting, + versionStatus: VersionStatus, + userId: String, + updateLastModifyUser: Boolean?, + version: Int, + isTemplate: Boolean + ): PipelineName { var oldName: String = setting.pipelineName (context ?: dslContext).transaction { t -> val transactionContext = DSL.using(t) @@ -1662,19 +1697,17 @@ class PipelineRepositoryService constructor( maxPipelineResNum = old.maxPipelineResNum ) } - JooqUtils.retryWhenDeadLock { - pipelineSettingVersionDao.saveSetting( - dslContext = transactionContext, - setting = setting, - version = version, - isTemplate = isTemplate, - id = client.get(ServiceAllocIdResource::class).generateSegmentId( - PIPELINE_SETTING_VERSION_BIZ_TAG_NAME - ).data - ) - } + pipelineSettingVersionDao.saveSetting( + dslContext = transactionContext, + setting = setting, + version = version, + isTemplate = isTemplate, + id = client.get(ServiceAllocIdResource::class).generateSegmentId( + PIPELINE_SETTING_VERSION_BIZ_TAG_NAME + ).data + ) } - if (versionStatus.isReleasing()) JooqUtils.retryWhenDeadLock { + if (versionStatus.isReleasing()) { pipelineSettingDao.saveSetting( transactionContext, setting, isTemplate ) @@ -2031,4 +2064,17 @@ class PipelineRepositoryService constructor( locked = locked ) } + + fun getPipelineOauthUser(projectId: String, pipelineId: String): String? { + return try { + client.get(ServiceAuthAuthorizationResource::class).getResourceAuthorization( + projectId = projectId, + resourceType = AuthResourceType.PIPELINE_DEFAULT.value, + resourceCode = pipelineId + ).data + } catch (ignored: Exception) { + logger.info("get pipeline oauth user fail", ignored) + null + }?.handoverFrom + } } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt index 36e9a2439e3..e67becaab7d 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt @@ -106,6 +106,7 @@ import com.tencent.devops.process.engine.service.record.TaskBuildRecordService import com.tencent.devops.process.engine.service.rule.PipelineRuleService import com.tencent.devops.process.engine.utils.ContainerUtils import com.tencent.devops.process.engine.utils.PipelineUtils +import com.tencent.devops.process.enums.HistorySearchType import com.tencent.devops.process.pojo.BuildBasicInfo import com.tencent.devops.process.pojo.BuildHistory import com.tencent.devops.process.pojo.BuildId @@ -136,15 +137,15 @@ import com.tencent.devops.process.utils.PIPELINE_NAME import com.tencent.devops.process.utils.PIPELINE_RETRY_COUNT import com.tencent.devops.process.utils.PIPELINE_START_TASK_ID import com.tencent.devops.process.utils.PipelineVarUtil -import java.time.LocalDateTime -import java.util.Date -import java.util.concurrent.TimeUnit import org.jooq.DSLContext import org.jooq.Result import org.jooq.impl.DSL import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service +import java.time.LocalDateTime +import java.util.Date +import java.util.concurrent.TimeUnit /** * 流水线运行时相关的服务 @@ -371,7 +372,10 @@ class PipelineRuntimeService @Autowired constructor( startUser: List?, updateTimeDesc: Boolean? = null, queryDslContext: DSLContext? = null, - debugVersion: Int? + debugVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): List { val currentTimestamp = System.currentTimeMillis() // 限制最大一次拉1000，防止攻击 @@ -404,7 +408,10 @@ class PipelineRuntimeService @Autowired constructor( buildMsg = buildMsg, startUser = startUser, updateTimeDesc = updateTimeDesc, - debugVersion = debugVersion + debugVersion = debugVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) val result = mutableListOf() list.forEach { @@ -417,43 +424,124 @@ class PipelineRuntimeService @Autowired constructor( pipelineBuildDao.updateBuildRemark(dslContext, projectId, pipelineId, buildId, remark) } - fun getHistoryConditionRepo(projectId: String, pipelineId: String, debugVersion: Int?): List { - val history = pipelineBuildDao.getBuildHistoryMaterial(dslContext, projectId, pipelineId, debugVersion) - val materialObjList = mutableListOf() - history.forEach { - if (!it.material.isNullOrEmpty()) { - materialObjList.addAll(it.material!!) + fun getHistoryConditionRepo( + projectId: String, + pipelineId: String, + debugVersion: Int?, + search: String?, + type: HistorySearchType? = HistorySearchType.MATERIAL + ): List { + val aliasNames = when (type) { + HistorySearchType.MATERIAL -> { + val history = pipelineBuildDao.listHistorySearchOptions( + dslContext = dslContext, + projectId = projectId, + pipelineId = pipelineId, + debugVersion = debugVersion, + type = type + ) + val materialObjList = mutableListOf() + history.forEach { + if (!it.material.isNullOrEmpty()) { + materialObjList.addAll(it.material!!) + } + } + materialObjList.filter { !it.aliasName.isNullOrBlank() } + .map { it.aliasName!! } + .distinct() } + + HistorySearchType.TRIGGER -> { + val history = pipelineBuildDao.listHistorySearchOptions( + dslContext = dslContext, + projectId = projectId, + pipelineId = pipelineId, + debugVersion = debugVersion, + type = type + ) + history.filter { it.webhookInfo != null && !it.webhookInfo!!.webhookAliasName.isNullOrBlank() } + .map { it.webhookInfo!!.webhookAliasName!! } + .distinct() + } + + else -> emptyList() + } + return if (search.isNullOrBlank()) { + aliasNames + } else { + aliasNames.filter { it.contains(search) } } - return materialObjList.filter { !it.aliasName.isNullOrBlank() }.map { it.aliasName!! }.distinct() } fun getHistoryConditionBranch( projectId: String, pipelineId: String, aliasList: List?, - debugVersion: Int? = null + debugVersion: Int? = null, + search: String?, + type: HistorySearchType? = HistorySearchType.MATERIAL ): List { - val history = pipelineBuildDao.getBuildHistoryMaterial(dslContext, projectId, pipelineId, debugVersion) - val materialObjList = mutableListOf() - history.forEach { - if (!it.material.isNullOrEmpty()) { - materialObjList.addAll(it.material!!) + val branchNames = when (type) { + HistorySearchType.MATERIAL -> { + val history = pipelineBuildDao.listHistorySearchOptions( + dslContext = dslContext, + projectId = projectId, + pipelineId = pipelineId, + debugVersion = debugVersion, + type = type + ) + val materialObjList = mutableListOf() + history.forEach { + if (!it.material.isNullOrEmpty()) { + materialObjList.addAll(it.material!!) + } + } + val aliasNames = if (!aliasList.isNullOrEmpty() && aliasList.first().isNotBlank()) { + aliasList + } else { + materialObjList.map { it.aliasName } + } + + val result = mutableListOf() + aliasNames.distinct().forEach { alias -> + val branchNames = materialObjList.filter { + it.aliasName == alias && !it.branchName.isNullOrBlank() + }.map { it.branchName!! }.distinct() + result.addAll(branchNames) + } + result.distinct() } + + HistorySearchType.TRIGGER -> { + val history = pipelineBuildDao.listHistorySearchOptions( + dslContext = dslContext, + projectId = projectId, + pipelineId = pipelineId, + debugVersion = debugVersion, + type = type + ) + val webhookInfoList = history.filter { it.webhookInfo != null }.map { it.webhookInfo!! } + val aliasNames = if (!aliasList.isNullOrEmpty() && aliasList.first().isNotBlank()) { + aliasList + } else { + webhookInfoList.map { it.webhookAliasName } + } + val result = mutableListOf() + aliasNames.distinct().forEach { alias -> + val branchNames = webhookInfoList.filter { + it.webhookAliasName == alias && !it.webhookBranch.isNullOrBlank() + }.map { it.webhookBranch!! }.distinct() + result.addAll(branchNames) + } + result.distinct() + } + else -> emptyList() } - val aliasNames = if (aliasList.isNullOrEmpty()) { - materialObjList.map { it.aliasName } + return if (search.isNullOrBlank()) { + branchNames } else { - aliasList - } - - val result = mutableListOf() - aliasNames.distinct().forEach { alias -> - val branchNames = materialObjList.filter { it.aliasName == alias && !it.branchName.isNullOrBlank() } - .map { it.branchName!! }.distinct() - result.addAll(branchNames) + branchNames.filter { it.contains(search) } } - return result.distinct() } private fun genBuildHistory( @@ -680,7 +768,7 @@ class PipelineRuntimeService @Autowired constructor( // --- 第1层循环：Stage遍历处理 --- var afterRetryStage = false // #10082 针对构建容器的第三方构建机组装复用互斥信息 - val agentReuseMutexTree = AgentReuseMutexTree(mutableListOf()) + val agentReuseMutexTree = AgentReuseMutexTree(context.executeCount, mutableListOf()) fullModel.stages.forEachIndexed nextStage@{ index, stage -> context.needUpdateStage = stage.finally // final stage 每次重试都会参与执行检查 @@ -726,7 +814,7 @@ class PipelineRuntimeService @Autowired constructor( context.containerSeq++ containerBuildRecords.addRecords( stageId = stage.id!!, - stageEnableFlag = stage.isStageEnable(), + stageEnableFlag = stage.stageEnabled(), container = container, context = context, buildStatus = null, @@ -740,7 +828,7 @@ class PipelineRuntimeService @Autowired constructor( context.containerSeq++ containerBuildRecords.addRecords( stageId = stage.id!!, - stageEnableFlag = stage.isStageEnable(), + stageEnableFlag = stage.stageEnabled(), container = container, context = context, buildStatus = BuildStatus.SKIP, @@ -753,7 +841,7 @@ class PipelineRuntimeService @Autowired constructor( context.containerSeq++ containerBuildRecords.addRecords( stageId = stage.id!!, - stageEnableFlag = stage.isStageEnable(), + stageEnableFlag = stage.stageEnabled(), container = container, context = context, buildStatus = BuildStatus.SKIP, @@ -886,7 +974,7 @@ class PipelineRuntimeService @Autowired constructor( } // #10082 使用互斥树节点重新回写Control和Container - agentReuseMutexTree.rewriteModel(buildContainersWithDetail, fullModel, buildTaskList) + agentReuseMutexTree.rewriteModel(context, buildContainersWithDetail, fullModel, buildTaskList) context.pipelineParamMap[PIPELINE_START_TASK_ID] = BuildParameters(PIPELINE_START_TASK_ID, context.firstTaskId, readOnly = true) @@ -899,6 +987,7 @@ class PipelineRuntimeService @Autowired constructor( status = context.startBuildStatus, rebuild = context.retryStartTaskId.isNullOrBlank(), nowTime = context.now, + executeCount = context.executeCount, buildParameters = buildInfo.buildParameters?.let { self -> val newList = self.toMutableList() val retryCount = context.executeCount - 1 @@ -1303,7 +1392,7 @@ class PipelineRuntimeService @Autowired constructor( private fun StartBuildContext.sendBuildStartEvent() { // #8275 在发送运行或排队的开始事件时，进行排队计数+1 - if (!debug) pipelineBuildSummaryDao.updateQueueCount( + pipelineBuildSummaryDao.updateQueueCount( dslContext = dslContext, projectId = projectId, pipelineId = pipelineId, @@ -1319,6 +1408,7 @@ class PipelineRuntimeService @Autowired constructor( taskId = firstTaskId, status = startBuildStatus, actionType = actionType, + executeCount = executeCount, buildNoType = buildNoType // 该字段是需要遍历Model‘获得，不过在审核阶段为null，不影响功能逻辑。 ), // 监控事件 PipelineBuildMonitorEvent( @@ -1491,7 +1581,11 @@ class PipelineRuntimeService @Autowired constructor( * 完成认领构建的任务[completeTask] * [endBuild]表示最后一步，当前容器要结束 */ - fun completeClaimBuildTask(completeTask: CompleteTask, endBuild: Boolean = false): PipelineBuildTask? { + fun completeClaimBuildTask( + completeTask: CompleteTask, + endBuild: Boolean = false, + endBuildMsg: String? = null + ): PipelineBuildTask? { val buildTask = pipelineTaskService.getBuildTask( projectId = completeTask.projectId, buildId = completeTask.buildId, @@ -1532,7 +1626,7 @@ class PipelineRuntimeService @Autowired constructor( errorCode = completeTask.errorCode ?: 0, errorTypeName = completeTask.errorType?.getI18n(I18nUtil.getDefaultLocaleLanguage()), executeCount = buildTask.executeCount, - reason = completeTask.errorMsg + reason = endBuildMsg ?: completeTask.errorMsg ) ) } @@ -1582,7 +1676,6 @@ class PipelineRuntimeService @Autowired constructor( projectId = latestRunningBuild.projectId, buildId = latestRunningBuild.buildId, startTime = if (latestRunningBuild.executeCount == 1) startTime else null, - executeCount = latestRunningBuild.executeCount, debug = latestRunningBuild.debug ) pipelineInfoDao.updateLatestStartTime( @@ -1591,11 +1684,11 @@ class PipelineRuntimeService @Autowired constructor( pipelineId = latestRunningBuild.pipelineId, startTime = startTime ) - // #8161 调试构建不参与刷新summary表 - if (!latestRunningBuild.debug) pipelineBuildSummaryDao.startLatestRunningBuild( + pipelineBuildSummaryDao.startLatestRunningBuild( dslContext = transactionContext, latestRunningBuild = latestRunningBuild, - executeCount = latestRunningBuild.executeCount + executeCount = latestRunningBuild.executeCount, + debug = latestRunningBuild.debug ) } pipelineEventDispatcher.dispatch( @@ -1627,22 +1720,21 @@ class PipelineRuntimeService @Autowired constructor( errorInfoList: List?, timeCost: BuildRecordTimeCost? ) { - if (!latestRunningBuild.debug) { - if (currentBuildStatus.isReadyToRun() || currentBuildStatus.isNeverRun()) { - // 减1,当作没执行过 - pipelineBuildSummaryDao.updateQueueCount( - dslContext = dslContext, - projectId = latestRunningBuild.projectId, - pipelineId = latestRunningBuild.pipelineId, - queueIncrement = -1 - ) - } else { - pipelineBuildSummaryDao.finishLatestRunningBuild( - dslContext = dslContext, - latestRunningBuild = latestRunningBuild, - isStageFinish = currentBuildStatus.name == BuildStatus.STAGE_SUCCESS.name - ) - } + if (currentBuildStatus.isReadyToRun() || currentBuildStatus.isNeverRun()) { + // 减1,当作没执行过 + pipelineBuildSummaryDao.updateQueueCount( + dslContext = dslContext, + projectId = latestRunningBuild.projectId, + pipelineId = latestRunningBuild.pipelineId, + queueIncrement = -1 + ) + } else { + pipelineBuildSummaryDao.finishLatestRunningBuild( + dslContext = dslContext, + latestRunningBuild = latestRunningBuild, + isStageFinish = currentBuildStatus.name == BuildStatus.STAGE_SUCCESS.name, + debug = latestRunningBuild.debug + ) } with(latestRunningBuild) { val executeTime = try { @@ -1793,7 +1885,10 @@ class PipelineRuntimeService @Autowired constructor( buildMsg: String? = null, startUser: List? = null, queryDslContext: DSLContext? = null, - debugVersion: Int? = null + debugVersion: Int? = null, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): Int { return pipelineBuildDao.count( dslContext = queryDslContext ?: dslContext, @@ -1819,7 +1914,10 @@ class PipelineRuntimeService @Autowired constructor( buildNoEnd = buildNoEnd, buildMsg = buildMsg, startUser = startUser, - debugVersion = debugVersion + debugVersion = debugVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt index f7bdb074582..043cda23c1a 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt @@ -30,6 +30,7 @@ package com.tencent.devops.process.engine.service import com.tencent.devops.common.api.enums.BuildReviewType import com.tencent.devops.common.api.util.DateTimeUtil import com.tencent.devops.common.client.Client +import com.tencent.devops.common.db.utils.JooqUtils import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatcher import com.tencent.devops.common.event.enums.ActionType import com.tencent.devops.common.event.pojo.pipeline.PipelineBuildQualityCheckBroadCastEvent @@ -39,7 +40,6 @@ import com.tencent.devops.common.pipeline.enums.BuildStatus import com.tencent.devops.common.pipeline.enums.ManualReviewAction import com.tencent.devops.common.pipeline.pojo.StagePauseCheck import com.tencent.devops.common.pipeline.pojo.StageReviewRequest -import com.tencent.devops.common.db.utils.JooqUtils import com.tencent.devops.common.websocket.enum.RefreshType import com.tencent.devops.process.engine.common.BS_MANUAL_START_STAGE import com.tencent.devops.process.engine.common.BS_QUALITY_ABORT_STAGE @@ -53,7 +53,6 @@ import com.tencent.devops.process.engine.pojo.PipelineBuildStage import com.tencent.devops.process.engine.pojo.event.PipelineBuildNotifyEvent import com.tencent.devops.process.engine.pojo.event.PipelineBuildStageEvent import com.tencent.devops.process.engine.pojo.event.PipelineBuildWebSocketPushEvent -import com.tencent.devops.process.engine.service.detail.StageBuildDetailService import com.tencent.devops.process.engine.service.record.StageBuildRecordService import com.tencent.devops.process.pojo.PipelineNotifyTemplateEnum import com.tencent.devops.process.pojo.StageQualityRequest @@ -65,12 +64,12 @@ import com.tencent.devops.process.utils.PipelineVarUtil import com.tencent.devops.quality.api.v2.pojo.ControlPointPosition import com.tencent.devops.quality.api.v3.ServiceQualityRuleResource import com.tencent.devops.quality.api.v3.pojo.request.BuildCheckParamsV3 +import java.util.Date import org.jooq.DSLContext import org.jooq.impl.DSL import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service -import java.util.Date /** * 流水线Stage相关的服务 @@ -85,7 +84,6 @@ class PipelineStageService @Autowired constructor( private val pipelineBuildSummaryDao: PipelineBuildSummaryDao, private val pipelineBuildStageDao: PipelineBuildStageDao, private val buildVariableService: BuildVariableService, - private val stageBuildDetailService: StageBuildDetailService, private val stageBuildRecordService: StageBuildRecordService, private val pipelineRepositoryService: PipelineRepositoryService, private val client: Client @@ -215,7 +213,8 @@ class PipelineStageService @Autowired constructor( with(buildStage) { // 兜底保护，若已经被审核过则直接忽略 if (checkIn?.status == BuildStatus.REVIEW_ABORT.name || - checkIn?.status == BuildStatus.REVIEW_PROCESSED.name) { + checkIn?.status == BuildStatus.REVIEW_PROCESSED.name + ) { return@with } checkIn?.status = BuildStatus.REVIEWING.name @@ -246,9 +245,9 @@ class PipelineStageService @Autowired constructor( dslContext = context, projectId = projectId, buildId = buildId, stageStatus = allStageStatus ) // 被暂停的流水线不占构建队列，在执行数-1 - if (!debug) pipelineBuildSummaryDao.updateRunningCount( + pipelineBuildSummaryDao.updateRunningCount( dslContext = context, projectId = projectId, pipelineId = pipelineId, - buildId = buildId, runningIncrement = -1 + buildId = buildId, runningIncrement = -1, debug = debug ) } } @@ -315,9 +314,9 @@ class PipelineStageService @Autowired constructor( pipelineBuildDao.updateBuildStageStatus( dslContext = context, projectId = projectId, buildId = buildId, stageStatus = allStageStatus ) - if (!debug) pipelineBuildSummaryDao.updateRunningCount( + pipelineBuildSummaryDao.updateRunningCount( dslContext = context, projectId = projectId, pipelineId = pipelineId, - buildId = buildId, runningIncrement = 1 + buildId = buildId, runningIncrement = 1, debug = debug ) } } @@ -428,9 +427,9 @@ class PipelineStageService @Autowired constructor( oldBuildStatus = BuildStatus.STAGE_SUCCESS, newBuildStatus = BuildStatus.RUNNING ) // #4255 stage审核超时恢复运行状态需要将运行状态+1，即使直接结束也会在finish阶段减回来 - if (!debug) pipelineBuildSummaryDao.updateRunningCount( + pipelineBuildSummaryDao.updateRunningCount( dslContext = context, projectId = projectId, pipelineId = pipelineId, - buildId = buildId, runningIncrement = 1 + buildId = buildId, runningIncrement = 1, debug = debug ) } } @@ -472,7 +471,7 @@ class PipelineStageService @Autowired constructor( ), position = ControlPointPosition.BEFORE_POSITION, stageId = stageId, - notifyType = NotifyUtils.checkNotifyType(checkIn?.notifyType) ?: mutableSetOf(), + notifyType = NotifyUtils.checkNotifyType(checkIn?.notifyType), markdownContent = checkIn?.markdownContent ) // #3400 FinishEvent会刷新HISTORY列表的Stage状态 @@ -567,6 +566,15 @@ class PipelineStageService @Autowired constructor( return pipelineBuildStageDao.getOneByStatus(dslContext, projectId, buildId, pendingStatusSet) } + fun getPendingStages(projectId: String, buildId: String): List { + return pipelineBuildStageDao.listBuildStages( + dslContext = dslContext, + projectId = projectId, + buildId = buildId, + statusSet = pendingStatusSet + ) + } + fun pauseStageNotify( userId: String, triggerUserId: String, @@ -608,7 +616,7 @@ class PipelineStageService @Autowired constructor( ), position = ControlPointPosition.BEFORE_POSITION, stageId = stage.stageId, - notifyType = NotifyUtils.checkNotifyType(checkIn.notifyType) ?: mutableSetOf(), + notifyType = NotifyUtils.checkNotifyType(checkIn.notifyType), markdownContent = checkIn.markdownContent ) ) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/detail/BaseBuildDetailService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/detail/BaseBuildDetailService.kt index 12fcd088ab1..df7fcf208e0 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/detail/BaseBuildDetailService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/detail/BaseBuildDetailService.kt @@ -41,6 +41,7 @@ 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.enums.BuildStatus +import com.tencent.devops.common.pipeline.enums.ChannelCode import com.tencent.devops.common.pipeline.pojo.element.Element import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.service.utils.LogUtils @@ -139,11 +140,11 @@ open class BaseBuildDetailService constructor( return JsonUtil.to(record!!.model, Model::class.java) } finally { lock.unlock() -// logger.info("[$buildId|$buildStatus]|$operation|update_detail_model| $message") -// if (message == "update done") { // 防止MQ异常导致锁时间过长，将推送事件移出锁定范围 -// watcher.start("dispatchEvent") -// pipelineDetailChangeEvent(projectId, buildId) -// } + logger.info("[$buildId|$buildStatus]|$operation|update_detail_model| $message") + if (message == "update done") { // 防止MQ异常导致锁时间过长，将推送事件移出锁定范围 + watcher.start("dispatchEvent") + pipelineDetailChangeEvent(projectId, buildId) + } LogUtils.printCostTimeWE(watcher) } } @@ -243,10 +244,11 @@ open class BaseBuildDetailService constructor( } } - protected fun pipelineDetailChangeEvent(projectId: String, buildId: String) { - val pipelineBuildInfo = pipelineBuildDao.getBuildInfo(dslContext, projectId, buildId) ?: return - // 异步转发，解耦核心 - pipelineEventDispatcher.dispatch( + private fun pipelineDetailChangeEvent(projectId: String, buildId: String) { + val pipelineBuildInfo = pipelineBuildDao.getBuildInfo(dslContext, projectId, buildId) + if (pipelineBuildInfo?.channelCode == ChannelCode.GIT) pipelineEventDispatcher.dispatch( + // 异步转发，解耦核心 + // TODO stream内部和开源前端未更新前，保持推送 PipelineBuildWebSocketPushEvent( source = "recordDetail", projectId = pipelineBuildInfo.projectId, diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/ContainerBuildRecordService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/ContainerBuildRecordService.kt index c3cdec48b60..d5593c6c921 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/ContainerBuildRecordService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/ContainerBuildRecordService.kt @@ -221,11 +221,17 @@ class ContainerBuildRecordService( val containerName = recordContainer.containerVar[Container::name.name]?.toString() ?: "" var startTime: LocalDateTime? = null var endTime: LocalDateTime? = null + val now = LocalDateTime.now() // 存在互斥组的先将名字修改 if (buildStatus.isReadyToRun()) { if (recordContainer.startTime == null) { - startTime = LocalDateTime.now() + startTime = now } + // #10751 增加对运行中重试的兼容，因为不新增执行次数，需要刷新上一次失败的结束时间 + if (recordContainer.endTime != null) recordContainerDao.flushEndTimeWhenRetry( + dslContext = context, projectId = projectId, pipelineId = pipelineId, + buildId = buildId, containerId = containerId, executeCount = executeCount + ) val mutexGroup = when (recordContainer.containerType) { VMBuildContainer.classType -> containerVar[VMBuildContainer::mutexGroup.name]?.let { it as MutexGroup @@ -247,10 +253,10 @@ class ContainerBuildRecordService( if (buildStatus.isFinish()) { if (recordContainer.endTime == null) { - endTime = LocalDateTime.now() + endTime = now } newTimestamps[BuildTimestampType.JOB_CONTAINER_SHUTDOWN] = BuildRecordTimeStamp( - null, LocalDateTime.now().timestampmilli() + null, now.timestampmilli() ) // 矩阵直接以类似stage的方式计算耗时 if (recordContainer.matrixGroupFlag == true) { @@ -428,8 +434,13 @@ class ContainerBuildRecordService( var startTime: LocalDateTime? = null var endTime: LocalDateTime? = null val now = LocalDateTime.now() - if (buildStatus?.isRunning() == true && recordContainer.startTime == null) { - startTime = now + if (buildStatus?.isRunning() == true) { + if (recordContainer.startTime == null) startTime = now + // #10751 增加对运行中重试的兼容，因为不新增执行次数，需要刷新上一次失败的结束时间 + if (recordContainer.endTime != null) recordContainerDao.flushEndTimeWhenRetry( + dslContext = context, projectId = projectId, pipelineId = pipelineId, + buildId = buildId, containerId = containerId, executeCount = executeCount + ) } if (buildStatus?.isFinish() == true && recordContainer.endTime == null) { endTime = now diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/TaskBuildRecordService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/TaskBuildRecordService.kt index 92334b17a11..69ed4674615 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/TaskBuildRecordService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/record/TaskBuildRecordService.kt @@ -203,7 +203,11 @@ class TaskBuildRecordService( taskVar.remove(Element::errorType.name) taskVar.remove(Element::errorCode.name) taskVar.remove(Element::errorMsg.name) - + // #10751 增加对运行中重试的兼容，因为不新增执行次数，需要刷新上一次失败的结束时间 + if (recordTask.endTime != null) recordTaskDao.flushEndTimeWhenRetry( + dslContext = context, projectId = projectId, pipelineId = pipelineId, + buildId = buildId, taskId = taskId, executeCount = executeCount + ) recordTaskDao.updateRecord( dslContext = context, projectId = projectId, @@ -469,17 +473,20 @@ class TaskBuildRecordService( taskId = taskId, executeCount = executeCount ) ?: run { - logger.warn( - "ENGINE|$buildId|updateTaskByMap| get task($taskId) record failed." - ) + logger.warn("ENGINE|$buildId|updateTaskRecord| get task($taskId) record failed.") return@transaction } var startTime: LocalDateTime? = null var endTime: LocalDateTime? = null val now = LocalDateTime.now() val newTimestamps = mutableMapOf() - if (buildStatus?.isRunning() == true && recordTask.startTime == null) { - startTime = now + if (buildStatus?.isRunning() == true) { + if (recordTask.startTime == null) startTime = now + // #10751 增加对运行中重试的兼容，因为不新增执行次数，需要刷新上一次失败的结束时间 + if (recordTask.endTime != null) recordTaskDao.flushEndTimeWhenRetry( + dslContext = transactionContext, projectId = projectId, pipelineId = pipelineId, + buildId = buildId, taskId = taskId, executeCount = executeCount + ) } if (buildStatus?.isFinish() == true && recordTask.endTime == null) { endTime = now diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/vmbuild/EngineVMBuildService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/vmbuild/EngineVMBuildService.kt index 78bdea60130..4a22a6d3941 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/vmbuild/EngineVMBuildService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/vmbuild/EngineVMBuildService.kt @@ -28,6 +28,7 @@ package com.tencent.devops.process.engine.service.vmbuild import com.tencent.devops.common.api.check.Preconditions +import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.exception.OperationException import com.tencent.devops.common.api.pojo.ErrorCode import com.tencent.devops.common.api.pojo.ErrorInfo @@ -57,9 +58,9 @@ import com.tencent.devops.common.web.utils.AtomRuntimeUtil import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.common.websocket.enum.RefreshType import com.tencent.devops.engine.api.pojo.HeartBeatInfo +import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.constant.ProcessMessageCode.BK_CONTINUE_WHEN_ERROR import com.tencent.devops.process.constant.ProcessMessageCode.BK_PROCESSING_CURRENT_REPORTED_TASK_PLEASE_WAIT -import com.tencent.devops.process.constant.ProcessMessageCode.BK_VM_START_ALREADY import com.tencent.devops.process.engine.common.Timeout import com.tencent.devops.process.engine.common.Timeout.transMinuteTimeoutToMills import com.tencent.devops.process.engine.common.Timeout.transMinuteTimeoutToSec @@ -85,6 +86,7 @@ import com.tencent.devops.process.engine.service.record.ContainerBuildRecordServ import com.tencent.devops.process.engine.service.record.TaskBuildRecordService import com.tencent.devops.process.engine.utils.ContainerUtils import com.tencent.devops.process.jmx.elements.JmxElements +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTaskResult import com.tencent.devops.process.pojo.BuildVariables @@ -92,7 +94,6 @@ import com.tencent.devops.process.pojo.task.TaskBuildEndParam import com.tencent.devops.process.service.BuildVariableService import com.tencent.devops.process.service.PipelineAsCodeService import com.tencent.devops.process.service.PipelineContextService -import com.tencent.devops.process.service.PipelineTaskPauseService import com.tencent.devops.process.util.TaskUtils import com.tencent.devops.process.utils.PIPELINE_BUILD_REMARK import com.tencent.devops.process.utils.PIPELINE_ELEMENT_ID @@ -100,12 +101,12 @@ import com.tencent.devops.process.utils.PIPELINE_VMSEQ_ID import com.tencent.devops.process.utils.PipelineVarUtil import com.tencent.devops.store.api.container.ServiceContainerAppResource import com.tencent.devops.store.pojo.app.BuildEnv -import java.time.LocalDateTime -import java.util.concurrent.TimeUnit -import javax.ws.rs.NotFoundException import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service +import java.time.LocalDateTime +import java.util.concurrent.TimeUnit +import javax.ws.rs.NotFoundException @Suppress( "LongMethod", @@ -113,7 +114,8 @@ import org.springframework.stereotype.Service "ReturnCount", "TooManyFunctions", "MagicNumber", - "LargeClass" + "LargeClass", + "ComplexMethod" ) @Service class EngineVMBuildService @Autowired(required = false) constructor( @@ -128,7 +130,6 @@ class EngineVMBuildService @Autowired(required = false) constructor( private val buildLogPrinter: BuildLogPrinter, private val pipelineEventDispatcher: PipelineEventDispatcher, private val pipelineTaskService: PipelineTaskService, - private val pipelineTaskPauseService: PipelineTaskPauseService, private val jmxElements: JmxElements, private val buildExtService: PipelineBuildExtService, private val client: Client, @@ -194,7 +195,6 @@ class EngineVMBuildService @Autowired(required = false) constructor( projectId, buildInfo.pipelineId, buildId, buildInfo ) Preconditions.checkNotNull(model, NotFoundException("Build Model ($buildId) is not exist")) - var vmId = 1 model!!.stages.forEachIndexed { index, s -> if (index == 0) { @@ -213,11 +213,13 @@ class EngineVMBuildService @Autowired(required = false) constructor( if (container.status.isFinish()) { throw OperationException("vmName($vmName) has been shutdown") } + val startUpVMTask = getStartUpVMTask(projectId, buildId, vmSeqId) // #3769 如果是已经启动完成并且不是网络故障重试的(retryCount>0), 都属于构建机的重复无效启动请求,要抛异常拒绝 Preconditions.checkTrue( - condition = !BuildStatus.parse(c.startVMStatus).isFinish() || retryCount > 0, - exception = OperationException( - I18nUtil.getCodeLanMessage(messageCode = BK_VM_START_ALREADY) + " ${c.startVMStatus}" + condition = startUpVMTask?.status?.isFinish() != true || retryCount > 0, + exception = ErrorCodeException( + errorCode = ProcessMessageCode.ERROR_REPEATEDLY_START_VM, + params = arrayOf(c.startVMStatus ?: "") ) ) val containerAppResource = client.get(ServiceContainerAppResource::class) @@ -315,7 +317,6 @@ class EngineVMBuildService @Autowired(required = false) constructor( pipelineAsCodeSettings = asCodeSettings ) } - vmId++ } } LOG.info("ENGINE|$buildId|BUILD_VM_START|j($vmSeqId)|$vmName|Not Found VMContainer") @@ -354,23 +355,12 @@ class EngineVMBuildService @Autowired(required = false) constructor( errorCode: Int? = null, errorMsg: String? = null ): Boolean { - // 针VM启动不是在第一个的情况，第一个可能是人工审核插件（避免占用VM） - // agent上报状态需要判断根据ID来获取真正的启动VM的任务，否则兼容处理取第一个插件的状态（正常情况） - var startUpVMTask = pipelineTaskService.getBuildTask(projectId, buildId, VMUtils.genStartVMTaskId(vmSeqId)) - - if (startUpVMTask == null) { - val buildTasks = pipelineTaskService.listContainerBuildTasks(projectId, buildId, vmSeqId) - if (buildTasks.isNotEmpty()) { - startUpVMTask = buildTasks[0] - } - } - + val startUpVMTask = getStartUpVMTask(projectId, buildId, vmSeqId) LOG.info("ENGINE|$buildId|SETUP_VM_STATUS|j($vmSeqId)|${startUpVMTask?.taskId}|status=$buildStatus") if (startUpVMTask == null) { return false } val finalBuildStatus = getFinalBuildStatus(buildStatus, buildId, vmSeqId, startUpVMTask) - // 如果是完成状态，则更新构建机启动插件的状态 if (finalBuildStatus.isFinish()) { pipelineTaskService.updateTaskStatus( @@ -452,6 +442,24 @@ class EngineVMBuildService @Autowired(required = false) constructor( return true } + private fun getStartUpVMTask( + projectId: String, + buildId: String, + vmSeqId: String + ): PipelineBuildTask? { + // 针VM启动不是在第一个的情况，第一个可能是人工审核插件（避免占用VM） + // agent上报状态需要判断根据ID来获取真正的启动VM的任务，否则兼容处理取第一个插件的状态（正常情况） + var startUpVMTask = pipelineTaskService.getBuildTask(projectId, buildId, VMUtils.genStartVMTaskId(vmSeqId)) + + if (startUpVMTask == null) { + val buildTasks = pipelineTaskService.listContainerBuildTasks(projectId, buildId, vmSeqId) + if (buildTasks.isNotEmpty()) { + startUpVMTask = buildTasks[0] + } + } + return startUpVMTask + } + private fun getFinalBuildStatus( buildStatus: BuildStatus, buildId: String, @@ -928,7 +936,13 @@ class EngineVMBuildService @Autowired(required = false) constructor( /** * 构建机结束当前Job */ - fun buildEndTask(projectId: String, buildId: String, vmSeqId: String, vmName: String): Boolean { + fun buildEndTask( + projectId: String, + buildId: String, + vmSeqId: String, + vmName: String, + buildJobResult: BuildJobResult? = null + ): Boolean { val containerIdLock = ContainerIdLock(redisOperation, buildId, vmSeqId) try { containerIdLock.lock() @@ -947,7 +961,8 @@ class EngineVMBuildService @Autowired(required = false) constructor( userId = task.starter, buildStatus = BuildStatus.SUCCEED ), - endBuild = true + endBuild = true, + endBuildMsg = buildJobResult?.message ) LOG.info("ENGINE|$buildId|BE_DONE|${task.stageId}|j($vmSeqId)|${task.taskId}|${task.taskName}") buildExtService.endBuild(task) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt index d8b8c27fbba..062c79a5358 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt @@ -158,6 +158,39 @@ object PipelineUtils { return stages } + /** + * 将流水线常量转换成模板常量 + */ + fun fixedTemplateParam(model: Model): Model { + val triggerContainer = model.stages[0].containers[0] as TriggerContainer + val params = mutableListOf() + val templateParams = mutableListOf() + triggerContainer.params.forEach { + if (it.constant == true) { + templateParams.add(it) + } else { + params.add(it) + } + } + val fixedTriggerContainer = triggerContainer.copy( + params = params, + templateParams = if (templateParams.isEmpty()) { + null + } else { + templateParams + } + ) + val stages = ArrayList() + model.stages.forEachIndexed { index, stage -> + if (index == 0) { + stages.add(stage.copy(containers = listOf(fixedTriggerContainer))) + } else { + stages.add(stage) + } + } + return model.copy(stages = stages) + } + /** * 通过流水线参数和模板编排生成新Model */ @@ -178,7 +211,9 @@ object PipelineUtils { BuildPropertyCompatibilityTools.mergeProperties( from = templateTrigger.params, to = BuildPropertyCompatibilityTools.mergeProperties( - from = templateTrigger.templateParams!!, to = param ?: emptyList() + // 模板常量需要变成流水线常量 + from = templateTrigger.templateParams!!.map { it.copy(constant = true) }, + to = param ?: emptyList() ) ) } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/plugin/ElementBizPlugin.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/plugin/ElementBizPlugin.kt index a369208c1c1..b9b5a459dba 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/plugin/ElementBizPlugin.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/plugin/ElementBizPlugin.kt @@ -80,6 +80,7 @@ interface ElementBizPlugin { contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): ElementCheckResult } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/BuildVariableService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/BuildVariableService.kt index 86328573d6e..5685895238d 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/BuildVariableService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/BuildVariableService.kt @@ -40,7 +40,6 @@ import com.tencent.devops.process.utils.PipelineVarUtil import org.apache.commons.lang3.math.NumberUtils import org.jooq.DSLContext import org.jooq.impl.DSL -import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -53,10 +52,6 @@ class BuildVariableService @Autowired constructor( private val redisOperation: RedisOperation ) { - companion object { - private val logger = LoggerFactory.getLogger(BuildVariableService::class.java) - } - /** * 获取构建执行次数（重试次数+1），如没有重试过，则为1 */ @@ -282,15 +277,13 @@ class BuildVariableService @Autowired constructor( // 加锁防止数据被重复插入 redisLock.lock() watch.start("getVars") - val buildVarMap = pipelineBuildVarDao.getBuildVarMap(dslContext, projectId, buildId) + val buildVarMap = pipelineBuildVarDao.getVars(dslContext, projectId, buildId) val insertBuildParameters = mutableListOf() val updateBuildParameters = mutableListOf() pipelineBuildParameters.forEach { if (!buildVarMap.containsKey(it.key)) { insertBuildParameters.add(it) } else { - // TODO PAC上线后删除, 打印流水线运行时覆盖只读变量,只在第一次运行时输出,重试不输出 - printReadOnlyVar(buildVarMap, variables, it, projectId, pipelineId, buildId) updateBuildParameters.add(it) } } @@ -315,25 +308,6 @@ class BuildVariableService @Autowired constructor( } } - private fun printReadOnlyVar( - buildVarMap: Map, - variables: Map, - buildParameters: BuildParameters, - projectId: String, - pipelineId: String, - buildId: String - ) { - if (buildVarMap[PIPELINE_RETRY_COUNT] == null && - variables[PIPELINE_RETRY_COUNT] == null && - buildVarMap[buildParameters.key]?.readOnly == true - ) { - logger.warn( - "BKSystemErrorMonitor|$projectId|$pipelineId|$buildId|${buildParameters.key}| " + - "build var read-only cannot be modified" - ) - } - } - // #10082 查询Agent复用互斥使用的AgentId fun fetchAgentReuseMutexVar( projectId: String, diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt index 39a97b229f9..09f2735bac5 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt @@ -56,6 +56,7 @@ import com.tencent.devops.process.pojo.BuildId import com.tencent.devops.process.pojo.app.StartBuildContext import com.tencent.devops.process.service.ProjectCacheService import com.tencent.devops.process.util.BuildMsgUtils +import com.tencent.devops.process.utils.BK_CI_AUTHORIZER import com.tencent.devops.process.utils.BK_CI_MATERIAL_ID import com.tencent.devops.process.utils.BK_CI_MATERIAL_NAME import com.tencent.devops.process.utils.BK_CI_MATERIAL_URL @@ -203,7 +204,15 @@ class PipelineBuildService( pipeline = pipeline, projectVO = projectVO, channelCode = channelCode, - isMobile = isMobile + isMobile = isMobile, + pipelineAuthorizer = if (pipeline.channelCode == ChannelCode.BS) { + pipelineRepositoryService.getPipelineOauthUser( + projectId = pipeline.projectId, + pipelineId = pipeline.pipelineId + ) + } else { + null + } ) val context = StartBuildContext.init( @@ -265,7 +274,8 @@ class PipelineBuildService( projectVO: ProjectVO?, channelCode: ChannelCode, isMobile: Boolean, - debug: Boolean? = false + debug: Boolean? = false, + pipelineAuthorizer: String? = null ) { val userName = when (startType) { StartType.PIPELINE -> pipelineParamMap[PIPELINE_START_PIPELINE_USER_ID]?.value @@ -378,6 +388,15 @@ class PipelineBuildService( readOnly = true ) } + // 流水线权限代持人 + pipelineAuthorizer?.let { + pipelineParamMap[BK_CI_AUTHORIZER] = BuildParameters( + key = BK_CI_AUTHORIZER, + value = it, + readOnly = true + ) + } + // 链路 val bizId = MDC.get(TraceTag.BIZID) if (!bizId.isNullOrBlank()) { // 保存链路信息 diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingVersionService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingVersionService.kt index cf1ce8255cb..9d2e7732924 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingVersionService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingVersionService.kt @@ -39,6 +39,7 @@ import com.tencent.devops.process.dao.PipelineSettingVersionDao import com.tencent.devops.process.pojo.PipelineDetailInfo import com.tencent.devops.process.pojo.setting.PipelineSettingVersion import com.tencent.devops.process.service.label.PipelineGroupService +import com.tencent.devops.process.utils.PipelineVersionUtils import org.jooq.DSLContext import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -169,4 +170,22 @@ class PipelineSettingVersionService @Autowired constructor( context ?: dslContext, projectId, pipelineId )?.let { PipelineSettingVersion.convertFromSetting(it) } } + + fun getSettingVersionAfterUpdate( + projectId: String, + pipelineId: String, + updateVersion: Boolean, + setting: PipelineSetting + ): Int { + return getLatestSettingVersion( + projectId = projectId, + pipelineId = pipelineId + )?.let { latest -> + if (updateVersion) PipelineVersionUtils.getSettingVersion( + currVersion = latest.version, + originSetting = latest, + newSetting = PipelineSettingVersion.convertFromSetting(setting) + ) else latest.version + } ?: 1 + } } diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineTransferYamlService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineTransferYamlService.kt index ddc8a297494..64bb3aee663 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineTransferYamlService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineTransferYamlService.kt @@ -141,7 +141,6 @@ class PipelineTransferYamlService @Autowired constructor( aspectWrapper = PipelineTransferAspectWrapper(aspects) ) ) - val newYaml = TransferMapper.mergeYaml(data.oldYaml, TransferMapper.toYaml(response)) if (invalidElement.isNotEmpty()) { throw PipelineTransferException( ELEMENT_NOT_SUPPORT_TRANSFER, @@ -149,6 +148,7 @@ class PipelineTransferYamlService @Autowired constructor( ) } watcher.start("step_2|mergeYaml") + val newYaml = TransferMapper.mergeYaml(data.oldYaml, TransferMapper.toYaml(response)) watcher.stop() logger.info(watcher.toString()) return TransferResponse( diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/record/PipelineRecordModelService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/record/PipelineRecordModelService.kt index 992279e1275..3a20008e2e3 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/record/PipelineRecordModelService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/record/PipelineRecordModelService.kt @@ -270,15 +270,10 @@ class PipelineRecordModelService @Autowired constructor( // 获取开机任务的序号 val startVMTaskSeq = buildRecordContainer.containerVar[Container::startVMTaskSeq.name]?.toString()?.toInt() ?: 1 containerRecordTasks.forEach { containerRecordTask -> - if (startVMTaskSeq > 1 && startVMTaskSeq > containerRecordTask.taskSeq) { - // 当开机任务的序号大于1时，说明第一个任务不是开机任务，job含有内置插件任务，需要重新调整开机任务前面的task任务的taskSeq值 - containerRecordTask.taskSeq += 1 - } + handleTaskSeq(startVMTaskSeq, containerRecordTask) val taskVarMap = generateTaskVarMap( - containerRecordTask = containerRecordTask, - taskId = containerRecordTask.taskId, - containerBaseMap = containerBaseMap, - matrixTaskFlag = matrixTaskFlag, + containerRecordTask = containerRecordTask, taskId = containerRecordTask.taskId, + containerBaseMap = containerBaseMap, matrixTaskFlag = matrixTaskFlag, taskBaseMaps = taskBaseMaps ) while (containerRecordTask.taskSeq - preContainerRecordTaskSeq > 1) { @@ -319,6 +314,16 @@ class PipelineRecordModelService @Autowired constructor( } } + private fun handleTaskSeq( + startVMTaskSeq: Int, + containerRecordTask: BuildRecordTask + ) { + if (startVMTaskSeq < 1 || (startVMTaskSeq > 1 && startVMTaskSeq > containerRecordTask.taskSeq)) { + // 当开机任务的序号大于1时，说明第一个任务不是开机任务，job含有内置插件任务，需要重新调整开机任务前面的task任务的taskSeq值 + containerRecordTask.taskSeq += 1 + } + } + private fun generateTaskVarMap( containerRecordTask: BuildRecordTask, taskId: String, @@ -443,7 +448,7 @@ class PipelineRecordModelService @Autowired constructor( // 如果跳过的是矩阵类task，则需要生成完整的model对象以便合并 taskVarMap["@type"] = MatrixStatusElement.classType taskVarMap[MatrixStatusElement::originClassType.name] = - taskBaseMap[MatrixStatusElement::classType.name].toString() + taskBaseMap[MatrixStatusElement.classType].toString() taskVarMap[MatrixStatusElement::originAtomCode.name] = taskBaseMap[KEY_ATOM_CODE].toString() taskVarMap[MatrixStatusElement::originTaskAtom.name] = taskBaseMap[KEY_TASK_ATOM].toString() taskVarMap = ModelUtils.generateBuildModelDetail(taskBaseMap.deepCopy(), taskVarMap) diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/scm/ScmProxyService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/scm/ScmProxyService.kt index 78ce0f4bac7..ccb44886750 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/scm/ScmProxyService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/scm/ScmProxyService.kt @@ -69,6 +69,9 @@ import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service import java.net.URLEncoder +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.format.DateTimeFormatter import java.util.Base64 import javax.ws.rs.NotFoundException @@ -701,9 +704,9 @@ class ScmProxyService @Autowired constructor(private val client: Client) { detailUrl: String, externalId: String, status: String, - startedAt: String?, + startedAt: LocalDateTime?, conclusion: String?, - completedAt: String? + completedAt: LocalDateTime? ) { logger.info("Project($projectId) update github commit($commitId) check runs") @@ -717,9 +720,9 @@ class ScmProxyService @Autowired constructor(private val client: Client) { detailsUrl = detailUrl, externalId = externalId, status = status, - startedAt = startedAt, + startedAt = startedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT), conclusion = conclusion, - completedAt = completedAt + completedAt = completedAt?.atZone(ZoneId.systemDefault())?.format(DateTimeFormatter.ISO_INSTANT) ) client.get(ServiceGithubResource::class).updateCheckRuns( diff --git a/src/backend/ci/core/process/biz-base/src/test/kotlin/com/tencent/devops/process/pojo/AgentReuseMutexTest.kt b/src/backend/ci/core/process/biz-base/src/test/kotlin/com/tencent/devops/process/pojo/AgentReuseMutexTest.kt index b8c8bb1d600..dbd4ab46d35 100644 --- a/src/backend/ci/core/process/biz-base/src/test/kotlin/com/tencent/devops/process/pojo/AgentReuseMutexTest.kt +++ b/src/backend/ci/core/process/biz-base/src/test/kotlin/com/tencent/devops/process/pojo/AgentReuseMutexTest.kt @@ -47,7 +47,7 @@ class AgentReuseMutexTest { "job_id_dep_7" to initReuseEnv("job_env_1") ) ) - val tree = AgentReuseMutexTree(mutableListOf()) + val tree = AgentReuseMutexTree(1, mutableListOf()) stages.forEachIndexed { index, stage -> stage.forEach { (jobId, dsp) -> tree.addNode( @@ -184,7 +184,7 @@ class AgentReuseMutexTest { @Test fun checkDepTypeError() { - val tree = AgentReuseMutexTree(mutableListOf()) + val tree = AgentReuseMutexTree(1, mutableListOf()) val stages = mutableListOf>() stages.add( mapOf( @@ -229,7 +229,7 @@ class AgentReuseMutexTest { @Test fun checkDepCycleError() { - val tree = AgentReuseMutexTree(mutableListOf()) + val tree = AgentReuseMutexTree(1, mutableListOf()) val stages = mutableListOf>() stages.add( mapOf( diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildEndControl.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildEndControl.kt index 4ff06c9e929..d652f8e2265 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildEndControl.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildEndControl.kt @@ -49,6 +49,7 @@ import com.tencent.devops.common.pipeline.enums.BuildStatus import com.tencent.devops.common.pipeline.pojo.BuildNoType import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentDispatch import com.tencent.devops.common.pipeline.utils.BuildStatusSwitcher +import com.tencent.devops.common.redis.RedisLock import com.tencent.devops.common.redis.RedisLockByValue import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.service.prometheus.BkTimed @@ -120,7 +121,10 @@ class BuildEndControl @Autowired constructor( @BkTimed fun handle(event: PipelineBuildFinishEvent) { - val watcher = Watcher(id = "ENGINE|BuildEnd|${event.traceId}|${event.buildId}|Job#${event.status}") + val watcher = Watcher( + id = "ENGINE|BuildEnd|${event.projectId}|${event.pipelineId}|" + + "${event.traceId}|${event.buildId}|Job#${event.status}" + ) try { with(event) { val buildIdLock = BuildIdLock(redisOperation, buildId) @@ -136,16 +140,7 @@ class BuildEndControl @Autowired constructor( buildIdLock.unlock() } - val buildStartLock = PipelineBuildStartLock(redisOperation, pipelineId) - try { - watcher.start("PipelineBuildStartLock") - buildStartLock.lock() - watcher.start("popNextBuild") - popNextBuild(buildInfo) - watcher.stop() - } finally { - buildStartLock.unlock() - } + popNextBuild(watcher, buildInfo) } } finally { watcher.stop() @@ -195,7 +190,7 @@ class BuildEndControl @Autowired constructor( ) // 更新buildNo - val retryFlag = buildInfo.executeCount?.let { it > 1 } == true || buildInfo.retryFlag == true + val retryFlag = buildInfo.executeCount?.let { it > 1 } == true if (!retryFlag && !buildStatus.isCancel() && !buildStatus.isFailure()) { setBuildNoWhenBuildSuccess( projectId = projectId, pipelineId = pipelineId, buildId = buildId, debug = buildInfo.debug @@ -208,7 +203,7 @@ class BuildEndControl @Autowired constructor( if (model.stages.any { stage -> stage.containers.filterIsInstance().any { con -> con.dispatchType is ThirdPartyAgentDispatch && - (con.dispatchType as ThirdPartyAgentDispatch).agentType.isReuse() + (con.dispatchType as ThirdPartyAgentDispatch).agentType.isReuse() } }) { buildVariableService.fetchAgentReuseMutexVar( @@ -386,7 +381,8 @@ class BuildEndControl @Autowired constructor( if (errorInfoList.isNotEmpty()) buildInfo.errorInfoList = errorInfoList } - private fun PipelineBuildFinishEvent.popNextBuild(buildInfo: BuildInfo?) { + private fun PipelineBuildFinishEvent.popNextBuild(watcher: Watcher, buildInfo: BuildInfo?) { + watcher.start("clear_redis_restart") if (pipelineRedisService.getBuildRestartValue(this.buildId) != null) { // 删除buildId占用的refresh锁 pipelineRedisService.deleteRestartBuild(this.buildId) @@ -394,51 +390,55 @@ class BuildEndControl @Autowired constructor( if (buildInfo?.concurrencyGroup.isNullOrBlank()) { // 获取同流水线的下一个队首 - startNextBuild( - pipelineRuntimeExtService.popNextQueueBuildInfo( - projectId = projectId, - pipelineId = pipelineId - ) - ) + startNextBuild(watcher, PipelineBuildStartLock(redisOperation, pipelineId)) { + pipelineRuntimeExtService.popNextQueueBuildInfo(projectId = projectId, pipelineId = pipelineId) + } } else { // 获取同并发组的下一个队首 buildInfo?.concurrencyGroup?.let { group -> - ConcurrencyGroupLock(redisOperation, projectId, group).use { groupLock -> - groupLock.lock() - startNextBuild( - pipelineRuntimeExtService.popNextConcurrencyGroupQueueCanPend2Start(projectId, group) - ) + startNextBuild(watcher, ConcurrencyGroupLock(redisOperation, projectId, group)) { + pipelineRuntimeExtService.popNextConcurrencyGroupQueueCanPend2Start(projectId, group) } } } } - private fun PipelineBuildFinishEvent.startNextBuild(nextBuild: BuildInfo?) { - if (nextBuild == null) { - LOG.info("ENGINE|$buildId|$source|FETCH_QUEUE|$pipelineId no queue build!") - return - } + private fun PipelineBuildFinishEvent.startNextBuild(watcher: Watcher, sLock: RedisLock, pop: () -> BuildInfo?) { + sLock.use { + if (!sLock.tryLock()) { + // 寻找下一个构建时失败，通常是遇到并发锁正在被使用，所以新的构建依然会被选出运行，不需要依赖这里重试，可直接放弃返回 + LOG.info("tryLock ${sLock.javaClass.simpleName} fail and ignored") + return + } + watcher.start("startNextBuild") + val nextBuild = pop() + if (nextBuild == null) { + LOG.info("ENGINE|$buildId|$source|FETCH_QUEUE|$pipelineId no queue build!") + return + } - LOG.info("ENGINE|$buildId|$source|FETCH_QUEUE|next build: ${nextBuild.buildId} ${nextBuild.status}") - val model = pipelineBuildDetailService.getBuildModel(nextBuild.projectId, nextBuild.buildId) - ?: throw ErrorCodeException( - errorCode = ProcessMessageCode.ERROR_NO_BUILD_EXISTS_BY_ID, - params = arrayOf(nextBuild.buildId) - ) - val triggerContainer = model.stages[0].containers[0] as TriggerContainer - pipelineEventDispatcher.dispatch( - PipelineBuildStartEvent( - source = "build_finish_$buildId", - projectId = nextBuild.projectId, - pipelineId = nextBuild.pipelineId, - userId = nextBuild.startUser, - buildId = nextBuild.buildId, - taskId = nextBuild.firstTaskId, - status = nextBuild.status, - actionType = ActionType.START, - buildNoType = triggerContainer.buildNo?.buildNoType + LOG.info("ENGINE|$buildId|$source|FETCH_QUEUE|next build: ${nextBuild.buildId} ${nextBuild.status}") + val model = pipelineBuildDetailService.getBuildModel(nextBuild.projectId, nextBuild.buildId) + ?: throw ErrorCodeException( + errorCode = ProcessMessageCode.ERROR_NO_BUILD_EXISTS_BY_ID, + params = arrayOf(nextBuild.buildId) + ) + val triggerContainer = model.stages[0].containers[0] as TriggerContainer + pipelineEventDispatcher.dispatch( + PipelineBuildStartEvent( + source = "build_finish_$buildId", + projectId = nextBuild.projectId, + pipelineId = nextBuild.pipelineId, + userId = nextBuild.startUser, + buildId = nextBuild.buildId, + taskId = nextBuild.firstTaskId, + status = nextBuild.status, + actionType = ActionType.START, + executeCount = nextBuild.executeCount, + buildNoType = triggerContainer.buildNo?.buildNoType + ) ) - ) + } } // 设置流水线执行耗时 diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildMonitorControl.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildMonitorControl.kt index 2ecdfb49fe2..a67be6899f2 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildMonitorControl.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildMonitorControl.kt @@ -37,6 +37,7 @@ import com.tencent.devops.common.log.utils.BuildLogPrinter import com.tencent.devops.common.pipeline.container.TriggerContainer import com.tencent.devops.common.pipeline.enums.BuildStatus import com.tencent.devops.common.pipeline.pojo.StageReviewRequest +import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.constant.ProcessMessageCode.BK_JOB_QUEUE_TIMEOUT @@ -45,6 +46,7 @@ import com.tencent.devops.process.constant.ProcessMessageCode.ERROR_TIMEOUT_IN_B import com.tencent.devops.process.constant.ProcessMessageCode.ERROR_TIMEOUT_IN_RUNNING import com.tencent.devops.process.engine.common.Timeout import com.tencent.devops.process.engine.common.VMUtils +import com.tencent.devops.process.engine.control.lock.ConcurrencyGroupLock import com.tencent.devops.process.engine.pojo.BuildInfo import com.tencent.devops.process.engine.pojo.PipelineBuildContainer import com.tencent.devops.process.engine.pojo.PipelineBuildStage @@ -61,11 +63,11 @@ import com.tencent.devops.process.engine.service.PipelineSettingService import com.tencent.devops.process.engine.service.PipelineStageService import com.tencent.devops.process.pojo.StageQualityRequest import com.tencent.devops.quality.api.v2.pojo.ControlPointPosition -import java.time.LocalDateTime -import java.util.concurrent.TimeUnit import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service +import java.time.LocalDateTime +import java.util.concurrent.TimeUnit import kotlin.math.min /** @@ -83,7 +85,8 @@ class BuildMonitorControl @Autowired constructor( private val pipelineRuntimeExtService: PipelineRuntimeExtService, private val pipelineStageService: PipelineStageService, private val pipelineBuildDetailService: PipelineBuildDetailService, - private val pipelineRepositoryService: PipelineRepositoryService + private val pipelineRepositoryService: PipelineRepositoryService, + private val redisOperation: RedisOperation ) { companion object { @@ -465,9 +468,19 @@ class BuildMonitorControl @Autowired constructor( ) } else { // 判断当前监控的排队构建是否可以尝试启动(仅当前是在队列中排第1位的构建可以) - val canStart = pipelineRuntimeExtService.queueCanPend2Start( - projectId = event.projectId, pipelineId = event.pipelineId, buildId = buildInfo.buildId - ) + val canStart = if (buildInfo.concurrencyGroup.isNullOrBlank()) { // 旧版串行队列 + pipelineRuntimeExtService.queueCanPend2Start( + projectId = event.projectId, pipelineId = event.pipelineId, buildId = buildInfo.buildId + ) + } else { // concurrent并发组 + ConcurrencyGroupLock(redisOperation, buildInfo.projectId, buildInfo.concurrencyGroup!!).use { gLock -> + gLock.lock() + pipelineRuntimeExtService.popNextConcurrencyGroupQueueCanPend2Start( + concurrencyGroup = buildInfo.concurrencyGroup!!, + projectId = buildInfo.projectId, pipelineId = buildInfo.pipelineId, buildId = buildInfo.buildId + ) != null + } + } if (canStart) { val buildId = event.buildId LOG.info("ENGINE|$buildId|BUILD_QUEUE_TRY_START") @@ -487,6 +500,7 @@ class BuildMonitorControl @Autowired constructor( taskId = buildInfo.firstTaskId, status = BuildStatus.RUNNING, actionType = ActionType.START, + executeCount = buildInfo.executeCount, buildNoType = triggerContainer.buildNo?.buildNoType ) ) diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildStartControl.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildStartControl.kt index 71aa1f2f0b8..6a8bf6b22b1 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildStartControl.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildStartControl.kt @@ -49,6 +49,8 @@ import com.tencent.devops.common.pipeline.pojo.element.agent.CodeGitElement import com.tencent.devops.common.pipeline.pojo.element.agent.CodeGitlabElement import com.tencent.devops.common.pipeline.pojo.element.agent.CodeSvnElement import com.tencent.devops.common.pipeline.pojo.element.agent.GithubElement +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.time.BuildRecordTimeCost import com.tencent.devops.common.pipeline.pojo.time.BuildTimestampType import com.tencent.devops.common.pipeline.utils.RepositoryConfigUtils @@ -57,6 +59,7 @@ import com.tencent.devops.common.service.prometheus.BkTimed import com.tencent.devops.common.service.utils.LogUtils import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.process.bean.PipelineUrlBean +import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.constant.ProcessMessageCode.BK_START_USER import com.tencent.devops.process.constant.ProcessMessageCode.BK_TRIGGER_USER import com.tencent.devops.process.constant.ProcessMessageCode.BUILD_QUEUE_FOR_CONCURRENCY @@ -83,9 +86,6 @@ import com.tencent.devops.process.engine.service.record.PipelineBuildRecordServi import com.tencent.devops.process.engine.service.record.StageBuildRecordService import com.tencent.devops.process.engine.service.record.TaskBuildRecordService import com.tencent.devops.process.engine.utils.ContainerUtils -import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType -import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting -import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.service.BuildVariableService import com.tencent.devops.process.service.scm.ScmProxyService import com.tencent.devops.process.utils.BUILD_NO @@ -93,11 +93,11 @@ import com.tencent.devops.process.utils.PIPELINE_TIME_START import com.tencent.devops.process.utils.PipelineVarUtil import io.micrometer.core.instrument.Counter import io.micrometer.core.instrument.MeterRegistry -import java.time.LocalDateTime -import kotlin.math.max import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service +import java.time.LocalDateTime +import kotlin.math.max /** * 构建控制器 @@ -149,13 +149,12 @@ class BuildStartControl @Autowired constructor( } private fun PipelineBuildStartEvent.retry() { - LOG.info("ENGINE|$buildId|$source|RETRY_TO_LOCK") + LOG.info("ENGINE|$buildId|$source|$pipelineId|RETRY_TO_LOCK") this.delayMills = DEFAULT_DELAY pipelineEventDispatcher.dispatch(this) } fun PipelineBuildStartEvent.execute(watcher: Watcher) { - val executeCount = buildVariableService.getBuildExecuteCount(projectId, pipelineId, buildId) buildLogPrinter.addDebugLine( buildId = buildId, message = "Enter BuildStartControl", tag = TAG, containerHashId = JOB_ID, executeCount = executeCount, @@ -164,13 +163,13 @@ class BuildStartControl @Autowired constructor( ) watcher.start("pickUpReadyBuild") - val buildInfo = pickUpReadyBuild(executeCount = executeCount) ?: run { + val buildInfo = pickUpReadyBuild() ?: run { return } watcher.stop() watcher.start("buildModel") - buildModel(buildInfo = buildInfo, executeCount = executeCount) + buildModel(buildInfo = buildInfo) watcher.stop() buildLogPrinter.addDebugLine( @@ -184,13 +183,16 @@ class BuildStartControl @Autowired constructor( startPipelineCount() } - private fun PipelineBuildStartEvent.pickUpReadyBuild(executeCount: Int): BuildInfo? { + private fun PipelineBuildStartEvent.pickUpReadyBuild(): BuildInfo? { - val buildIdLock = BuildIdLock(redisOperation = redisOperation, buildId = buildId) - return try { - buildIdLock.lock() + BuildIdLock(redisOperation = redisOperation, buildId = buildId).use { buildIdLock -> + if (!buildIdLock.tryLock()) { + LOG.info("ENGINE|$buildId|$pipelineId|BuildIdLock try lock fail") + retry() + return null + } val buildInfo = pipelineRuntimeService.getBuildInfo(projectId, buildId) - if (buildInfo == null || buildInfo.status.isFinish() || buildInfo.status.isNeverRun()) { + return if (buildInfo == null || buildInfo.status.isFinish() || buildInfo.status.isNeverRun()) { buildLogPrinter.addLine( message = "Stop #${buildInfo?.buildNum} ${buildInfo?.status}", buildId = buildId, tag = TAG, containerHashId = JOB_ID, executeCount = executeCount, @@ -198,18 +200,16 @@ class BuildStartControl @Autowired constructor( ) LOG.info("ENGINE|$buildId][$source|BUILD_START_DONE|status=${buildInfo?.status}") null - } else if (tryToStartRunBuild(buildInfo, executeCount = executeCount)) { + } else if (tryToStartRunBuild(buildInfo)) { buildInfo } else { null } - } finally { - buildIdLock.unlock() } } @Suppress("LongMethod", "NestedBlockDepth") - private fun PipelineBuildStartEvent.tryToStartRunBuild(buildInfo: BuildInfo, executeCount: Int): Boolean { + private fun PipelineBuildStartEvent.tryToStartRunBuild(buildInfo: BuildInfo): Boolean { LOG.info("ENGINE|$buildId|$source|BUILD_START|${buildInfo.status}") var canStart = true // 已经是启动状态的，直接返回 @@ -267,13 +267,7 @@ class BuildStartControl @Autowired constructor( debug = buildInfo.debug ) ) - broadcastStartEvent(buildInfo, executeCount) - } else { - pipelineRuntimeService.updateExecuteCount( - projectId = projectId, - buildId = buildId, - executeCount = executeCount - ) + broadcastStartEvent(buildInfo) } } finally { pipelineBuildLock.unlock() @@ -289,7 +283,10 @@ class BuildStartControl @Autowired constructor( var checkStart = true val concurrencyGroup = buildInfo.concurrencyGroup ?: pipelineId ConcurrencyGroupLock(redisOperation, projectId, concurrencyGroup).use { groupLock -> - groupLock.lock() + if (!groupLock.tryLock()) { + LOG.info("ENGINE｜$source|$buildId|$projectId|$pipelineId|$concurrencyGroup try lock fail") + return false // 拿不到锁返回，下一次再重试 + } if (buildInfo.status != BuildStatus.QUEUE_CACHE) { // 只有最新进来排队的构建才能QUEUE -> QUEUE_CACHE checkStart = pipelineRuntimeExtService.popNextConcurrencyGroupQueueCanPend2Start( @@ -425,7 +422,7 @@ class BuildStartControl @Autowired constructor( * 注：重试不会执行 */ private fun PipelineBuildStartEvent.handleBuildNo(buildInfo: BuildInfo) { - val retryFlag = buildInfo.executeCount?.let { it > 1 } == true || buildInfo.retryFlag == true + val retryFlag = buildInfo.executeCount?.let { it > 1 } == true if (retryFlag || buildNoType != BuildNoType.SUCCESS_BUILD_INCREMENT) { // 重试不重新写 return } @@ -472,7 +469,7 @@ class BuildStartControl @Autowired constructor( } } - private fun PipelineBuildStartEvent.broadcastStartEvent(buildInfo: BuildInfo, executeCount: Int) { + private fun PipelineBuildStartEvent.broadcastStartEvent(buildInfo: BuildInfo) { pipelineEventDispatcher.dispatch( // 广播构建即将启动消息给订阅者 PipelineBuildStartBroadCastEvent( @@ -586,10 +583,10 @@ class BuildStartControl @Autowired constructor( messageCode = BK_TRIGGER_USER, language = I18nUtil.getDefaultLocaleLanguage() ) + ": ${buildInfo.triggerUser}, " + - I18nUtil.getCodeLanMessage( - messageCode = BK_START_USER, - language = I18nUtil.getDefaultLocaleLanguage() - ) + ": ${buildInfo.startUser}", + I18nUtil.getCodeLanMessage( + messageCode = BK_START_USER, + language = I18nUtil.getDefaultLocaleLanguage() + ) + ": ${buildInfo.startUser}", buildId = buildInfo.buildId, tag = TAG, containerHashId = JOB_ID, executeCount = executeCount, jobId = null, stepId = TAG ) @@ -619,7 +616,7 @@ class BuildStartControl @Autowired constructor( } var callScm = true container.elements.forEach nextElement@{ ele -> - if (!ele.isElementEnable()) { + if (!ele.elementEnabled()) { return@nextElement } if (!ele.status.isNullOrBlank()) { @@ -721,7 +718,7 @@ class BuildStartControl @Autowired constructor( } } - private fun PipelineBuildStartEvent.buildModel(buildInfo: BuildInfo, executeCount: Int) { + private fun PipelineBuildStartEvent.buildModel(buildInfo: BuildInfo) { val model = buildDetailService.getBuildModel(projectId, buildId) ?: run { pipelineEventDispatcher.dispatch( PipelineBuildCancelEvent( diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/MutexControl.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/MutexControl.kt index a7248f3ca27..12f7cfc1f1d 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/MutexControl.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/MutexControl.kt @@ -54,6 +54,7 @@ import com.tencent.devops.process.constant.ProcessMessageCode.BK_RELEASE_LOCK import com.tencent.devops.process.engine.common.Timeout import com.tencent.devops.process.engine.common.VMUtils import com.tencent.devops.process.engine.pojo.PipelineBuildContainer +import com.tencent.devops.process.engine.service.EngineConfigService import com.tencent.devops.process.engine.service.PipelineContainerService import com.tencent.devops.process.engine.service.record.ContainerBuildRecordService import com.tencent.devops.process.utils.PipelineVarUtil @@ -70,13 +71,13 @@ class MutexControl @Autowired constructor( private val redisOperation: RedisOperation, private val pipelineUrlBean: PipelineUrlBean, private val containerBuildRecordService: ContainerBuildRecordService, - private val pipelineContainerService: PipelineContainerService + private val pipelineContainerService: PipelineContainerService, + private val engineConfigService: EngineConfigService ) { companion object { private const val DELIMITERS = "_" const val SECOND_TO_PRINT = 19 - const val MUTEX_MAX_QUEUE = 10 private val LOG = LoggerFactory.getLogger(MutexControl::class.java) private fun getMutexContainerId(buildId: String, containerId: String) = "${buildId}$DELIMITERS$containerId" private fun getBuildIdAndContainerId(mutexId: String): List = mutexId.split(DELIMITERS) @@ -106,7 +107,7 @@ class MutexControl @Autowired constructor( // 超时时间限制，0表示排队不等待直接超时 val timeOut = parseTimeoutVar(mutexGroup.timeout, mutexGroup.timeoutVar, variables) // 排队任务数量限制，0表示不排队 - val queue = mutexGroup.queue.coerceAtLeast(0).coerceAtMost(MUTEX_MAX_QUEUE) + val queue = mutexGroup.queue.coerceAtLeast(0).coerceAtMost(engineConfigService.getMutexMaxQueue()) // 替换环境变量 val mutexLockedGroup = if (!mutexGroup.mutexGroupName.isNullOrBlank()) { EnvUtils.parseEnv(mutexGroup.mutexGroupName, variables) diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/StageControl.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/StageControl.kt index ab212cfb68f..e68e4456530 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/StageControl.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/StageControl.kt @@ -130,10 +130,6 @@ class StageControl @Autowired constructor( return // 不再往下运行 } } - if (actionType.isEnd()) { - LOG.warn("ENGINE|$buildId|$source|END_STAGE|$stageId|${buildInfo.status}") - return - } } val variables = buildVariableService.getAllVariable(projectId, pipelineId, buildId) diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/AgentReuseMutexCmd.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/AgentReuseMutexCmd.kt index 5bb078cb0b7..5722b45fccd 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/AgentReuseMutexCmd.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/AgentReuseMutexCmd.kt @@ -23,6 +23,7 @@ import com.tencent.devops.process.engine.control.command.CmdFlowState import com.tencent.devops.process.engine.control.command.container.ContainerCmd import com.tencent.devops.process.engine.control.command.container.ContainerContext import com.tencent.devops.process.engine.pojo.PipelineBuildContainer +import com.tencent.devops.process.engine.service.EngineConfigService import com.tencent.devops.process.engine.service.record.ContainerBuildRecordService import com.tencent.devops.process.service.BuildVariableService import org.slf4j.LoggerFactory @@ -38,12 +39,13 @@ class AgentReuseMutexCmd @Autowired constructor( private val buildLogPrinter: BuildLogPrinter, private val containerBuildRecordService: ContainerBuildRecordService, private val pipelineUrlBean: PipelineUrlBean, - private val buildVariableService: BuildVariableService + private val buildVariableService: BuildVariableService, + private val engineConfigService: EngineConfigService ) : ContainerCmd { override fun canExecute(commandContext: ContainerContext): Boolean { return commandContext.cmdFlowState == CmdFlowState.CONTINUE && - !commandContext.buildStatus.isFinish() && - commandContext.container.controlOption.agentReuseMutex != null + !commandContext.buildStatus.isFinish() && + commandContext.container.controlOption.agentReuseMutex != null } override fun execute(commandContext: ContainerContext) { @@ -57,22 +59,15 @@ class AgentReuseMutexCmd @Autowired constructor( * 互斥情况存在三种 * 1、依赖某个AgentId，直接往下执行即可 * 2、Root节点，即没有复用节点的节点，根据类型先拿取锁 - * 3、Reuse节点，但没有复用节点，可能是因为和复用节点同级，或存在和复用节点先后顺序不明确的， - * 这种先拿取复用的JobId看有没有，没有就按root节点的逻辑走 + * 3、Reuse节点，但没有复用节点，可能是因为和复用节点同级，或存在和复用节点先后顺序不明确的，就按root节点的逻辑走 */ private fun doExecute(commandContext: ContainerContext) { var mutex = commandContext.container.controlOption.agentReuseMutex!! + // 复用的不用参与锁逻辑 if (!mutex.type.needEngineLock()) { commandContext.cmdFlowState = CmdFlowState.CONTINUE return } - // 如果有依赖Job且不是依赖类型的可以先拿一下上下文看看有没有已经写入了，如果写入了可以直接跳过 - if (mutex.reUseJobId != null && - commandContext.variables.containsKey(AgentReuseMutex.genAgentContextKey(mutex.reUseJobId!!)) - ) { - commandContext.cmdFlowState = CmdFlowState.CONTINUE - return - } // 极端情况上下文没有写入，且agentId还是空，理论上不会有，逻辑上出现了就失败 if (mutex.agentOrEnvId.isNullOrBlank()) { return agentIdNullError(commandContext, mutex, null) @@ -83,7 +78,7 @@ class AgentReuseMutexCmd @Autowired constructor( AgentReuseMutexType.AGENT_ID, AgentReuseMutexType.AGENT_NAME -> { acquireMutex(commandContext, mutex) } - + // 环境的因为无法确定节点不参与锁 else -> { commandContext.cmdFlowState = CmdFlowState.CONTINUE } @@ -102,7 +97,7 @@ class AgentReuseMutexCmd @Autowired constructor( // 超时时间限制，0表示排队不等待直接超时 val timeOut = MutexControl.parseTimeoutVar(mutex.timeout, mutex.timeoutVar, variables) // 排队任务数量限制，0表示不排队 - val queue = mutex.queue.coerceAtLeast(0).coerceAtMost(MutexControl.MUTEX_MAX_QUEUE) + val queue = mutex.queue.coerceAtLeast(0).coerceAtMost(engineConfigService.getMutexMaxQueue()) // 替换环境变量 var runtimeAgentOrEnvId = if (!mutex.agentOrEnvId.isNullOrBlank()) { EnvUtils.parseEnv(mutex.agentOrEnvId, variables) @@ -158,13 +153,15 @@ class AgentReuseMutexCmd @Autowired constructor( commandContext.cmdFlowState = CmdFlowState.LOOP // 循环消息命令 延时10秒钟 } - ContainerMutexStatus.FIRST_LOG -> { // 增加可视化的互斥状态打印 + ContainerMutexStatus.FIRST_LOG -> { // 增加可视化的互斥状态打印，注：这里进行了Job状态流转！ commandContext.latestSummary = "agent_reuse_mutex_print" commandContext.cmdFlowState = CmdFlowState.LOOP } - else -> { // 正常运行 - commandContext.cmdFlowState = CmdFlowState.CONTINUE // 检查通过，继续向下执行 + // 正常运行 + else -> { + // 检查通过，继续向下执行 + commandContext.cmdFlowState = CmdFlowState.CONTINUE } } } else if (commandContext.container.status.isFinish()) { // 对于存在重放的结束消息做闭环 @@ -172,7 +169,7 @@ class AgentReuseMutexCmd @Autowired constructor( LOG.info( "AGENT_REUSE|ENGINE|${event.buildId}|${event.source}|status=${commandContext.container.status}" + - "|concurrent_container_event" + "|concurrent_container_event" ) releaseContainerMutex( @@ -197,7 +194,8 @@ class AgentReuseMutexCmd @Autowired constructor( buildId = container.buildId, varName = AgentReuseMutex.genAgentContextKey(mutex.reUseJobId ?: mutex.jobId), varValue = mutex.runtimeAgentOrEnvId!!, - readOnly = true + readOnly = true, + rewriteReadOnly = true ) val res = tryAgentLockOrQueue(container, mutex) @@ -307,7 +305,7 @@ class AgentReuseMutexCmd @Autowired constructor( containerVar = emptyMap(), buildStatus = null, timestamps = mapOf( BuildTimestampType.JOB_AGENT_REUSE_MUTEX_QUEUE to - BuildRecordTimeStamp(null, LocalDateTime.now().timestampmilli()) + BuildRecordTimeStamp(null, LocalDateTime.now().timestampmilli()) ) ) } @@ -344,9 +342,9 @@ class AgentReuseMutexCmd @Autowired constructor( // 排队等待时间为0的时候，立即超时, 退出队列，并失败, 没有就继续在队列中,timeOut时间为分钟 if (mutex.timeout == 0 || timeDiff > TimeUnit.MINUTES.toSeconds(mutex.timeout.toLong())) { val desc = "${ - if (mutex.timeoutVar.isNullOrBlank()) { - "[${mutex.timeout} minutes]" - } else " timeoutVar[${mutex.timeoutVar}] setup to [${mutex.timeout} minutes]" + if (mutex.timeoutVar.isNullOrBlank()) { + "[${mutex.timeout} minutes]" + } else " timeoutVar[${mutex.timeoutVar}] setup to [${mutex.timeout} minutes]" } " logAgentMutex( container, mutex, lockedBuildId, @@ -440,7 +438,7 @@ class AgentReuseMutexCmd @Autowired constructor( containerVar = emptyMap(), buildStatus = null, timestamps = mapOf( BuildTimestampType.JOB_MUTEX_QUEUE to - BuildRecordTimeStamp(LocalDateTime.now().timestampmilli(), null) + BuildRecordTimeStamp(LocalDateTime.now().timestampmilli(), null) ) ) } @@ -511,10 +509,10 @@ class AgentReuseMutexCmd @Autowired constructor( messageCode = ProcessMessageCode.BK_LOCKED, language = I18nUtil.getDefaultLocaleLanguage() ) + ": $linkTip" + - I18nUtil.getCodeLanMessage( - messageCode = ProcessMessageCode.BK_CLICK, - language = I18nUtil.getDefaultLocaleLanguage() - ) + " | $msg" + I18nUtil.getCodeLanMessage( + messageCode = ProcessMessageCode.BK_CLICK, + language = I18nUtil.getDefaultLocaleLanguage() + ) + " | $msg" } else { I18nUtil.getCodeLanMessage( messageCode = ProcessMessageCode.BK_CURRENT, diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckConditionalSkipContainerCmd.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckConditionalSkipContainerCmd.kt index 54cc09b8d66..6498e74c26b 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckConditionalSkipContainerCmd.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckConditionalSkipContainerCmd.kt @@ -108,6 +108,9 @@ class CheckConditionalSkipContainerCmd constructor( val jobControlOption = containerControlOption.jobControlOption val conditions = jobControlOption.customVariables ?: emptyList() + // #10751 如果设置了job不可用，则直接跳过，无需判断后续的条件 + if (!jobControlOption.enable) return true + val message = StringBuilder() val needSkip = if (containerControlOption.inFinallyStage) { skipFinallyStageJob(jobControlOption, containerContext.event.previousStageStatus, message) diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckMutexContainerCmd.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckMutexContainerCmd.kt index 944cf71a2d9..6099a47fc63 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckMutexContainerCmd.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/CheckMutexContainerCmd.kt @@ -94,7 +94,7 @@ class CheckMutexContainerCmd( commandContext.cmdFlowState = CmdFlowState.LOOP // 循环消息命令 延时10秒钟 } - ContainerMutexStatus.FIRST_LOG -> { // #5454 增加可视化的互斥状态打印 + ContainerMutexStatus.FIRST_LOG -> { // #5454 增加可视化的互斥状态打印，注：这里进行了Job状态流转！ commandContext.latestSummary = "mutex_print" commandContext.cmdFlowState = CmdFlowState.LOOP } diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/ContainerCmdLoop.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/ContainerCmdLoop.kt index 4dbc5e2132e..ecdc00716cc 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/ContainerCmdLoop.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/ContainerCmdLoop.kt @@ -57,7 +57,9 @@ class ContainerCmdLoop( commandContext.event.copy(delayMills = DEFAULT_LOOP_TIME_MILLS, source = commandContext.latestSummary) ) // #5454 增加可视化的互斥状态打印 - if (commandContext.latestSummary == "mutex_print") { + if (commandContext.latestSummary == "mutex_print" || + commandContext.latestSummary == "agent_reuse_mutex_print" + ) { commandContext.cmdFlowState = CmdFlowState.FINALLY } } diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/StartActionTaskContainerCmd.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/StartActionTaskContainerCmd.kt index 36e512a7b52..1eaf8cd6257 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/StartActionTaskContainerCmd.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/StartActionTaskContainerCmd.kt @@ -291,25 +291,32 @@ class StartActionTaskContainerCmd( containerContext.event.actionType.isTerminate() -> { // 终止命令，需要设置失败，并返回 containerContext.buildStatus = BuildStatus.RUNNING toDoTask = currentTask // 将当前任务传给TaskControl做终止 - buildLogPrinter.addRedLine( - buildId = toDoTask.buildId, - message = "Terminate Plugin[${toDoTask.taskName}]: ${containerContext.event.reason ?: "unknown"}", - tag = toDoTask.taskId, - containerHashId = toDoTask.containerHashId, - executeCount = toDoTask.executeCount ?: 1, - jobId = null, - stepId = toDoTask.stepId - ) + val message = "Terminate Plugin[${currentTask.taskName}]: ${containerContext.event.reason ?: "unknown"}" + printRedLine(currentTask, message) } containerContext.event.actionType.isEnd() -> { // 将当前正在运行的任务传给TaskControl做结束 containerContext.buildStatus = BuildStatus.RUNNING toDoTask = currentTask + val message = "Cancel Plugin[${currentTask.taskName}]: ${containerContext.event.reason ?: "unknown"}" + printRedLine(currentTask, message) } } return toDoTask } + private fun printRedLine(task: PipelineBuildTask, message: String) { + buildLogPrinter.addRedLine( + buildId = task.buildId, + message = message, + tag = task.taskId, + containerHashId = task.containerHashId, + executeCount = task.executeCount ?: 1, + jobId = null, + stepId = task.stepId + ) + } + @Suppress("LongMethod", "ComplexMethod") private fun PipelineBuildTask.findNeedToRunTask( index: Int, diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/CheckPauseReviewStageCmd.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/CheckPauseReviewStageCmd.kt index 16b77a5af9e..dc4fcb29cb9 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/CheckPauseReviewStageCmd.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/CheckPauseReviewStageCmd.kt @@ -64,7 +64,9 @@ class CheckPauseReviewStageCmd( val event = commandContext.event // 处于等待中，遇到停止/取消等行为直接结束，因为本Stage还未进入 - if (event.actionType.isEnd() && commandContext.buildStatus.isPause()) { + if (event.actionType.isEnd() && + (commandContext.buildStatus.isPause() || commandContext.buildStatus.isReadyToRun()) + ) { commandContext.buildStatus = BuildStatus.CANCELED commandContext.cmdFlowState = CmdFlowState.FINALLY LOG.info("ENGINE|${event.buildId}|${event.source}|STAGE_CANCEL|${event.stageId}") diff --git a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt index 94508b2803a..8e9959ced81 100644 --- a/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt +++ b/src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt @@ -47,7 +47,6 @@ import com.tencent.devops.process.engine.pojo.event.PipelineBuildStageEvent import com.tencent.devops.process.engine.service.PipelineContainerService import com.tencent.devops.process.engine.service.PipelineRuntimeService import com.tencent.devops.process.engine.service.PipelineStageService -import com.tencent.devops.process.engine.service.detail.StageBuildDetailService import com.tencent.devops.process.engine.service.record.StageBuildRecordService import java.time.LocalDateTime import org.slf4j.LoggerFactory @@ -62,7 +61,6 @@ class UpdateStateForStageCmdFinally( private val pipelineStageService: PipelineStageService, private val pipelineRuntimeService: PipelineRuntimeService, private val pipelineContainerService: PipelineContainerService, - private val stageBuildDetailService: StageBuildDetailService, private val stageBuildRecordService: StageBuildRecordService, private val pipelineEventDispatcher: PipelineEventDispatcher, private val buildLogPrinter: BuildLogPrinter, @@ -155,7 +153,23 @@ class UpdateStateForStageCmdFinally( return finishBuild(commandContext = commandContext) } - event.actionType = ActionType.START // final 需要执行 + if (nextStage.controlOption?.finally == true) { + val pendingStages = pipelineStageService.getPendingStages(event.projectId, event.buildId) + .filter { it.stageId != nextStage.stageId } + pendingStages.forEach { pendingStage -> + pendingStage.status = BuildStatus.UNEXEC + stageBuildRecordService.updateStageStatus( + projectId = pendingStage.projectId, + pipelineId = pendingStage.pipelineId, + buildId = pendingStage.buildId, + stageId = pendingStage.stageId, + executeCount = pendingStage.executeCount, + buildStatus = BuildStatus.UNEXEC + ) + } + pipelineStageService.batchUpdate(transactionContext = null, stageList = pendingStages) + event.actionType = ActionType.START // final 需要执行 + } } else { nextStage = pipelineStageService.getNextStage( projectId = event.projectId, diff --git a/src/backend/ci/core/process/biz-engine/src/test/kotlin/com/tencent/devops/process/engine/control/MutexControlTest.kt b/src/backend/ci/core/process/biz-engine/src/test/kotlin/com/tencent/devops/process/engine/control/MutexControlTest.kt index 63944831312..0c9997e5670 100644 --- a/src/backend/ci/core/process/biz-engine/src/test/kotlin/com/tencent/devops/process/engine/control/MutexControlTest.kt +++ b/src/backend/ci/core/process/biz-engine/src/test/kotlin/com/tencent/devops/process/engine/control/MutexControlTest.kt @@ -35,6 +35,8 @@ import com.tencent.devops.common.pipeline.option.JobControlOption import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.process.engine.pojo.PipelineBuildContainer import com.tencent.devops.process.engine.pojo.PipelineBuildContainerControlOption +import com.tencent.devops.process.engine.service.EngineConfigService +import io.mockk.every import io.mockk.mockk import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Disabled @@ -74,17 +76,20 @@ class MutexControlTest { matrixGroupId = null, matrixGroupFlag = false ) + private val engineConfigMock = mockk() private val mutexControl: MutexControl = MutexControl( buildLogPrinter = buildLogPrinter, redisOperation = redisOperation, containerBuildRecordService = mockk(), pipelineUrlBean = mockk(), - pipelineContainerService = mockk() + pipelineContainerService = mockk(), + engineConfigService = engineConfigMock ) @Test // 测试MutexControl的初始化功能 fun initMutexGroup() { + every { engineConfigMock.getMutexMaxQueue() } returns 10 val initMutexGroup = mutexControl.decorateMutexGroup( mutexGroup = mutexGroup, variables = variables diff --git a/src/backend/ci/core/process/biz-process/build.gradle.kts b/src/backend/ci/core/process/biz-process/build.gradle.kts index 45cf913341c..69b2c00ded8 100644 --- a/src/backend/ci/core/process/biz-process/build.gradle.kts +++ b/src/backend/ci/core/process/biz-process/build.gradle.kts @@ -31,7 +31,6 @@ dependencies { api(project(":core:common:common-client")) api(project(":core:common:common-redis")) api(project(":core:common:common-archive")) - api(project(":core:common:common-auth:common-auth-api")) api(project(":core:common:common-websocket")) api(project(":core:store:api-store")) api(project(":core:dispatch:api-dispatch")) diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt index 70f6091c997..048277d3c73 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt @@ -385,7 +385,10 @@ class ServiceBuildResourceImpl @Autowired constructor( buildMsg: String?, startUser: List?, archiveFlag: Boolean?, - customVersion: Int? + customVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): Result> { checkUserId(userId) checkParam(projectId, pipelineId) @@ -419,7 +422,10 @@ class ServiceBuildResourceImpl @Autowired constructor( startUser = startUser?.filter { it.isNotBlank() }, updateTimeDesc = updateTimeDesc, archiveFlag = archiveFlag, - customVersion = customVersion + customVersion = customVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) return Result(result) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineAuthorizationResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineAuthorizationResourceImpl.kt new file mode 100644 index 00000000000..c2febd5e438 --- /dev/null +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineAuthorizationResourceImpl.kt @@ -0,0 +1,27 @@ +package com.tencent.devops.process.api + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.web.RestResource +import com.tencent.devops.process.api.service.ServicePipelineAuthorizationResource +import com.tencent.devops.process.permission.PipelineAuthorizationService + +@RestResource +class ServicePipelineAuthorizationResourceImpl constructor( + private val pipelineAuthorizationService: PipelineAuthorizationService +) : ServicePipelineAuthorizationResource { + override fun resetPipelineAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List + ): Result>> { + return Result( + pipelineAuthorizationService.resetPipelineAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs + ) + ) + } +} diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineVersionResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineVersionResourceImpl.kt index f8969f37f08..a328b4b778b 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineVersionResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServicePipelineVersionResourceImpl.kt @@ -162,7 +162,7 @@ class ServicePipelineVersionResourceImpl @Autowired constructor( AuthPermission.CREATE ) return Result( - pipelineVersionFacadeService.createPipelineFromTemplate( + pipelineVersionFacadeService.createPipelineFromFreedom( userId = userId, projectId = projectId, request = request diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserBuildResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserBuildResourceImpl.kt index b3f5d17faeb..9dc46ce5841 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserBuildResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserBuildResourceImpl.kt @@ -42,6 +42,7 @@ import com.tencent.devops.common.pipeline.pojo.element.Element import com.tencent.devops.common.web.RestResource import com.tencent.devops.process.api.user.UserBuildResource import com.tencent.devops.process.engine.service.PipelineProgressRateService +import com.tencent.devops.process.enums.HistorySearchType import com.tencent.devops.process.pojo.BuildHistory import com.tencent.devops.process.pojo.BuildHistoryRemark import com.tencent.devops.process.pojo.BuildId @@ -450,7 +451,10 @@ class UserBuildResourceImpl @Autowired constructor( buildNoEnd: Int?, buildMsg: String?, archiveFlag: Boolean?, - customVersion: Int? + customVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): Result> { checkParam(userId, projectId, pipelineId) val result = pipelineBuildFacadeService.getHistoryBuild( @@ -479,7 +483,10 @@ class UserBuildResourceImpl @Autowired constructor( buildNoEnd = buildNoEnd, buildMsg = buildMsg, archiveFlag = archiveFlag, - customVersion = customVersion + customVersion = customVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) if (archiveFlag != true) { pipelineRecentUseService.record(userId, projectId, pipelineId) @@ -527,12 +534,21 @@ class UserBuildResourceImpl @Autowired constructor( userId: String, projectId: String, pipelineId: String, - debugVersion: Int? + debugVersion: Int?, + search: String?, + type: HistorySearchType? ): Result> { checkParam(userId, projectId, pipelineId) - return Result(pipelineBuildFacadeService.getHistoryConditionRepo( - userId, projectId, pipelineId, debugVersion - )) + return Result( + pipelineBuildFacadeService.getHistoryConditionRepo( + userId = userId, + projectId = projectId, + pipelineId = pipelineId, + debugVersion = debugVersion, + search = search, + type = type + ) + ) } override fun getHistoryConditionBranch( @@ -540,7 +556,9 @@ class UserBuildResourceImpl @Autowired constructor( projectId: String, pipelineId: String, alias: List?, - debugVersion: Int? + debugVersion: Int?, + search: String?, + type: HistorySearchType? ): Result> { checkParam(userId, projectId, pipelineId) return Result( @@ -549,7 +567,9 @@ class UserBuildResourceImpl @Autowired constructor( projectId = projectId, pipelineId = pipelineId, alias = alias, - debugVersion = debugVersion + debugVersion = debugVersion, + search = search, + type = type ) ) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPipelineVersionResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPipelineVersionResourceImpl.kt index 102958aee00..da28ce80ca8 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPipelineVersionResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPipelineVersionResourceImpl.kt @@ -162,7 +162,7 @@ class UserPipelineVersionResourceImpl @Autowired constructor( AuthPermission.CREATE ) return Result( - pipelineVersionFacadeService.createPipelineFromTemplate( + pipelineVersionFacadeService.createPipelineFromFreedom( userId = userId, projectId = projectId, request = request diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt index 4bde9b93f38..eb870ce755c 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt @@ -198,7 +198,10 @@ class AppPipelineBuildResourceImpl @Autowired constructor( buildNoStart: Int?, buildNoEnd: Int?, buildMsg: String?, - customVersion: Int? + customVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): Result> { checkParam(userId, projectId, pipelineId, pageSize) val result = pipelineBuildFacadeService.getHistoryBuild( @@ -226,7 +229,10 @@ class AppPipelineBuildResourceImpl @Autowired constructor( buildNoStart = buildNoStart, buildNoEnd = buildNoEnd, buildMsg = buildMsg, - customVersion = customVersion + customVersion = customVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) return Result(result) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt index 29bebc7e8ab..39a2eec2f88 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt @@ -111,7 +111,9 @@ class BuildSubPipelineResourceImpl @Autowired constructor( projectId: String, pipelineId: String, includeConst: Boolean?, - includeNotRequired: Boolean? + includeNotRequired: Boolean?, + parentProjectId: String, + parentPipelineId: String ): Result> { checkParam(userId) return subPipeService.subPipelineManualStartupInfo( @@ -119,7 +121,9 @@ class BuildSubPipelineResourceImpl @Autowired constructor( projectId = projectId, pipelineId = pipelineId, includeConst = includeConst, - includeNotRequired = includeNotRequired + includeNotRequired = includeNotRequired, + parentPipelineId = parentPipelineId, + parentProjectId = parentProjectId ) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResourceImpl.kt index 3f47a797617..9bbbc3cdc30 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/external/ExternalScmResourceImpl.kt @@ -58,18 +58,25 @@ class ExternalScmResourceImpl @Autowired constructor( override fun webHookCodeGitCommit( event: String, secret: String?, + sourceType: String?, traceId: String, body: String - ): Result = Result( - CodeWebhookEventDispatcher.dispatchEvent( - rabbitTemplate = rabbitTemplate, - event = GitWebhookEvent( - requestContent = body, - event = event, - secret = secret + ): Result { + // 工蜂的测试请求,应该忽略 + if (sourceType == "Test") { + return Result(true) + } + return Result( + CodeWebhookEventDispatcher.dispatchEvent( + rabbitTemplate = rabbitTemplate, + event = GitWebhookEvent( + requestContent = body, + event = event, + secret = secret + ) ) ) - ) + } override fun webHookGitlabCommit(event: String) = Result(CodeWebhookEventDispatcher.dispatchEvent(rabbitTemplate, GitlabWebhookEvent(requestContent = event))) diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/BluekingNotifySendCmd.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/BluekingNotifySendCmd.kt index 2ad4584dba1..1922a05db8a 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/BluekingNotifySendCmd.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/BluekingNotifySendCmd.kt @@ -3,6 +3,8 @@ package com.tencent.devops.process.notify.command.impl import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.api.util.EnvUtils import com.tencent.devops.common.client.Client +import com.tencent.devops.common.notify.utils.NotifyUtils +import com.tencent.devops.common.pipeline.pojo.setting.PipelineSubscriptionType import com.tencent.devops.process.notify.command.BuildNotifyContext import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -31,8 +33,14 @@ class BluekingNotifySendCmd @Autowired constructor( val successContent = EnvUtils.parseEnv( successSubscription.content, commandContext.variables, replaceWithEmpty ) + val group = EnvUtils.parseEnv( + command = successSubscription.wechatGroup, + data = commandContext.variables, + replaceWithEmpty = true + ) commandContext.notifyValue["successContent"] = successContent commandContext.notifyValue["emailSuccessContent"] = successContent + commandContext.notifyValue[NotifyUtils.WEWORK_GROUP_KEY] = group val receivers = successSubscription.users.split(",").map { EnvUtils.parseEnv( command = it, @@ -43,10 +51,24 @@ class BluekingNotifySendCmd @Autowired constructor( sendNotifyByTemplate( templateCode = getNotifyTemplateCode(shutdownType, successSubscription.detailFlag), receivers = receivers, - notifyType = successSubscription.types.map { it.name }.toMutableSet(), + notifyType = successSubscription.types.filter { + it != PipelineSubscriptionType.WEWORK_GROUP + }.map { it.name }.toMutableSet(), titleParams = commandContext.notifyValue, - bodyParams = commandContext.notifyValue + bodyParams = commandContext.notifyValue, + markdownContent = false ) + // 企业微信通知组的模板和企业微信通知用的是同一个模板,但是企业微信通知没有markdown选项,所以需要单独发送 + if (successSubscription.types.contains(PipelineSubscriptionType.WEWORK_GROUP)) { + sendNotifyByTemplate( + templateCode = getNotifyTemplateCode(shutdownType, successSubscription.detailFlag), + receivers = receivers, + notifyType = setOf(PipelineSubscriptionType.WEWORK_GROUP.name), + titleParams = commandContext.notifyValue, + bodyParams = commandContext.notifyValue, + markdownContent = successSubscription.wechatGroupMarkdownFlag + ) + } } } buildStatus.isFailure() -> { @@ -55,8 +77,14 @@ class BluekingNotifySendCmd @Autowired constructor( val failContent = EnvUtils.parseEnv( failSubscription.content, commandContext.variables, replaceWithEmpty ) + val group = EnvUtils.parseEnv( + command = failSubscription.wechatGroup, + data = commandContext.variables, + replaceWithEmpty = true + ) commandContext.notifyValue["failContent"] = failContent commandContext.notifyValue["emailFailContent"] = failContent + commandContext.notifyValue[NotifyUtils.WEWORK_GROUP_KEY] = group val receivers = failSubscription.users.split(",").map { EnvUtils.parseEnv( command = it, @@ -67,10 +95,24 @@ class BluekingNotifySendCmd @Autowired constructor( sendNotifyByTemplate( templateCode = getNotifyTemplateCode(shutdownType, failSubscription.detailFlag), receivers = receivers, - notifyType = failSubscription.types.map { it.name }.toMutableSet(), + notifyType = failSubscription.types.filter { + it != PipelineSubscriptionType.WEWORK_GROUP + }.map { it.name }.toMutableSet(), titleParams = commandContext.notifyValue, - bodyParams = commandContext.notifyValue + bodyParams = commandContext.notifyValue, + markdownContent = false ) + // 企业微信通知组的模板和企业微信通知用的是同一个模板,但是企业微信通知没有markdown选项,所以需要单独发送 + if (failSubscription.types.contains(PipelineSubscriptionType.WEWORK_GROUP)) { + sendNotifyByTemplate( + templateCode = getNotifyTemplateCode(shutdownType, failSubscription.detailFlag), + receivers = receivers, + notifyType = setOf(PipelineSubscriptionType.WEWORK_GROUP.name), + titleParams = commandContext.notifyValue, + bodyParams = commandContext.notifyValue, + markdownContent = failSubscription.wechatGroupMarkdownFlag + ) + } } } else -> Result(0) diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/NotifySendCmd.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/NotifySendCmd.kt index 64047f69846..9327e214319 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/NotifySendCmd.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/notify/command/impl/NotifySendCmd.kt @@ -13,7 +13,8 @@ abstract class NotifySendCmd(val client: Client) : NotifyCmd { receivers: Set, notifyType: Set, titleParams: Map, - bodyParams: Map + bodyParams: Map, + markdownContent: Boolean ) { client.get(ServiceNotifyMessageTemplateResource::class).sendNotifyMessageByTemplate( SendNotifyMessageTemplateRequest( @@ -23,7 +24,8 @@ abstract class NotifySendCmd(val client: Client) : NotifyCmd { titleParams = titleParams, bodyParams = bodyParams, cc = null, - bcc = null + bcc = null, + markdownContent = markdownContent ) ) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/permission/PipelineAuthorizationService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/permission/PipelineAuthorizationService.kt new file mode 100644 index 00000000000..46047d86eee --- /dev/null +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/permission/PipelineAuthorizationService.kt @@ -0,0 +1,102 @@ +package com.tencent.devops.process.permission + +import com.tencent.devops.common.api.util.MessageUtil +import com.tencent.devops.common.auth.api.AuthAuthorizationApi +import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverResult +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.web.utils.I18nUtil +import com.tencent.devops.process.constant.ProcessMessageCode +import com.tencent.devops.process.service.SubPipelineRepositoryService +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Service + +@Service +class PipelineAuthorizationService constructor( + val pipelinePermissionService: PipelinePermissionService, + val authAuthorizationApi: AuthAuthorizationApi, + val subPipelineRepositoryService: SubPipelineRepositoryService +) { + fun addResourceAuthorization( + projectId: String, + resourceAuthorizationList: List + ) { + authAuthorizationApi.addResourceAuthorization( + projectId = projectId, + resourceAuthorizationList = resourceAuthorizationList + ) + } + + fun resetPipelineAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List + ): Map> { + logger.info("reset pipeline authorization|$preCheck|$projectId|$resourceAuthorizationHandoverDTOs") + return authAuthorizationApi.resetResourceAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs, + handoverResourceAuthorization = ::handoverPipelineAuthorization + ) + } + + private fun handoverPipelineAuthorization( + preCheck: Boolean, + resourceAuthorizationHandoverDTO: ResourceAuthorizationHandoverDTO + ): ResourceAuthorizationHandoverResult { + return with(resourceAuthorizationHandoverDTO) { + val hasHandoverToPermission = pipelinePermissionService.checkPipelinePermission( + userId = handoverTo!!, + projectId = projectCode, + pipelineId = resourceCode, + permission = AuthPermission.EXECUTE + ) + val checkSubPipelinePermission = subPipelineRepositoryService.checkSubPipelinePermission( + projectId = projectCode, + pipelineId = resourceCode, + userId = handoverTo!!, + permission = AuthPermission.EXECUTE + ) + // 1.当前流水线的执行权限 + // 2.有子流水线的执行权限 + when { + hasHandoverToPermission && checkSubPipelinePermission.isEmpty() -> { + ResourceAuthorizationHandoverResult(ResourceAuthorizationHandoverStatus.SUCCESS) + } + + checkSubPipelinePermission.isNotEmpty() -> { + val failTitle = I18nUtil.getCodeLanMessage( + messageCode = ProcessMessageCode.BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_RESET_ERROR_TITLE, + params = arrayOf(handoverTo!!) + ) + val failMsg = checkSubPipelinePermission.map { + it.errorMessage + }.toSet().joinToString(FAIL_MESSAGE_SEPARATOR) + ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.FAILED, + message = "$failTitle$FAIL_MESSAGE_SEPARATOR$failMsg" + ) + } + + else -> { + ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.FAILED, + message = MessageUtil.getMessageByLocale( + messageCode = ProcessMessageCode.USER_NEED_PIPELINE_X_PERMISSION, + params = arrayOf(AuthPermission.EXECUTE.getI18n(I18nUtil.getLanguage(handoverTo))), + language = I18nUtil.getLanguage(handoverTo) + ) + ) + } + } + } + } + + companion object { + private val logger = LoggerFactory.getLogger(PipelineAuthorizationService::class.java) + const val FAIL_MESSAGE_SEPARATOR = "
" + } +} diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/configuration/TriggerConfiguration.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/configuration/TriggerConfiguration.kt index 6173a496941..77280da86b0 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/configuration/TriggerConfiguration.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/configuration/TriggerConfiguration.kt @@ -33,6 +33,7 @@ import com.tencent.devops.common.event.dispatcher.pipeline.mq.MQ import com.tencent.devops.common.event.dispatcher.pipeline.mq.MQEventDispatcher import com.tencent.devops.common.event.dispatcher.pipeline.mq.Tools import com.tencent.devops.common.redis.RedisOperation +import com.tencent.devops.process.engine.service.PipelineRepositoryService import com.tencent.devops.process.plugin.trigger.service.PipelineTimerService import com.tencent.devops.process.plugin.trigger.timer.SchedulerManager import com.tencent.devops.process.plugin.trigger.timer.listener.PipelineTimerBuildListener @@ -73,14 +74,16 @@ class TriggerConfiguration { schedulerManager: SchedulerManager, pipelineTimerService: PipelineTimerService, redisOperation: RedisOperation, - client: Client + client: Client, + pipelineRepositoryService: PipelineRepositoryService ): PipelineJobBean { return PipelineJobBean( pipelineEventDispatcher = pipelineEventDispatcher, schedulerManager = schedulerManager, pipelineTimerService = pipelineTimerService, redisOperation = redisOperation, - client = client + client = client, + pipelineRepositoryService = pipelineRepositoryService ) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt index a635c201e57..6132eb1a8a4 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt @@ -73,6 +73,7 @@ class TimerTriggerElementBizPlugin constructor( contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ) = ElementCheckResult(true) @@ -89,13 +90,13 @@ class TimerTriggerElementBizPlugin constructor( ) { val crontabExpressions = mutableSetOf() val params = (container as TriggerContainer).params.associate { it.id to it.defaultValue.toString() } - logger.info("[$pipelineId]|$userId| Timer trigger [${element.name}] enable=${element.isElementEnable()}") + logger.info("[$pipelineId]|$userId| Timer trigger [${element.name}] enable=${element.elementEnabled()}") /* 在模板实例化时,有的流水线需要开启定时任务,有的流水线不需要开启,支持通过流水线变量控制定时任务的开启 通过参数禁用定时任务,在流水线参数上配置BK_CI_TIMER_DISABLE,禁用定时触发器插件 */ val isParamDisable = params[PIPELINE_TIMER_DISABLE]?.toBoolean() ?: false - if (element.isElementEnable() && !isParamDisable) { + if (element.elementEnabled() && !isParamDisable) { val eConvertExpressions = element.convertExpressions(params = params) if (eConvertExpressions.isEmpty()) { diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/timer/quartz/PipelineQuartzService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/timer/quartz/PipelineQuartzService.kt index af712134149..5b60edf35e2 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/timer/quartz/PipelineQuartzService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/timer/quartz/PipelineQuartzService.kt @@ -34,6 +34,7 @@ import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.service.utils.LogUtils import com.tencent.devops.common.service.utils.SpringContextUtil import com.tencent.devops.common.web.utils.BkApiUtil +import com.tencent.devops.process.engine.service.PipelineRepositoryService import com.tencent.devops.process.plugin.trigger.lock.PipelineTimerTriggerLock import com.tencent.devops.process.plugin.trigger.pojo.event.PipelineTimerBuildEvent import com.tencent.devops.process.plugin.trigger.service.PipelineTimerService @@ -137,7 +138,8 @@ class PipelineJobBean( private val schedulerManager: SchedulerManager, private val pipelineTimerService: PipelineTimerService, private val redisOperation: RedisOperation, - private val client: Client + private val client: Client, + private val pipelineRepositoryService: PipelineRepositoryService ) { private val logger = LoggerFactory.getLogger(javaClass)!! @@ -197,8 +199,14 @@ class PipelineJobBean( watcher.start("dispatch") pipelineEventDispatcher.dispatch( PipelineTimerBuildEvent( - source = "timer_trigger", projectId = pipelineTimer.projectId, pipelineId = pipelineId, - userId = pipelineTimer.startUser, channelCode = pipelineTimer.channelCode + source = "timer_trigger", + projectId = pipelineTimer.projectId, + pipelineId = pipelineId, + userId = pipelineRepositoryService.getPipelineOauthUser( + projectId = projectId, + pipelineId = pipelineId + ) ?: pipelineTimer.startUser, + channelCode = pipelineTimer.channelCode ) ) } catch (ignored: Exception) { diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/AuthPipelineService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/AuthPipelineService.kt index d46101b9b57..84b1a67a40f 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/AuthPipelineService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/AuthPipelineService.kt @@ -29,14 +29,19 @@ package com.tencent.devops.process.service import com.tencent.bk.sdk.iam.constants.CallbackMethodEnum import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO +import com.tencent.bk.sdk.iam.dto.callback.response.BaseDataResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO +import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.auth.api.AuthTokenApi +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse import com.tencent.devops.common.auth.callback.FetchInstanceInfo import com.tencent.devops.common.auth.callback.ListInstanceInfo +import com.tencent.devops.common.auth.callback.ListResourcesAuthorizationDTO import com.tencent.devops.common.auth.callback.SearchInstanceInfo +import com.tencent.devops.common.pipeline.enums.ChannelCode import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -54,9 +59,9 @@ class AuthPipelineService @Autowired constructor( val method = callBackInfo.method val page = callBackInfo.page val projectId = callBackInfo.filter.parent?.id ?: "" // FETCH_INSTANCE_INFO场景下iam不会传parentId - when (method) { + return when (method) { CallbackMethodEnum.LIST_INSTANCE -> { - return getPipeline( + getPipeline( projectId = projectId, offset = page.offset.toInt(), limit = page.limit.toInt(), @@ -67,11 +72,11 @@ class AuthPipelineService @Autowired constructor( CallbackMethodEnum.FETCH_INSTANCE_INFO -> { val ids = callBackInfo.filter.idList.map { it.toString() } - return getPipelineInfo(ids, token, returnPipelineId!!) + getPipelineInfo(ids, token, returnPipelineId!!) } CallbackMethodEnum.SEARCH_INSTANCE -> { - return searchPipeline( + searchPipeline( projectId = projectId, keyword = callBackInfo.filter.keyword, limit = page.limit.toInt(), @@ -80,8 +85,15 @@ class AuthPipelineService @Autowired constructor( returnPipelineId = returnPipelineId!! ) } - - else -> return null + CallbackMethodEnum.LIST_RESOURCE_AUTHORIZATION -> { + getPipelineAuthorization( + projectId = projectId, + limit = page.limit.toInt(), + offset = page.offset.toInt(), + token = token + ) + } + else -> null } } @@ -121,6 +133,43 @@ class AuthPipelineService @Autowired constructor( return result.buildSearchInstanceResult(entityInfo, pipelineInfos.count) } + private fun getPipelineAuthorization( + projectId: String, + offset: Int, + limit: Int, + token: String + ): ListResourcesAuthorizationDTO { + authTokenApi.checkToken(token) + val pipelineInfos = pipelineListFacadeService.getPipelinePage( + projectId = projectId, + channelCode = ChannelCode.BS, + limit = limit, + offset = offset + ) + val data = BaseDataResponseDTO() + val result = ListResourcesAuthorizationDTO(data) + if (pipelineInfos.records.isEmpty()) { + logger.info("$projectId There is no assembly line under the project") + return result.buildResourcesAuthorizationListResult() + } + val entityInfos = mutableListOf() + pipelineInfos.records.map { + val entity = ResourceAuthorizationResponse( + projectCode = projectId, + resourceType = AuthResourceType.PIPELINE_DEFAULT.value, + resourceName = it.pipelineName, + resourceCode = it.pipelineId, + handoverTime = it.updateTime, + handoverFrom = it.lastModifyUser + ) + entityInfos.add(entity) + } + logger.info("entityInfo $entityInfos, count ${pipelineInfos.count}") + data.result = entityInfos + data.count = pipelineInfos.count + return result.buildResourcesAuthorizationListResult() + } + private fun getPipeline( projectId: String, offset: Int, diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineInfoFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineInfoFacadeService.kt index bd54ef03be2..aec7794641d 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineInfoFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineInfoFacadeService.kt @@ -43,11 +43,14 @@ import com.tencent.devops.common.api.pojo.PipelineAsCodeSettings import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.common.api.util.Watcher +import com.tencent.devops.common.api.util.timestampmilli import com.tencent.devops.common.audit.ActionAuditContent import com.tencent.devops.common.auth.api.ActionId import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.auth.api.ResourceTypeId import com.tencent.devops.common.auth.api.pojo.BkAuthGroup +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO import com.tencent.devops.common.client.Client import com.tencent.devops.common.pipeline.Model import com.tencent.devops.common.pipeline.ModelUpdate @@ -83,6 +86,7 @@ import com.tencent.devops.process.engine.utils.PipelineUtils import com.tencent.devops.process.enums.OperationLogType import com.tencent.devops.process.jmx.api.ProcessJmxApi import com.tencent.devops.process.jmx.pipeline.PipelineBean +import com.tencent.devops.process.permission.PipelineAuthorizationService import com.tencent.devops.process.permission.PipelinePermissionService import com.tencent.devops.process.pojo.PipelineCopy import com.tencent.devops.process.pojo.classify.PipelineViewBulkAdd @@ -111,6 +115,7 @@ import java.util.concurrent.TimeUnit import javax.ws.rs.core.MediaType import javax.ws.rs.core.Response import javax.ws.rs.core.StreamingOutput +import java.time.LocalDateTime @Suppress("ALL") @Service @@ -132,7 +137,8 @@ class PipelineInfoFacadeService @Autowired constructor( private val pipelineInfoDao: PipelineInfoDao, private val transferService: PipelineTransferYamlService, private val yamlFacadeService: PipelineYamlFacadeService, - private val operationLogService: PipelineOperationLogService + private val operationLogService: PipelineOperationLogService, + private val pipelineAuthorizationService: PipelineAuthorizationService ) { @Value("\${process.deletedPipelineStoreDays:30}") @@ -206,7 +212,7 @@ class PipelineInfoFacadeService @Autowired constructor( exportStringToFile(targetVersion.yaml ?: "", "${settingInfo.pipelineName}$suffix") } else { val suffix = PipelineStorageType.MODEL.fileSuffix - exportStringToFile(JsonUtil.toJson(modelAndSetting), "${settingInfo.pipelineName}$suffix") + exportStringToFile(JsonUtil.toSortJson(modelAndSetting), "${settingInfo.pipelineName}$suffix") } } @@ -430,6 +436,7 @@ class PipelineInfoFacadeService @Autowired constructor( channelCode = channelCode, create = true, useSubscriptionSettings = useSubscriptionSettings, + useLabelSettings = useLabelSettings, useConcurrencyGroup = useConcurrencyGroup, versionStatus = versionStatus, branchName = branchName, @@ -483,6 +490,19 @@ class PipelineInfoFacadeService @Autowired constructor( pipelineId = pipelineId, pipelineName = model.name ) + pipelineAuthorizationService.addResourceAuthorization( + projectId = projectId, + resourceAuthorizationList = listOf( + ResourceAuthorizationDTO( + projectCode = projectId, + resourceType = AuthResourceType.PIPELINE_DEFAULT.value, + resourceCode = pipelineId, + resourceName = model.name, + handoverFrom = userId, + handoverTime = LocalDateTime.now().timestampmilli() + ) + ) + ) } catch (ignored: Throwable) { if (fixPipelineId != pipelineId) { throw ignored @@ -694,7 +714,11 @@ class PipelineInfoFacadeService @Autowired constructor( userId = userId, projectId = projectId, pipelineId = pipelineId, - version = branchVersion.version, + targetVersion = branchVersion.copy( + model = getFixedModel( + branchVersion.model, projectId, pipelineId, userId, pipelineInfo + ) + ), ignoreBase = true, transactionContext = transactionContext ) @@ -814,6 +838,19 @@ class PipelineInfoFacadeService @Autowired constructor( pipelineId = pipelineId, pipelineName = resource.model.name ) + pipelineAuthorizationService.addResourceAuthorization( + projectId = projectId, + resourceAuthorizationList = listOf( + ResourceAuthorizationDTO( + projectCode = projectId, + resourceType = AuthResourceType.PIPELINE_DEFAULT.value, + resourceCode = pipelineId, + resourceName = resource.model.name, + handoverFrom = userId, + handoverTime = LocalDateTime.now().timestampmilli() + ) + ) + ) ActionAuditContext.current().setInstanceName(resource.model.name) return DeployPipelineResult( pipelineId = pipelineId, diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineListFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineListFacadeService.kt index 43f68d98e1d..e00bfae4d21 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineListFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineListFacadeService.kt @@ -1676,7 +1676,12 @@ class PipelineListFacadeService @Autowired constructor( ) } - fun getPipelinePage(projectId: String, limit: Int?, offset: Int?): PipelineViewPipelinePage { + fun getPipelinePage( + projectId: String, + limit: Int?, + offset: Int?, + channelCode: ChannelCode? = null + ): PipelineViewPipelinePage { logger.info("getPipeline |$projectId| $limit| $offset") val limitNotNull = limit ?: 10 val offsetNotNull = offset ?: 0 @@ -1684,6 +1689,7 @@ class PipelineListFacadeService @Autowired constructor( pipelineInfoDao.listPipelineInfoByProject( dslContext = dslContext, projectId = projectId, + channelCode = channelCode, limit = limitNotNull, offset = offsetNotNull ) diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineRemoteAuthService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineRemoteAuthService.kt index 786e87ab445..28fcec0717a 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineRemoteAuthService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineRemoteAuthService.kt @@ -108,7 +108,14 @@ class PipelineRemoteAuthService @Autowired constructor( I18nUtil.getCodeLanMessage(ERROR_NO_MATCHING_PIPELINE) ) } - var userId = pipelineReportService.getPipelineInfo(pipeline.projectId, pipeline.pipelineId)?.lastModifyUser + // 获取授权人 + var userId = pipelineReportService.getPipelineOauthUser( + pipelineId = pipeline.pipelineId, + projectId = pipeline.projectId + ) ?: pipelineReportService.getPipelineInfo( + projectId = pipeline.projectId, + pipelineId = pipeline.pipelineId + )?.lastModifyUser if (userId.isNullOrBlank()) { logger.info("Fail to get the userId of the pipeline, use ${pipeline.createUser}") diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt index 2296458a292..801f2aa9539 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt @@ -78,11 +78,11 @@ import com.tencent.devops.process.template.service.TemplateService import com.tencent.devops.process.utils.PipelineVersionUtils import com.tencent.devops.process.yaml.PipelineYamlFacadeService import com.tencent.devops.process.yaml.transfer.PipelineTransferException -import javax.ws.rs.core.Response import org.jooq.DSLContext import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service +import javax.ws.rs.core.Response @Suppress("ALL") @Service @@ -196,6 +196,7 @@ class PipelineVersionFacadeService @Autowired constructor( hasCollect = detailInfo.hasCollect, instanceFromTemplate = detailInfo.instanceFromTemplate, templateId = detailInfo.templateId, + templateVersion = detailInfo.templateVersion, canManualStartup = detailInfo.canManualStartup, canDebug = canDebug, canRelease = canRelease, @@ -507,13 +508,16 @@ class PipelineVersionFacadeService @Autowired constructor( } } - fun createPipelineFromTemplate( + /** + * 从自由模式下创建流水线 + */ + fun createPipelineFromFreedom( userId: String, projectId: String, request: TemplateInstanceCreateRequest ): DeployPipelineResult { - val (templateModel, instanceFromTemplate) = if (request.emptyTemplate == true) { - val model = Model( + val templateModel = if (request.emptyTemplate == true) { + Model( name = request.pipelineName, desc = "", stages = listOf( @@ -539,15 +543,13 @@ class PipelineVersionFacadeService @Autowired constructor( ), pipelineCreator = userId ) - Pair(model, true) } else { - val template = templateFacadeService.getTemplate( + templateFacadeService.getTemplate( userId = userId, projectId = projectId, templateId = request.templateId, version = request.templateVersion - ) - Pair(template.template, true) + ).template } return pipelineInfoFacadeService.createPipeline( userId = userId, @@ -555,8 +557,7 @@ class PipelineVersionFacadeService @Autowired constructor( model = templateModel.copy( name = request.pipelineName, templateId = request.templateId, - instanceFromTemplate = instanceFromTemplate, - labels = request.labels, + instanceFromTemplate = false, staticViews = request.staticViews ), channelCode = ChannelCode.BS, @@ -897,11 +898,30 @@ class PipelineVersionFacadeService @Autowired constructor( pipelineId: String, version: Int ): PipelineVersionSimple { + val pipelineInfo = pipelineRepositoryService.getPipelineInfo(projectId, pipelineId) + ?: throw ErrorCodeException( + statusCode = Response.Status.NOT_FOUND.statusCode, + errorCode = ProcessMessageCode.ERROR_PIPELINE_NOT_EXISTS + ) + // 获取目标的版本用于更新草稿 + val targetVersion = pipelineRepositoryService.getPipelineResourceVersion( + projectId = projectId, + pipelineId = pipelineId, + version = version + ) ?: throw ErrorCodeException( + statusCode = Response.Status.NOT_FOUND.statusCode, + errorCode = ProcessMessageCode.ERROR_NO_PIPELINE_VERSION_EXISTS_BY_ID, + params = arrayOf(version.toString()) + ) val resource = pipelineRepositoryService.rollbackDraftFromVersion( userId = userId, projectId = projectId, pipelineId = pipelineId, - version = version + targetVersion = targetVersion.copy( + model = pipelineInfoFacadeService.getFixedModel( + targetVersion.model, projectId, pipelineId, userId, pipelineInfo + ) + ) ) return PipelineVersionSimple( pipelineId = pipelineId, diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineElementBizPluginService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineElementBizPluginService.kt index 085ff0dbf4d..77dfd7c99ae 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineElementBizPluginService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineElementBizPluginService.kt @@ -32,17 +32,9 @@ import com.tencent.devops.common.pipeline.container.Container import com.tencent.devops.common.pipeline.container.Stage import com.tencent.devops.common.pipeline.enums.ChannelCode import com.tencent.devops.common.pipeline.pojo.element.Element -import com.tencent.devops.common.pipeline.pojo.element.SubPipelineCallElement import com.tencent.devops.common.pipeline.pojo.element.atom.BeforeDeleteParam import com.tencent.devops.common.pipeline.pojo.element.atom.ElementCheckResult -import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildAtomElement -import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildLessAtomElement -import com.tencent.devops.common.web.utils.I18nUtil -import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.engine.atom.plugin.IElementBizPluginService -import com.tencent.devops.process.permission.PipelinePermissionService -import com.tencent.devops.process.pojo.pipeline.SubPipelineRef -import com.tencent.devops.process.service.pipeline.SubPipelineRefService import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -52,19 +44,15 @@ import org.springframework.stereotype.Service */ @Service class SubPipelineElementBizPluginService @Autowired constructor( - private val pipelinePermissionService: PipelinePermissionService, - private val subPipelineRefService: SubPipelineRefService + private val subPipelineRepositoryService: SubPipelineRepositoryService ) : IElementBizPluginService { companion object { - private const val SUB_PIPELINE_EXEC_ATOM_CODE = "SubPipelineExec" private val logger = LoggerFactory.getLogger(SubPipelineElementBizPluginService::class.java) } override fun supportElement(element: Element): Boolean { - return element is SubPipelineCallElement || - (element is MarketBuildAtomElement && element.getAtomCode() == SUB_PIPELINE_EXEC_ATOM_CODE) || - (element is MarketBuildLessAtomElement && element.getAtomCode() == SUB_PIPELINE_EXEC_ATOM_CODE) + return subPipelineRepositoryService.supportElement(element) } override fun afterCreate( @@ -98,105 +86,24 @@ class SubPipelineElementBizPluginService @Autowired constructor( contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ): ElementCheckResult { - if (projectId.isNullOrBlank()) return ElementCheckResult(true) - - val (subProjectId, subPipelineId, subPipelineName) = subPipelineRefService.getSubPipelineInfo( - element = element, - projectId = projectId, - contextMap = contextMap - ) ?: return ElementCheckResult(true) - val subPipelineRef = SubPipelineRef( + logger.info( + "check the sub-pipeline permissions when deploying pipeline|projectId:$projectId|" + + "element:${element.id}|contextMap:$contextMap|appearedCnt:$appearedCnt|isTemplate:$isTemplate|" + + "oauthUser:$oauthUser|userId:$userId" + ) + // 模板保存时不需要校验子流水线权限 + if (isTemplate || projectId.isNullOrBlank()) return ElementCheckResult(true) + return subPipelineRepositoryService.checkElementPermission( projectId = projectId, - pipelineId = pipelineId, - pipelineName = "", - subProjectId = subProjectId, - subPipelineId = subPipelineId, - subPipelineName = subPipelineName, - taskId = element.id ?: "", - containerName = container.name, stageName = stage.name ?: "", - taskName = element.name ?: "", - channel = ChannelCode.BS.name, - userId = userId, - elementEnable = enableElement(stage, container, element), - isTemplate = isTemplate - ) - logger.info("start check sub pipeline element|$subPipelineRef") - return subPipelineRef.check( - listOf( - this::checkPermission, - this::checkCircularDependency - ) - ) - } - - fun SubPipelineRef.check( - list: List<(SubPipelineRef) -> ElementCheckResult> - ): ElementCheckResult { - list.forEach { - val invoke = it.invoke(this) - if (!invoke.result) { - return invoke - } - } - return ElementCheckResult(true) - } - - fun checkPermission(subPipelineRef: SubPipelineRef): ElementCheckResult { - with(subPipelineRef) { - // 模板保存时不需要校验子流水线权限 - if (isTemplate) return ElementCheckResult(true) - logger.info( - "check the sub-pipeline permissions when deploying pipeline|" + - "project:$projectId|elementId:$taskId|userId:$userId|" + - "subProjectId:$subProjectId|subPipelineId:$subPipelineId" - ) - // 校验流水线修改人是否有子流水线执行权限 - val checkPermission = pipelinePermissionService.checkPipelinePermission( - userId = userId, - projectId = subProjectId, - pipelineId = subPipelineId, - permission = AuthPermission.EXECUTE - ) - val pipelinePermissionUrl = - "/console/pipeline/$subProjectId/$subPipelineId/history" - return if (checkPermission) { - ElementCheckResult(true) - } else { - ElementCheckResult( - result = false, - errorTitle = I18nUtil.getCodeLanMessage( - messageCode = ProcessMessageCode.BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_ERROR_TITLE, - params = arrayOf(userId) - ), - errorMessage = I18nUtil.getCodeLanMessage( - messageCode = ProcessMessageCode.BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_ERROR_MESSAGE, - params = arrayOf( - stageName, containerName, taskName, pipelinePermissionUrl, subPipelineName - ) - ) - ) - } - } - } - - fun checkCircularDependency(subPipelineRef: SubPipelineRef): ElementCheckResult { - with(subPipelineRef) { - if (!elementEnable) return ElementCheckResult(true) - val startTime = System.currentTimeMillis() - val rootPipelineKey = "${projectId}_$pipelineId" - val checkResult = subPipelineRefService.checkCircularDependency( - subPipelineRef = this, - rootPipelineKey = rootPipelineKey, - existsPipeline = HashMap(mapOf(rootPipelineKey to this)) - ) - logger.info("finish check circular dependency|${System.currentTimeMillis() - startTime} ms") - return checkResult - } + containerName = container.name, + element = element, + contextMap = contextMap, + permission = AuthPermission.EXECUTE, + userId = oauthUser ?: userId + ) ?: ElementCheckResult(true) } - - private fun enableElement(stage: Stage, container: Container, element: Element) = - stage.isStageEnable() && container.isContainerEnable() && element.isElementEnable() } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineRepositoryService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineRepositoryService.kt new file mode 100644 index 00000000000..faf07365aad --- /dev/null +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineRepositoryService.kt @@ -0,0 +1,309 @@ +package com.tencent.devops.process.service + +import com.fasterxml.jackson.databind.ObjectMapper +import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.api.util.EnvUtils +import com.tencent.devops.common.auth.api.AuthPermission +import com.tencent.devops.common.pipeline.Model +import com.tencent.devops.common.pipeline.container.Stage +import com.tencent.devops.common.pipeline.pojo.element.Element +import com.tencent.devops.common.pipeline.pojo.element.SubPipelineCallElement +import com.tencent.devops.common.pipeline.pojo.element.atom.ElementCheckResult +import com.tencent.devops.common.pipeline.pojo.element.atom.SubPipelineType +import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildAtomElement +import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildLessAtomElement +import com.tencent.devops.common.web.utils.I18nUtil +import com.tencent.devops.process.constant.ProcessMessageCode +import com.tencent.devops.process.engine.dao.PipelineResourceDao +import com.tencent.devops.process.engine.extend.DefaultModelCheckPlugin +import com.tencent.devops.process.engine.service.PipelineRepositoryService +import com.tencent.devops.process.permission.PipelinePermissionService +import com.tencent.devops.process.utils.PipelineVarUtil +import org.jooq.DSLContext +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service +import java.util.regex.Pattern +import javax.ws.rs.core.Response + +@Service +class SubPipelineRepositoryService @Autowired constructor( + private val dslContext: DSLContext, + private val objectMapper: ObjectMapper, + private val pipelineResDao: PipelineResourceDao, + private val pipelineRepositoryService: PipelineRepositoryService, + private val defaultModelCheckPlugin: DefaultModelCheckPlugin, + private val pipelinePermissionService: PipelinePermissionService +) { + + /** + * 检查当前流水线下所有子流水线插件的权限 + * @param projectId 项目id + * @param pipelineId 流水线id + * @param userId 目标用户id + * @param permission 目标权限 + */ + @SuppressWarnings("NestedBlockDepth") + fun checkSubPipelinePermission( + projectId: String, + pipelineId: String, + userId: String, + permission: AuthPermission + ): List { + val model = getModel(projectId, pipelineId) ?: throw ErrorCodeException( + statusCode = Response.Status.NOT_FOUND.statusCode, + errorCode = ProcessMessageCode.ERROR_PIPELINE_MODEL_NOT_EXISTS + ) + val checkResults = mutableListOf() + val stages = model.stages + val contextMap = getContextMap(stages) + stages.subList(1, stages.size).forEach { stage -> + stage.containers.forEach { container -> + container.elements.forEach { element -> + if (supportElement(element)) { + checkElementPermission( + projectId = projectId, + stageName = stage.name ?: "", + containerName = container.name, + element = element, + contextMap = contextMap, + userId = userId, + permission = permission + )?.let { + checkResults.add(it) + } + } + } + } + } + return checkResults + } + + /** + * 检查用户是否有插件的目标流水线的指定权限 + * @param userId 目标用户 + * @param permission 目标权限 + */ + @SuppressWarnings("LongParameterList", "LongMethod") + fun checkElementPermission( + projectId: String, + stageName: String, + containerName: String, + element: Element, + contextMap: Map, + userId: String, + permission: AuthPermission + ): ElementCheckResult? { + val subPipelineInfo = getSubPipelineInfo( + projectId = projectId, + element = element, + contextMap = contextMap + ) + if (subPipelineInfo == null) { + return null + } + val (subProjectId, subPipelineId, subPipelineName) = subPipelineInfo + logger.info( + "check the sub-pipeline permissions[${permission.name}]|" + + "project:$projectId|elementId:${element.id}|userId:$userId|" + + "subProjectId:$subProjectId|subPipelineId:$subPipelineId" + ) + // 校验流水线修改人是否有子流水线执行权限 + val checkPermission = pipelinePermissionService.checkPipelinePermission( + userId = userId, + projectId = subProjectId, + pipelineId = subPipelineId, + permission = permission + ) + val pipelinePermissionUrl = "/console/pipeline/$subProjectId/$subPipelineId/history" + return if (checkPermission) { + null + } else { + ElementCheckResult( + result = false, + errorTitle = I18nUtil.getCodeLanMessage( + messageCode = ProcessMessageCode.BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_ERROR_TITLE, + params = arrayOf(userId) + ), + errorMessage = I18nUtil.getCodeLanMessage( + messageCode = ProcessMessageCode.BK_NOT_SUB_PIPELINE_EXECUTE_PERMISSION_ERROR_MESSAGE, + params = arrayOf( + stageName, + containerName, + element.name, + pipelinePermissionUrl, + subPipelineName + ) + ) + ) + } + } + + fun supportElement(element: Element) = element is SubPipelineCallElement || + (element is MarketBuildAtomElement && element.getAtomCode() == SUB_PIPELINE_EXEC_ATOM_CODE) || + (element is MarketBuildLessAtomElement && element.getAtomCode() == SUB_PIPELINE_EXEC_ATOM_CODE) + + fun getSubPipelineInfo( + projectId: String, + element: Element, + contextMap: Map + ) = when (element) { + is SubPipelineCallElement -> { + resolveSubPipelineCall( + projectId = projectId, + element = element, + contextMap = contextMap + ) + } + + is MarketBuildAtomElement -> { + resolveSubPipelineExec( + projectId = projectId, + inputMap = element.data["input"] as Map, + contextMap = contextMap + ) + } + + is MarketBuildLessAtomElement -> { + resolveSubPipelineExec( + projectId = projectId, + inputMap = element.data["input"] as Map, + contextMap = contextMap + ) + } + + else -> null + } + + private fun resolveSubPipelineCall( + projectId: String, + element: SubPipelineCallElement, + contextMap: Map + ): Triple? { + val subPipelineType = element.subPipelineType ?: SubPipelineType.ID + val subPipelineId = element.subPipelineId + val subPipelineName = element.subPipelineName + return getSubPipelineInfo( + projectId = projectId, + subProjectId = projectId, + subPipelineType = subPipelineType, + subPipelineId = subPipelineId, + subPipelineName = subPipelineName, + contextMap = contextMap + ) + } + + private fun resolveSubPipelineExec( + projectId: String, + inputMap: Map, + contextMap: Map + ): Triple? { + val subProjectId = inputMap.getOrDefault("projectId", projectId).toString() + val subPipelineTypeStr = inputMap.getOrDefault("subPipelineType", "ID") + val subPipelineName = inputMap["subPipelineName"]?.toString() + val subPipelineId = inputMap["subPip"]?.toString() + val subPipelineType = when (subPipelineTypeStr) { + "ID" -> SubPipelineType.ID + "NAME" -> SubPipelineType.NAME + else -> return null + } + return getSubPipelineInfo( + projectId = projectId, + subProjectId = subProjectId, + subPipelineType = subPipelineType, + subPipelineId = subPipelineId, + subPipelineName = subPipelineName, + contextMap = contextMap + ) + } + + @SuppressWarnings("LongParameterList") + private fun getSubPipelineInfo( + projectId: String, + subProjectId: String, + subPipelineType: SubPipelineType, + subPipelineId: String?, + subPipelineName: String?, + contextMap: Map + ): Triple? { + return when (subPipelineType) { + SubPipelineType.ID -> { + if (subPipelineId.isNullOrBlank()) { + return null + } + val pipelineInfo = pipelineRepositoryService.getPipelineInfo( + projectId = subProjectId, pipelineId = subPipelineId + ) ?: run { + logger.info( + "sub-pipeline not found|projectId:$projectId|subPipelineType:$subPipelineType|" + + "subProjectId:$subProjectId|subPipelineId:$subPipelineId" + ) + return null + } + Triple(subProjectId, subPipelineId, pipelineInfo.pipelineName) + } + + SubPipelineType.NAME -> { + if (subPipelineName.isNullOrBlank()) { + return null + } + val finalSubProjectId = EnvUtils.parseEnv(subProjectId, contextMap) + var finalSubPipelineName = EnvUtils.parseEnv(subPipelineName, contextMap) + var finalSubPipelineId = pipelineRepositoryService.listPipelineIdByName( + projectId = finalSubProjectId, + pipelineNames = setOf(finalSubPipelineName), + filterDelete = true + )[finalSubPipelineName] + // 流水线名称直接使用流水线ID代替 + if (finalSubPipelineId.isNullOrBlank() && PIPELINE_ID_PATTERN.matcher( + finalSubPipelineName + ).matches() + ) { + finalSubPipelineId = finalSubPipelineName + finalSubPipelineName = pipelineRepositoryService.getPipelineInfo( + projectId = finalSubProjectId, pipelineId = finalSubPipelineName + )?.pipelineName ?: "" + } + if (finalSubPipelineId.isNullOrBlank() || finalSubPipelineName.isEmpty()) { + logger.info( + "sub-pipeline not found|projectId:$projectId|subPipelineType:$subPipelineType|" + + "subProjectId:$subProjectId|subPipelineName:$subPipelineName" + ) + return null + } + Triple(finalSubProjectId, finalSubPipelineId, finalSubPipelineName) + } + } + } + + /** + * 获取最新版流水线编排 + */ + private fun getModel(projectId: String, pipelineId: String): Model? { + var model: Model? = null + val modelString = pipelineResDao.getLatestVersionModelString(dslContext, projectId, pipelineId) + if (modelString.isNullOrBlank()) { + logger.warn("model not found: [$projectId|$pipelineId]") + } + try { + model = objectMapper.readValue(modelString, Model::class.java) + } catch (ignored: Exception) { + logger.warn("parse process($pipelineId) model fail", ignored) + } + return model + } + + private fun getContextMap(stages: List): Map { + val trigger = stages.getOrNull(0) + ?: throw ErrorCodeException(errorCode = ProcessMessageCode.ERROR_PIPELINE_MODEL_NEED_JOB) + // 检查触发容器 + val paramsMap = defaultModelCheckPlugin.checkTriggerContainer(trigger) + return PipelineVarUtil.fillVariableMap(paramsMap.mapValues { it.value.defaultValue.toString() }) + } + + companion object { + private val logger = LoggerFactory.getLogger(SubPipelineRepositoryService::class.java) + private val PIPELINE_ID_PATTERN = Pattern.compile("(p-)?[a-f\\d]{32}") + private const val SUB_PIPELINE_EXEC_ATOM_CODE = "SubPipelineExec" + } +} \ No newline at end of file diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt index aa2d5b2489b..1c76a084d37 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt @@ -61,6 +61,7 @@ import com.tencent.devops.process.pojo.pipeline.SubPipelineStartUpInfo import com.tencent.devops.process.pojo.pipeline.SubPipelineStatus import com.tencent.devops.process.service.builds.PipelineBuildFacadeService import com.tencent.devops.process.service.pipeline.PipelineBuildService +import com.tencent.devops.process.service.template.TemplateFacadeService import com.tencent.devops.process.service.pipeline.SubPipelineRefService import com.tencent.devops.process.utils.PIPELINE_START_SUB_RUN_MODE import com.tencent.devops.process.utils.PIPELINE_START_CHANNEL @@ -94,6 +95,8 @@ class SubPipelineStartUpService @Autowired constructor( private val buildParamCompatibilityTransformer: BuildParametersCompatibilityTransformer, private val pipelinePermissionService: PipelinePermissionService, private val pipelineUrlBean: PipelineUrlBean, + private val templateFacadeService: TemplateFacadeService + private val pipelineUrlBean: PipelineUrlBean, private val subPipelineRefService: SubPipelineRefService ) { @@ -272,6 +275,10 @@ class SubPipelineStartUpService @Autowired constructor( val model = resource.model val triggerContainer = model.stages[0].containers[0] as TriggerContainer + templateFacadeService.printModifiedTemplateParams( + projectId = projectId, pipelineId = pipelineId, + pipelineParams = triggerContainer.params, paramValues = parameters + ) // #6090 拨乱反正 val params = buildParamCompatibilityTransformer.parseTriggerParam( userId = userId, projectId = projectId, pipelineId = pipelineId, @@ -324,11 +331,16 @@ class SubPipelineStartUpService @Autowired constructor( params[it.key] = BuildParameters(key = it.key, value = it.value) } } - // 校验父流水线最后修改人是否有子流水线执行权限 - checkPermission(userId = parentPipelineInfo.lastModifyUser, projectId = projectId, pipelineId = pipelineId) + // 启动子流水线时使用子流水线的代持人身份，存量数据父流水线的权限代持人可能没有子流水线执行权限 + val oauthUser = pipelineRepositoryService.getPipelineOauthUser( + projectId = projectId, + pipelineId = pipelineId + ) ?: readyToBuildPipelineInfo.lastModifyUser + // 校验父流水线授权人是否有子流水线执行权限 + checkPermission(userId = oauthUser, projectId = projectId, pipelineId = pipelineId) // 子流水线的调用不受频率限制 val subBuildId = pipelineBuildService.startPipeline( - userId = readyToBuildPipelineInfo.lastModifyUser, + userId = oauthUser, pipeline = readyToBuildPipelineInfo, startType = StartType.PIPELINE, pipelineParamMap = params, @@ -438,7 +450,7 @@ class SubPipelineStartUpService @Autowired constructor( private fun needCheckSubElement(element: Element, atomCode: String): Boolean { return when { - !element.isElementEnable() -> false + !element.elementEnabled() -> false (element is MarketBuildLessAtomElement || element is MarketBuildAtomElement) && element.getAtomCode() != atomCode -> false element is SubPipelineCallElement && element.subPipelineId.isBlank() -> false @@ -460,7 +472,6 @@ class SubPipelineStartUpService @Autowired constructor( /** * 获取流水线的手动启动参数，返回至前端渲染界面。 - * @param userId 流水线启东人的用户ID * @param projectId 流水线所在项目ID * @param pipelineId 流水线ID */ @@ -469,12 +480,22 @@ class SubPipelineStartUpService @Autowired constructor( projectId: String, pipelineId: String, includeConst: Boolean?, - includeNotRequired: Boolean? + includeNotRequired: Boolean?, + parentProjectId: String = "", + parentPipelineId: String = "" ): Result> { if (pipelineId.isBlank() || projectId.isBlank()) { return Result(ArrayList()) } - val result = pipelineBuildFacadeService.buildManualStartupInfo(userId, projectId, pipelineId, ChannelCode.BS) + val oauthUser = if (parentProjectId.isNotBlank() && parentPipelineId.isNotBlank()) { + pipelineRepositoryService.getPipelineOauthUser( + projectId = parentProjectId, + pipelineId = parentPipelineId + ) ?: userId + } else { + userId + } + val result = pipelineBuildFacadeService.buildManualStartupInfo(oauthUser, projectId, pipelineId, ChannelCode.BS) val parameter = ArrayList() val prop = result.properties.filter { val const = if (includeConst == false) { it.constant != true } else { true } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineBuildFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineBuildFacadeService.kt index b20686287a2..c6ebca11aee 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineBuildFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineBuildFacadeService.kt @@ -102,6 +102,7 @@ import com.tencent.devops.process.engine.service.record.ContainerBuildRecordServ import com.tencent.devops.process.engine.service.record.PipelineBuildRecordService import com.tencent.devops.process.engine.utils.BuildUtils import com.tencent.devops.process.engine.utils.PipelineUtils +import com.tencent.devops.process.enums.HistorySearchType import com.tencent.devops.process.jmx.api.ProcessJmxApi import com.tencent.devops.process.permission.PipelinePermissionService import com.tencent.devops.process.pojo.BuildBasicInfo @@ -123,6 +124,7 @@ import com.tencent.devops.process.service.BuildVariableService import com.tencent.devops.process.service.ParamFacadeService import com.tencent.devops.process.service.PipelineTaskPauseService import com.tencent.devops.process.service.pipeline.PipelineBuildService +import com.tencent.devops.process.service.template.TemplateFacadeService import com.tencent.devops.process.strategy.context.UserPipelinePermissionCheckContext import com.tencent.devops.process.strategy.factory.UserPipelinePermissionCheckStrategyFactory import com.tencent.devops.process.util.TaskUtils @@ -136,12 +138,12 @@ import com.tencent.devops.process.utils.PIPELINE_SKIP_FAILED_TASK import com.tencent.devops.process.utils.PIPELINE_START_TASK_ID import com.tencent.devops.process.yaml.PipelineYamlFacadeService import com.tencent.devops.quality.api.v2.pojo.ControlPointPosition -import java.util.concurrent.TimeUnit -import javax.ws.rs.core.Response -import javax.ws.rs.core.UriBuilder import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service +import java.util.concurrent.TimeUnit +import javax.ws.rs.core.Response +import javax.ws.rs.core.UriBuilder /** * @@ -173,7 +175,8 @@ class PipelineBuildFacadeService( private val pipelineRedisService: PipelineRedisService, private val pipelineRetryFacadeService: PipelineRetryFacadeService, private val webhookBuildParameterService: WebhookBuildParameterService, - private val pipelineYamlFacadeService: PipelineYamlFacadeService + private val pipelineYamlFacadeService: PipelineYamlFacadeService, + private val templateFacadeService: TemplateFacadeService ) { @Value("\${pipeline.build.cancel.intervalLimitTime:60}") @@ -233,7 +236,7 @@ class PipelineBuildFacadeService( var useLatestParameters = false run lit@{ triggerContainer.elements.forEach { - if (it is ManualTriggerElement && it.isElementEnable()) { + if (it is ManualTriggerElement && it.elementEnabled()) { canManualStartup = true canElementSkip = it.canElementSkip ?: false useLatestParameters = it.useLatestParameters ?: false @@ -430,11 +433,6 @@ class PipelineBuildFacadeService( if (readyToBuildPipelineInfo.locked == true) { throw ErrorCodeException(errorCode = ProcessMessageCode.ERROR_PIPELINE_LOCK) } - if (readyToBuildPipelineInfo.latestVersionStatus?.isNotReleased() == true) { - throw ErrorCodeException( - errorCode = ProcessMessageCode.ERROR_NO_RELEASE_PIPELINE_VERSION - ) - } if (!readyToBuildPipelineInfo.canManualStartup && checkManualStartup == false) { throw ErrorCodeException( errorCode = ProcessMessageCode.DENY_START_BY_MANUAL @@ -580,6 +578,7 @@ class PipelineBuildFacadeService( yamlVersion = buildInfo.yamlVersion, frequencyLimit = true, handlePostFlag = false, + debug = buildInfo.debug, webHookStartParam = webHookStartParam ) } @@ -633,6 +632,7 @@ class PipelineBuildFacadeService( try { val (resource, debug) = getModelAndBuildLevel(projectId, pipelineId, version) val model = resource.model + /** * 验证流水线参数构建启动参数 */ @@ -648,7 +648,7 @@ class PipelineBuildFacadeService( var canRemoteStartup = false run lit@{ triggerContainer.elements.forEach { - if (it is RemoteTriggerElement && it.isElementEnable()) { + if (it is RemoteTriggerElement && it.elementEnabled()) { canRemoteStartup = true return@lit } @@ -669,13 +669,16 @@ class PipelineBuildFacadeService( logger.info("[$pipelineId] buildNo was changed to [$buildNo]") } + templateFacadeService.printModifiedTemplateParams( + projectId = projectId, pipelineId = pipelineId, + pipelineParams = triggerContainer.params, paramValues = values + ) val paramMap = buildParamCompatibilityTransformer.parseTriggerParam( userId = userId, projectId = projectId, pipelineId = pipelineId, paramProperties = triggerContainer.params, paramValues = values ) // 如果是PAC流水线,需要加上代码库hashId,给checkout:self使用 pipelineYamlFacadeService.buildYamlManualParamMap( - userId = userId, projectId = projectId, pipelineId = pipelineId )?.let { @@ -733,7 +736,14 @@ class PipelineBuildFacadeService( return if (targetResource.status == VersionStatus.COMMITTING) { Pair(targetResource, true) } else { - Pair(targetResource, false) + val releaseVersion = pipelineRepositoryService.getPipelineResourceVersion( + projectId = projectId, + pipelineId = pipelineId + ) ?: throw ErrorCodeException( + statusCode = Response.Status.NOT_FOUND.statusCode, + errorCode = ProcessMessageCode.ERROR_PIPELINE_MODEL_NOT_EXISTS + ) + Pair(releaseVersion, false) } } } @@ -1094,13 +1104,12 @@ class PipelineBuildFacadeService( params = arrayOf(userId) ) } - val executeCount = buildInfo.executeCount ?: 1 if (approve) { pipelineRuntimeService.approveTriggerReview(userId = userId, buildInfo = buildInfo) } else { pipelineRuntimeService.disapproveTriggerReview( userId = userId, buildId = buildId, pipelineId = pipelineId, - projectId = projectId, executeCount = executeCount + projectId = projectId, executeCount = buildInfo.executeCount ) } return true @@ -1969,7 +1978,10 @@ class PipelineBuildFacadeService( startUser: List? = null, updateTimeDesc: Boolean? = null, archiveFlag: Boolean? = false, - customVersion: Int? + customVersion: Int?, + triggerAlias: List?, + triggerBranch: List?, + triggerUser: List? ): BuildHistoryPage { val pageNotNull = page ?: 0 val pageSizeNotNull = pageSize ?: 50 @@ -2049,7 +2061,10 @@ class PipelineBuildFacadeService( buildMsg = buildMsg, startUser = startUser, queryDslContext = queryDslContext, - debugVersion = targetDebugVersion + debugVersion = targetDebugVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) val newHistoryBuilds = pipelineRuntimeService.listPipelineBuildHistory( @@ -2079,7 +2094,10 @@ class PipelineBuildFacadeService( startUser = startUser, updateTimeDesc = updateTimeDesc, queryDslContext = queryDslContext, - debugVersion = targetDebugVersion + debugVersion = targetDebugVersion, + triggerAlias = triggerAlias, + triggerBranch = triggerBranch, + triggerUser = triggerUser ) val buildHistories = mutableListOf() buildHistories.addAll(newHistoryBuilds) @@ -2161,7 +2179,9 @@ class PipelineBuildFacadeService( userId: String, projectId: String, pipelineId: String, - debugVersion: Int? + debugVersion: Int?, + search: String?, + type: HistorySearchType? ): List { pipelinePermissionService.validPipelinePermission( userId = userId, @@ -2179,7 +2199,13 @@ class PipelineBuildFacadeService( val draftVersion = pipelineRepositoryService.getDraftVersionResource(projectId, pipelineId) draftVersion?.version == debugVersion } - return pipelineRuntimeService.getHistoryConditionRepo(projectId, pipelineId, targetDebugVersion) + return pipelineRuntimeService.getHistoryConditionRepo( + projectId = projectId, + pipelineId = pipelineId, + debugVersion = targetDebugVersion, + search = search, + type = type + ) } fun getHistoryConditionBranch( @@ -2187,7 +2213,9 @@ class PipelineBuildFacadeService( projectId: String, pipelineId: String, alias: List?, - debugVersion: Int? + debugVersion: Int?, + search: String?, + type: HistorySearchType? ): List { pipelinePermissionService.validPipelinePermission( userId = userId, @@ -2206,7 +2234,12 @@ class PipelineBuildFacadeService( draftVersion?.version == debugVersion } return pipelineRuntimeService.getHistoryConditionBranch( - projectId, pipelineId, alias, targetDebugVersion + projectId = projectId, + pipelineId = pipelineId, + aliasList = alias, + debugVersion = targetDebugVersion, + search = search, + type = type ) } @@ -2311,7 +2344,7 @@ class PipelineBuildFacadeService( if (BuildStatus.parse(modelDetail.status).isFinish()) { logger.warn("The build $buildId of project $projectId already finished ") throw ErrorCodeException( - errorCode = ProcessMessageCode.PIPELINE_BUILD_HAS_ENDED_CANNOT_BE_CANCELED + errorCode = ProcessMessageCode.PIPELINE_BUILD_HAS_ENDED_CANNOT_BE_OPERATE ) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingFacadeService.kt index 3c3d6881c5f..0c570f1ab8d 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingFacadeService.kt @@ -45,6 +45,7 @@ import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatch import com.tencent.devops.common.pipeline.enums.ChannelCode import com.tencent.devops.common.pipeline.enums.VersionStatus import com.tencent.devops.common.pipeline.extend.ModelCheckPlugin +import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.process.audit.service.AuditService import com.tencent.devops.process.engine.atom.AtomUtils @@ -59,15 +60,12 @@ import com.tencent.devops.process.pojo.config.StageCommonSettingConfig import com.tencent.devops.process.pojo.config.TaskCommonSettingConfig import com.tencent.devops.process.pojo.setting.JobCommonSetting import com.tencent.devops.process.pojo.setting.PipelineCommonSetting -import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting import com.tencent.devops.process.pojo.setting.StageCommonSetting -import com.tencent.devops.process.pojo.setting.PipelineSettingVersion import com.tencent.devops.process.pojo.setting.TaskCommonSetting import com.tencent.devops.process.pojo.setting.TaskComponentCommonSetting import com.tencent.devops.process.pojo.setting.UpdatePipelineModelRequest import com.tencent.devops.process.service.label.PipelineGroupService import com.tencent.devops.process.service.view.PipelineViewGroupService -import com.tencent.devops.process.utils.PipelineVersionUtils import org.jooq.DSLContext import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired @@ -117,8 +115,7 @@ class PipelineSettingFacadeService @Autowired constructor( updateLastModifyUser: Boolean? = true, dispatchPipelineUpdateEvent: Boolean = true, updateLabels: Boolean = true, - updateVersion: Boolean = true, - isTemplate: Boolean = false + updateVersion: Boolean = true ): PipelineSetting { if (checkPermission) { val language = I18nUtil.getLanguage(userId) @@ -143,25 +140,20 @@ class PipelineSettingFacadeService @Autowired constructor( setting.fixSubscriptions() modelCheckPlugin.checkSettingIntegrity(setting, projectId) ActionAuditContext.current().setInstance(setting) - val settingVersion = pipelineSettingVersionService.getLatestSettingVersion( + val settingVersion = pipelineSettingVersionService.getSettingVersionAfterUpdate( projectId = projectId, - pipelineId = pipelineId - )?.let { latest -> - if (updateVersion) PipelineVersionUtils.getSettingVersion( - currVersion = latest.version, - originSetting = latest, - newSetting = PipelineSettingVersion.convertFromSetting(setting) - ) else latest.version - } ?: 1 - + pipelineId = pipelineId, + updateVersion = updateVersion, + setting = setting + ) val pipelineName = pipelineRepositoryService.saveSetting( context = context, userId = userId, - setting = setting, + setting = setting.copy(version = settingVersion), version = settingVersion, versionStatus = versionStatus, updateLastModifyUser = updateLastModifyUser, - isTemplate = isTemplate + isTemplate = false ) if (pipelineName.name != pipelineName.oldName) { @@ -176,7 +168,6 @@ class PipelineSettingFacadeService @Autowired constructor( projectId = setting.projectId ) ) - if (checkPermission) { pipelinePermissionService.modifyResource( projectId = setting.projectId, diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateCommonService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateCommonService.kt index 20ee75e8ab5..2088a6bbafe 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateCommonService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateCommonService.kt @@ -1,10 +1,15 @@ package com.tencent.devops.process.service.template import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting +import com.tencent.devops.common.pipeline.pojo.setting.PipelineSubscriptionType +import com.tencent.devops.common.pipeline.pojo.setting.Subscription import com.tencent.devops.process.constant.ProcessMessageCode import com.tencent.devops.process.dao.PipelineSettingDao import com.tencent.devops.process.engine.dao.template.TemplateDao +import com.tencent.devops.process.engine.service.PipelineInfoExtService import com.tencent.devops.process.permission.PipelinePermissionService +import com.tencent.devops.process.yaml.utils.NotifyTemplateUtils import org.jooq.DSLContext import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired @@ -19,6 +24,7 @@ import org.springframework.stereotype.Service @RefreshScope class TemplateCommonService @Autowired constructor( private val pipelinePermissionService: PipelinePermissionService, + private val pipelineInfoExtService: PipelineInfoExtService, private val pipelineSettingDao: PipelineSettingDao, private val templateDao: TemplateDao ) { @@ -70,6 +76,26 @@ class TemplateCommonService @Autowired constructor( } } + fun getDefaultSetting( + projectId: String, + templateId: String, + templateName: String + ): PipelineSetting { + val failNotifyTypes = pipelineInfoExtService.failNotifyChannel() + val failType = failNotifyTypes.split(",").filter { i -> i.isNotBlank() } + .map { type -> PipelineSubscriptionType.valueOf(type) }.toSet() + val failSubscription = Subscription( + types = failType, + groups = emptySet(), + users = "\${{ci.actor}}", + content = NotifyTemplateUtils.getCommonShutdownFailureContent() + ) + return PipelineSetting.defaultSetting( + projectId = projectId, pipelineId = templateId, pipelineName = templateName, + maxPipelineResNum = null, failSubscription = failSubscription + ) + } + companion object { private val logger = LoggerFactory.getLogger(TemplateCommonService::class.java) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt index da357044710..c988022a0ff 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt @@ -230,13 +230,12 @@ class TemplateFacadeService @Autowired constructor( version = client.get(ServiceAllocIdResource::class).generateSegmentId(TEMPLATE_BIZ_TAG_NAME).data, desc = template.desc ) - templateSettingService.insertTemplateSetting( + templateSettingService.saveDefaultTemplateSetting( context = context, userId = userId, projectId = projectId, templateId = templateId, - pipelineName = template.name, - isTemplate = true + templateName = template.name ) pipelineTemplatePermissionService.createResource( userId = userId, @@ -319,16 +318,17 @@ class TemplateFacadeService @Autowired constructor( copyTemplateReq.templateName ) templateSettingService.saveTemplatePipelineSetting( - context, userId, setting, true + context = context, + userId = userId, + setting = setting ) } else { - templateSettingService.insertTemplateSetting( + templateSettingService.saveDefaultTemplateSetting( context = context, userId = userId, projectId = projectId, templateId = newTemplateId, - isTemplate = true, - pipelineName = copyTemplateReq.templateName + templateName = copyTemplateReq.templateName ) } @@ -364,12 +364,12 @@ class TemplateFacadeService @Autowired constructor( ) val template = pipelineResourceDao.getLatestVersionModelString( - dslContext, projectId, saveAsTemplateReq.pipelineId + dslContext, projectId, saveAsTemplateReq.pipelineId ) ?: throw ErrorCodeException( statusCode = Response.Status.NOT_FOUND.statusCode, errorCode = ProcessMessageCode.ERROR_PIPELINE_MODEL_NOT_EXISTS ) - val templateModel: Model = objectMapper.readValue(template) + val templateModel: Model = PipelineUtils.fixedTemplateParam(objectMapper.readValue(template)) checkTemplateAtomsForExplicitVersion(templateModel, userId) val templateId = UUIDUtil.generate() dslContext.transaction { configuration -> @@ -382,7 +382,7 @@ class TemplateFacadeService @Autowired constructor( templateName = saveAsTemplateReq.templateName, versionName = INIT_TEMPLATE_NAME, userId = userId, - template = template, + template = JsonUtil.toJson(templateModel, formatted = false), storeFlag = false, version = client.get(ServiceAllocIdResource::class).generateSegmentId(TEMPLATE_BIZ_TAG_NAME).data, desc = null @@ -406,16 +406,17 @@ class TemplateFacadeService @Autowired constructor( templateName = saveAsTemplateReq.templateName ) templateSettingService.saveTemplatePipelineSetting( - context, userId, setting, true + context = context, + userId = userId, + setting = setting ) } else { - templateSettingService.insertTemplateSetting( + templateSettingService.saveDefaultTemplateSetting( context = context, userId = userId, projectId = projectId, templateId = templateId, - pipelineName = saveAsTemplateReq.templateName, - isTemplate = true + templateName = saveAsTemplateReq.templateName ) } ActionAuditContext.current().setInstanceId(templateId).setInstanceName(saveAsTemplateReq.templateName) @@ -1216,7 +1217,8 @@ class TemplateFacadeService @Autowired constructor( stages = model.stages, cloneTemplateSettingExist = CloneTemplateSettingExist.fromSetting( setting, pipelinesWithLabels - ) + ), + desc = record[tTemplate.DESC] ) } else { null @@ -1584,17 +1586,25 @@ class TemplateFacadeService @Autowired constructor( pipelineId = pipelineId, templateName = instance.pipelineName ) - templateSettingService.saveTemplatePipelineSetting( - context, userId, setting - ) - } else { - templateSettingService.insertTemplateSetting( + pipelineSettingFacadeService.saveSetting( context = context, userId = userId, + projectId = setting.projectId, + pipelineId = setting.pipelineId, + setting = setting + ) + } else { + val defaultSetting = templateCommonService.getDefaultSetting( projectId = projectId, templateId = pipelineId, - pipelineName = pipelineName, - isTemplate = false + templateName = pipelineName + ) + pipelineSettingFacadeService.saveSetting( + context = context, + userId = userId, + projectId = defaultSetting.projectId, + pipelineId = defaultSetting.pipelineId, + setting = defaultSetting ) } addRemoteAuth(instanceModel, projectId, pipelineId, userId) @@ -1778,17 +1788,6 @@ class TemplateFacadeService @Autowired constructor( ) instanceModel.templateId = templateId - pipelineInfoFacadeService.editPipeline( - userId = userId, - projectId = projectId, - pipelineId = templateInstanceUpdate.pipelineId, - model = instanceModel, - // TODO #9145 修改流水线实例时的yaml覆盖逻辑 - yaml = null, - channelCode = ChannelCode.BS, - checkPermission = true, - checkTemplate = false - ) dslContext.transaction { configuration -> val context = DSL.using(configuration) templatePipelineDao.update( @@ -1839,6 +1838,17 @@ class TemplateFacadeService @Autowired constructor( ) } } + pipelineInfoFacadeService.editPipeline( + userId = userId, + projectId = projectId, + pipelineId = templateInstanceUpdate.pipelineId, + model = instanceModel, + // TODO #9145 修改流水线实例时的yaml覆盖逻辑 + yaml = null, + channelCode = ChannelCode.BS, + checkPermission = true, + checkTemplate = false + ) } } @@ -2106,6 +2116,7 @@ class TemplateFacadeService @Autowired constructor( /** * 1. 比较类型， 如果类型变了就直接用模板 * 2. 如果类型相同，下拉选项替换成模板的（要保存用户之前的默认值） + * 3. 如果模版由常量改成变量,则流水线常量也应该改成变量 */ if (pipeline.type != template.type) { result.add(template) @@ -2113,6 +2124,7 @@ class TemplateFacadeService @Autowired constructor( pipeline.options = template.options pipeline.required = template.required pipeline.desc = template.desc + pipeline.constant = template.constant result.add(pipeline) } return@outside @@ -2382,6 +2394,9 @@ class TemplateFacadeService @Autowired constructor( stage.containers.forEach { container -> if (container is TriggerContainer) { container.params = PipelineUtils.cleanOptions(params = container.params) + container.templateParams = container.templateParams?.let { + PipelineUtils.cleanOptions(params = it) + } } if (container.containerId.isNullOrBlank()) { container.containerId = container.id @@ -2466,13 +2481,12 @@ class TemplateFacadeService @Autowired constructor( templateId = templateId, templateName = templateName ) - templateSettingService.insertTemplateSetting( + templateSettingService.saveDefaultTemplateSetting( context = context, userId = userId, projectId = projectId, templateId = templateId, - isTemplate = true, - pipelineName = templateName + templateName = templateName ) projectTemplateMap[projectId] = templateId } @@ -2583,6 +2597,37 @@ class TemplateFacadeService @Autowired constructor( return pipelineTemplatePermissionService.enableTemplatePermissionManage(projectId) } + // TODO 埋点统计模板常量在流水线启动时被修改日志, 后续需要删除 + fun printModifiedTemplateParams( + projectId: String, + pipelineId: String, + pipelineParams: List, + paramValues: Map + ) { + val templatePipelineRecord = templatePipelineDao.get(dslContext, projectId, pipelineId) ?: return + val templateRecord = + templateDao.getTemplate(dslContext = dslContext, version = templatePipelineRecord.version) ?: return + val template: Model = objectMapper.readValue(templateRecord.template) + val templateParams = (template.stages[0].containers[0] as TriggerContainer).templateParams + if (templateParams.isNullOrEmpty()) { + return + } + pipelineParams.forEach { param -> + val value = paramValues[param.id] ?: param.defaultValue + templateParams.forEach { template -> + if (template.id == param.id && template.defaultValue != value) { + logger.warn( + "BKSystemErrorMonitor|$projectId|$pipelineId|" + + "templateId:${templateRecord.id}|templateVersion:${templateRecord.version}|" + + "defaultValue:${template.defaultValue}|newValue:$value|" + + "template params cannot be modified" + ) + return + } + } + } + } + companion object { private val logger = LoggerFactory.getLogger(TemplateFacadeService::class.java) private const val INIT_TEMPLATE_NAME = "init" diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateSettingService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateSettingService.kt index 7f26467320f..90c7630a1bd 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateSettingService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateSettingService.kt @@ -1,17 +1,16 @@ package com.tencent.devops.process.service.template import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.pipeline.enums.VersionStatus +import com.tencent.devops.common.pipeline.extend.ModelCheckPlugin import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting -import com.tencent.devops.common.pipeline.pojo.setting.PipelineSubscriptionType -import com.tencent.devops.common.pipeline.pojo.setting.Subscription import com.tencent.devops.process.constant.ProcessMessageCode -import com.tencent.devops.process.engine.dao.PipelineInfoDao import com.tencent.devops.process.engine.dao.template.TemplateDao import com.tencent.devops.process.engine.service.PipelineInfoExtService import com.tencent.devops.process.engine.service.PipelineRepositoryService +import com.tencent.devops.process.permission.template.PipelineTemplatePermissionService import com.tencent.devops.process.service.label.PipelineGroupService -import com.tencent.devops.process.service.pipeline.PipelineSettingFacadeService -import com.tencent.devops.process.yaml.utils.NotifyTemplateUtils +import com.tencent.devops.process.service.pipeline.PipelineSettingVersionService import org.jooq.DSLContext import org.jooq.impl.DSL import org.slf4j.LoggerFactory @@ -25,12 +24,13 @@ import org.springframework.stereotype.Service class TemplateSettingService @Autowired constructor( private val dslContext: DSLContext, private val pipelineGroupService: PipelineGroupService, - private val pipelineInfoDao: PipelineInfoDao, private val pipelineRepositoryService: PipelineRepositoryService, - private val pipelineSettingFacadeService: PipelineSettingFacadeService, private val pipelineInfoExtService: PipelineInfoExtService, private val templateCommonService: TemplateCommonService, - private val templateDao: TemplateDao + private val templateDao: TemplateDao, + private val modelCheckPlugin: ModelCheckPlugin, + private val pipelineSettingVersionService: PipelineSettingVersionService, + private val pipelineTemplatePermissionService: PipelineTemplatePermissionService ) { fun updateTemplateSetting( projectId: String, @@ -55,7 +55,11 @@ class TemplateSettingService @Autowired constructor( name = setting.pipelineName, desc = setting.desc ) - saveTemplatePipelineSetting(context, userId, setting, true) + saveTemplatePipelineSetting( + context = context, + userId = userId, + setting = setting + ) } return true } @@ -63,62 +67,62 @@ class TemplateSettingService @Autowired constructor( fun saveTemplatePipelineSetting( context: DSLContext? = null, userId: String, - setting: PipelineSetting, - isTemplate: Boolean = false + setting: PipelineSetting ): PipelineSetting { - pipelineGroupService.updatePipelineLabel( - userId = userId, - projectId = setting.projectId, - pipelineId = setting.pipelineId, - labelIds = setting.labels + val projectId = setting.projectId + val pipelineId = setting.pipelineId + // 对齐新旧通知配置，统一根据新list数据保存 + setting.fixSubscriptions() + modelCheckPlugin.checkSettingIntegrity(setting, projectId) + val settingVersion = pipelineSettingVersionService.getSettingVersionAfterUpdate( + projectId = projectId, + pipelineId = pipelineId, + updateVersion = true, + setting = setting ) - pipelineInfoDao.update( - dslContext = dslContext, - projectId = setting.projectId, - pipelineId = setting.pipelineId, + logger.info("Save the template pipeline setting|$pipelineId|settingVersion=$settingVersion|setting=\n$setting") + val templateName = pipelineRepositoryService.saveSetting( + context = context, userId = userId, - pipelineName = setting.pipelineName, - pipelineDesc = setting.desc + setting = setting, + version = settingVersion, + versionStatus = VersionStatus.RELEASED, + updateLastModifyUser = true, + isTemplate = true ) - logger.info("Save the template pipeline setting - ($setting)") - return pipelineSettingFacadeService.saveSetting( - context = context, + if (templateName.name != templateName.oldName) { + pipelineTemplatePermissionService.modifyResource( + userId = userId, + projectId = projectId, + templateId = setting.pipelineId, + templateName = setting.pipelineName + ) + } + pipelineGroupService.updatePipelineLabel( userId = userId, projectId = setting.projectId, pipelineId = setting.pipelineId, - setting = setting, - isTemplate = isTemplate + labelIds = setting.labels ) + return setting.copy(version = settingVersion) } - fun insertTemplateSetting( + fun saveDefaultTemplateSetting( context: DSLContext, userId: String, projectId: String, templateId: String, - pipelineName: String, - isTemplate: Boolean + templateName: String ): PipelineSetting { - val failNotifyTypes = pipelineInfoExtService.failNotifyChannel() - val failType = failNotifyTypes.split(",").filter { i -> i.isNotBlank() } - .map { type -> PipelineSubscriptionType.valueOf(type) }.toSet() - val failSubscription = Subscription( - types = failType, - groups = emptySet(), - users = "\${{ci.actor}}", - content = NotifyTemplateUtils.getCommonShutdownFailureContent() - ) - val setting = PipelineSetting.defaultSetting( - projectId = projectId, pipelineId = templateId, pipelineName = pipelineName, - maxPipelineResNum = null, failSubscription = failSubscription + val defaultSetting = templateCommonService.getDefaultSetting( + projectId = projectId, + templateId = templateId, + templateName = templateName ) - return pipelineSettingFacadeService.saveSetting( + return saveTemplatePipelineSetting( context = context, userId = userId, - projectId = projectId, - pipelineId = templateId, - setting = setting, - isTemplate = isTemplate + setting = defaultSetting ) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/webhook/PipelineBuildWebhookService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/webhook/PipelineBuildWebhookService.kt index ccac99ea3d8..1fcbcbccc02 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/webhook/PipelineBuildWebhookService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/webhook/PipelineBuildWebhookService.kt @@ -217,7 +217,8 @@ class PipelineBuildWebhookService @Autowired constructor( } // 触发事件保存流水线名称 builder.pipelineName(pipelineInfo.pipelineName) - val userId = pipelineInfo.lastModifyUser + // 获取授权人 + val userId = pipelineRepositoryService.getPipelineOauthUser(projectId, pipelineId) ?: pipelineInfo.lastModifyUser val variables = mutableMapOf() val container = model.stages[0].containers[0] as TriggerContainer // 解析变量 @@ -232,7 +233,7 @@ class PipelineBuildWebhookService @Autowired constructor( val failedMatchElements = mutableListOf() // 寻找代码触发原子 container.elements.forEach elements@{ element -> - if (!element.isElementEnable() || element !is WebHookTriggerElement) { + if (!element.elementEnabled() || element !is WebHookTriggerElement) { logger.info("Trigger element is disable, can not start pipeline") return@elements } @@ -310,14 +311,9 @@ class PipelineBuildWebhookService @Autowired constructor( } catch (ignore: Exception) { logger.warn("$pipelineId|webhook trigger|(${element.name})|repo(${matcher.getRepoName()})", ignore) builder.eventSource(eventSource = repo.repoHashId!!) - failedMatchElements.add( - PipelineTriggerFailedMatchElement( - elementId = element.id, - elementName = element.name, - elementAtomCode = element.getAtomCode(), - reasonMsg = ignore.message ?: "" - ) - ) + builder.status(PipelineTriggerStatus.FAILED.name) + .reason(PipelineTriggerReason.TRIGGER_FAILED.name) + .reasonDetail(PipelineTriggerFailedMsg(ignore.message ?: "")) } return true } else { @@ -412,7 +408,7 @@ class PipelineBuildWebhookService @Autowired constructor( } val triggerElementMap = container.elements.filterIsInstance() - .filter { it.isElementEnable() } + .filter { it.elementEnabled() } .associateBy { it.id } val failedMatchElements = mutableListOf() taskIds.forEach { taskId -> diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebHookTriggerElementBizPlugin.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebHookTriggerElementBizPlugin.kt index da25ca7e354..6a46676e0d5 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebHookTriggerElementBizPlugin.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebHookTriggerElementBizPlugin.kt @@ -79,6 +79,7 @@ abstract class WebHookTriggerElementBizPlugin constru contextMap: Map, appearedCnt: Int, isTemplate: Boolean, + oauthUser: String?, pipelineId: String ) = ElementCheckResult(true) } diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebhookRequestService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebhookRequestService.kt index 9aca356668b..1c6a622f6b3 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebhookRequestService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebhookRequestService.kt @@ -79,7 +79,13 @@ class WebhookRequestService( externalId = matcher.getExternalId(), eventType = matcher.getEventType().name, triggerUser = matcher.getUsername(), - eventMessage = matcher.getMessage() ?: "", + eventMessage = matcher.getMessage()?.let { + if (it.length >= 128) { + it.substring(0, 128) + } else { + it + } + } ?: "", repositoryType = scmType.name, requestHeader = request.headers, requestParam = request.queryParams, diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/yaml/PipelineYamlFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/yaml/PipelineYamlFacadeService.kt index baef71cd0c5..aea246c6a9c 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/yaml/PipelineYamlFacadeService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/yaml/PipelineYamlFacadeService.kt @@ -452,28 +452,14 @@ class PipelineYamlFacadeService @Autowired constructor( /** * 构建yaml流水线触发变量 */ - fun buildYamlManualParamMap(userId: String, projectId: String, pipelineId: String): Map? { + fun buildYamlManualParamMap(projectId: String, pipelineId: String): Map? { val pipelineYamlInfo = pipelineYamlInfoDao.get( dslContext = dslContext, projectId = projectId, pipelineId = pipelineId ) ?: return null - val repoHashId = pipelineYamlInfo.repoHashId - val repository = client.get(ServiceRepositoryResource::class).get( - projectId = projectId, - repositoryId = repoHashId, - repositoryType = RepositoryType.ID - ).data ?: return null - val setting = PacRepoSetting(repository = repository) - val event = PipelineYamlManualEvent( - userId = userId, - projectId = projectId, - repoHashId = repoHashId, - scmType = repository.getScmType() - ) - val action = eventActionFactory.loadManualEvent(setting = setting, event = event) return mutableMapOf( - BK_REPO_WEBHOOK_HASH_ID to BuildParameters(BK_REPO_WEBHOOK_HASH_ID, repoHashId), + BK_REPO_WEBHOOK_HASH_ID to BuildParameters(BK_REPO_WEBHOOK_HASH_ID, pipelineYamlInfo.repoHashId), PIPELINE_WEBHOOK_BRANCH to BuildParameters( - PIPELINE_WEBHOOK_BRANCH, action.data.context.defaultBranch ?: "" + PIPELINE_WEBHOOK_BRANCH, pipelineYamlInfo.defaultBranch ?: "" ) ) } diff --git a/src/backend/ci/core/process/biz-process/src/test/kotlin/com/tencent/devops/process/util/MatrixYamlCheckUtilsTest.kt b/src/backend/ci/core/process/biz-process/src/test/kotlin/com/tencent/devops/process/util/MatrixYamlCheckUtilsTest.kt index 6130c3f1add..3c77ab5069d 100644 --- a/src/backend/ci/core/process/biz-process/src/test/kotlin/com/tencent/devops/process/util/MatrixYamlCheckUtilsTest.kt +++ b/src/backend/ci/core/process/biz-process/src/test/kotlin/com/tencent/devops/process/util/MatrixYamlCheckUtilsTest.kt @@ -116,9 +116,11 @@ internal class MatrixYamlCheckUtilsTest { @Test fun checkYaml5() { - val yamlstr = JsonUtil.toJson(mapOf( - "strategy" to "\${{fromJSONasd(asd)}}" - )) + val yamlstr = JsonUtil.toJson( + mapOf( + "strategy" to "\${{fromJSONasd(asd)}}" + ) + ) val result = try { MatrixContextUtils.schemaCheck(yamlstr) false @@ -131,9 +133,11 @@ internal class MatrixYamlCheckUtilsTest { @Test fun checkYaml6() { - val yamlstr = JsonUtil.toJson(mapOf( - "strategy" to "\${{fromJSON(asd)}}" - )) + val yamlstr = JsonUtil.toJson( + mapOf( + "strategy" to "\${{fromJSON(asd)}}" + ) + ) MatrixContextUtils.schemaCheck(yamlstr) } @@ -169,4 +173,17 @@ internal class MatrixYamlCheckUtilsTest { Assertions.assertTrue(result.exclude == null) Assertions.assertTrue(result.strategy == null) } + + @Test + fun checkYaml9() { + val yamlstr = MatrixPipelineInfo( + include = "\${{ fromJSON(FTP_DEPLOY_MODULE_LIST) }}", + exclude = "", + strategy = "\${{ fromJSON(FTP_DEPLOY_MODULE_NAMES) }}" + ) + /*测试并发*/ + List(1000) { it }.parallelStream().forEach { + MatrixYamlCheckUtils.checkYaml(yamlstr) + } + } } diff --git a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectDiffVO.kt b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectDiffVO.kt index e8f658ea271..4a61a381064 100644 --- a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectDiffVO.kt +++ b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectDiffVO.kt @@ -116,5 +116,9 @@ data class ProjectDiffVO( @get:Schema(title = "运营产品ID") val productId: Int? = null, @get:Schema(title = "审批中运营产品ID") - val afterProductId: Int? = null + val afterProductId: Int? = null, + @get:Schema(title = "运营产品名称") + val productName: String? = null, + @get:Schema(title = "审批中运营产品名称") + val afterProductName: String? = null ) diff --git a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectVO.kt b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectVO.kt index c99b848a151..82362f1fe4a 100644 --- a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectVO.kt +++ b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectVO.kt @@ -154,6 +154,8 @@ data class ProjectVO( val channelCode: String? = null, @get:Schema(title = "运营产品ID") val productId: Int? = null, + @get:Schema(title = "运营产品名称") + val productName: String? = null, @get:Schema(title = "是否可以查看") val canView: Boolean? = null, @get:Schema(title = "安装模板权限") diff --git a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/service/ServiceVO.kt b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/service/ServiceVO.kt index 37c7c728f3a..9b02f9e34d7 100644 --- a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/service/ServiceVO.kt +++ b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/service/ServiceVO.kt @@ -87,5 +87,7 @@ data class ServiceVO( @get:Schema(title = "new_window_url") val newWindowUrl: String? = null, @get:Schema(title = "集群类型") - val clusterType: String = "" + val clusterType: String = "", + @get:Schema(title = "文档链接") + val docUrl: String = "" ) diff --git a/src/backend/ci/core/project/biz-project-sample/src/main/kotlin/com/tencent/devops/project/service/SimpleProjectServiceImpl.kt b/src/backend/ci/core/project/biz-project-sample/src/main/kotlin/com/tencent/devops/project/service/SimpleProjectServiceImpl.kt index 6c545389843..538a9a38ae7 100644 --- a/src/backend/ci/core/project/biz-project-sample/src/main/kotlin/com/tencent/devops/project/service/SimpleProjectServiceImpl.kt +++ b/src/backend/ci/core/project/biz-project-sample/src/main/kotlin/com/tencent/devops/project/service/SimpleProjectServiceImpl.kt @@ -213,16 +213,23 @@ class SimpleProjectServiceImpl @Autowired constructor( return listOf( OperationalProductVO( productId = -1, - productName = "其他" + productName = "other" ) ) } + override fun getProductByProductId(productId: Int): OperationalProductVO? { + return OperationalProductVO( + productId = -1, + productName = "other" + ) + } + override fun getOperationalProductsByBgName(bgName: String): List { return listOf( OperationalProductVO( productId = -1, - productName = "其他" + productName = "other" ) ) } diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/dao/ProjectDao.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/dao/ProjectDao.kt index 58cadb34420..e29c002f4b0 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/dao/ProjectDao.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/dao/ProjectDao.kt @@ -50,6 +50,7 @@ import com.tencent.devops.project.pojo.user.UserDeptDetail import com.tencent.devops.project.util.ProjectUtils import java.net.URLDecoder import java.time.LocalDateTime +import java.util.Locale import org.jooq.Condition import org.jooq.DSLContext import org.jooq.Record @@ -60,7 +61,6 @@ import org.jooq.Result import org.jooq.impl.DSL import org.jooq.impl.DSL.lower import org.springframework.stereotype.Repository -import java.util.Locale @Suppress("ALL") @Repository @@ -188,6 +188,7 @@ class ProjectDao { conditions.add( ROUTER_TAG.like("%${projectConditionDTO.routerTag!!.value}%") .or(ROUTER_TAG.like("%devx%")) + .let { if (includeNullRouterTag == true) it.or(ROUTER_TAG.isNull()) else it } ) } else { conditions.add( @@ -621,6 +622,7 @@ class ProjectDao { it.orderBy(DSL.field("CONVERT({0} USING GBK)", PROJECT_NAME).desc()) } } + ProjectSortType.ENGLISH_NAME -> { if (collation == ProjectCollation.DEFAULT || collation == ProjectCollation.ASC) { it.orderBy(ENGLISH_NAME.asc()) @@ -628,6 +630,7 @@ class ProjectDao { it.orderBy(ENGLISH_NAME.desc()) } } + else -> { it } diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt index d5c924efe29..827713fc742 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt @@ -120,8 +120,7 @@ class UserProjectResourceImpl @Autowired constructor( userId = userId, englishName = projectId, accessToken = accessToken - ) - ?: throw OperationException("project $projectId not found") + ) ?: throw OperationException("project $projectId not found") ) } diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt index fc0acbb3e6b..967e9c1169f 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt @@ -253,6 +253,8 @@ interface ProjectService { fun getOperationalProducts(): List + fun getProductByProductId(productId: Int): OperationalProductVO? + fun getOperationalProductsByBgName(bgName: String): List fun updateProjectProductId( diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt index a0e173a0b0d..12714f03ff5 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt @@ -44,7 +44,7 @@ class UserCacheService @Autowired constructor( */ fun getDetailFromCache(userId: String): UserDeptDetail { val userRecord = userDao.get(dslContext, userId) - return getUserDeptDetail(userRecord) + return getUserDeptDetail(userRecord, userId) } fun listDetailFromCache(userIds: List): List { @@ -55,9 +55,10 @@ class UserCacheService @Autowired constructor( return userDao.usernamesByParentId(dslContext, parentId) } - fun getUserDeptDetail(userRecord: TUserRecord?): UserDeptDetail { + fun getUserDeptDetail(userRecord: TUserRecord?, userId: String? = null): UserDeptDetail { return if (userRecord == null) { UserDeptDetail( + userId = userId, bgName = "", bgId = "0", centerName = "", diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt index c6d608aa521..c927c1ab717 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt @@ -27,6 +27,7 @@ package com.tencent.devops.project.service.impl +import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper import com.tencent.bk.audit.annotations.ActionAuditRecord import com.tencent.bk.audit.annotations.AuditInstanceRecord @@ -80,6 +81,7 @@ import com.tencent.devops.project.jmx.api.ProjectJmxApi import com.tencent.devops.project.jmx.api.ProjectJmxApi.Companion.PROJECT_LIST import com.tencent.devops.project.pojo.AuthProjectCreateInfo import com.tencent.devops.project.pojo.ProjectBaseInfo +import com.tencent.devops.project.pojo.ProjectByConditionDTO import com.tencent.devops.project.pojo.ProjectCollation import com.tencent.devops.project.pojo.ProjectCreateExtInfo import com.tencent.devops.project.pojo.ProjectCreateInfo @@ -93,7 +95,6 @@ import com.tencent.devops.project.pojo.ProjectUpdateCreatorDTO import com.tencent.devops.project.pojo.ProjectUpdateHistoryInfo import com.tencent.devops.project.pojo.ProjectUpdateInfo import com.tencent.devops.project.pojo.ProjectVO -import com.tencent.devops.project.pojo.ProjectByConditionDTO import com.tencent.devops.project.pojo.ResourceUpdateInfo import com.tencent.devops.project.pojo.Result import com.tencent.devops.project.pojo.enums.ProjectApproveStatus @@ -447,7 +448,10 @@ abstract class AbsProjectServiceImpl @Autowired constructor( } } val tipsStatus = getAndUpdateTipsStatus(userId = userId, projectId = englishName) - return projectInfo.copy(tipsStatus = tipsStatus) + return projectInfo.copy( + tipsStatus = tipsStatus, + productName = projectInfo.productId?.let { getProductByProductId(it)?.productName } + ) } protected fun getAndUpdateTipsStatus(userId: String, projectId: String): Int { @@ -473,10 +477,16 @@ abstract class AbsProjectServiceImpl @Autowired constructor( val record = projectDao.getByEnglishName(dslContext, englishName) ?: return null val projectApprovalInfo = projectApprovalService.get(englishName) val rightProjectOrganization = fixProjectOrganization(tProjectRecord = record) + val beforeProductName = if (record.productId != null) { + getProductByProductId(record.productId) + } else { + null + } return ProjectUtils.packagingBean( tProjectRecord = record, projectApprovalInfo = projectApprovalInfo, - projectOrganizationInfo = rightProjectOrganization + projectOrganizationInfo = rightProjectOrganization, + beforeProductName = beforeProductName?.productName ) } @@ -542,7 +552,7 @@ abstract class AbsProjectServiceImpl @Autowired constructor( val (finalNeedApproval, newApprovalStatus) = getUpdateApprovalStatus( needApproval = needApproval, projectInfo = projectInfo, - subjectScopesStr = subjectScopesStr, + afterSubjectScopes = subjectScopes, projectUpdateInfo = projectUpdateInfo ) val projectId = projectInfo.projectId @@ -558,8 +568,8 @@ abstract class AbsProjectServiceImpl @Autowired constructor( originalProjectName = projectInfo.projectName, modifiedProjectName = projectUpdateInfo.projectName, finalNeedApproval = finalNeedApproval, - beforeSubjectScopesStr = projectInfo.subjectScopes, - afterSubjectScopesStr = subjectScopesStr + beforeSubjectScopes = JsonUtil.to(projectInfo.subjectScopes, object : TypeReference>() {}), + afterSubjectScopes = subjectScopes )) { modifyProjectAuthResource(resourceUpdateInfo) } @@ -692,29 +702,35 @@ abstract class AbsProjectServiceImpl @Autowired constructor( originalProjectName: String, modifiedProjectName: String, finalNeedApproval: Boolean, - beforeSubjectScopesStr: String, - afterSubjectScopesStr: String + beforeSubjectScopes: List, + afterSubjectScopes: List ): Boolean { + val isSubjectScopesChange = isSubjectScopesChange( + beforeSubjectScopes = beforeSubjectScopes, + afterSubjectScopes = afterSubjectScopes + ) return originalProjectName != modifiedProjectName || finalNeedApproval || - beforeSubjectScopesStr != afterSubjectScopesStr + isSubjectScopesChange } private fun getUpdateApprovalStatus( needApproval: Boolean?, projectInfo: TProjectRecord, - subjectScopesStr: String, + afterSubjectScopes: List, projectUpdateInfo: ProjectUpdateInfo ): Pair { val authNeedApproval = projectPermissionService.needApproval(needApproval) val approveStatus = ProjectApproveStatus.parse(projectInfo.approvalStatus) // 判断是否需要审批 return if (approveStatus.isSuccess()) { + val isSubjectScopesChange = isSubjectScopesChange( + beforeSubjectScopes = JsonUtil.to(projectInfo.subjectScopes, object : TypeReference>() {}), + afterSubjectScopes = afterSubjectScopes + ) // 当项目创建成功,则只有最大授权范围和项目性质修改才审批 val finalNeedApproval = authNeedApproval && - (projectInfo.subjectScopes != subjectScopesStr || - projectInfo.authSecrecy != projectUpdateInfo.authSecrecy || - projectInfo.productId != projectUpdateInfo.productId - ) + (isSubjectScopesChange || projectInfo.authSecrecy != projectUpdateInfo.authSecrecy || + projectInfo.productId != projectUpdateInfo.productId) val approvalStatus = if (finalNeedApproval) { ProjectApproveStatus.UPDATE_PENDING.status } else { @@ -727,6 +743,15 @@ abstract class AbsProjectServiceImpl @Autowired constructor( } } + private fun isSubjectScopesChange( + beforeSubjectScopes: List, + afterSubjectScopes: List + ): Boolean { + val beforeIds = beforeSubjectScopes.map { it.id }.toSet() + val afterIds = afterSubjectScopes.map { it.id }.toSet() + return beforeIds != afterIds + } + private fun updateApprovalInfo( userId: String, projectId: String, diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsUserProjectServiceServiceImpl.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsUserProjectServiceServiceImpl.kt index 1cdd2c9a71c..c8fecff0fc8 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsUserProjectServiceServiceImpl.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsUserProjectServiceServiceImpl.kt @@ -86,7 +86,8 @@ abstract class AbsUserProjectServiceServiceImpl @Autowired constructor( weigHt = tServiceRecord.weight ?: 0, logoUrl = tServiceRecord.logoUrl, webSocket = tServiceRecord.webSocket, - clusterType = tServiceRecord.clusterType + clusterType = tServiceRecord.clusterType, + docUrl = tServiceRecord.docUrl ?: "" ) ) } else { @@ -251,7 +252,8 @@ abstract class AbsUserProjectServiceServiceImpl @Autowired constructor( webSocket = it.webSocket, newWindow = it.newWindow, newWindowUrl = it.newWindowurl, - clusterType = it.clusterType + clusterType = it.clusterType, + docUrl = it.docUrl ?: "" ) ) } diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/util/ProjectUtils.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/util/ProjectUtils.kt index e13c8dcfbc3..4d21fac15f5 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/util/ProjectUtils.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/util/ProjectUtils.kt @@ -128,7 +128,8 @@ object ProjectUtils { fun packagingBean( tProjectRecord: TProjectRecord, projectApprovalInfo: ProjectApprovalInfo?, - projectOrganizationInfo: ProjectOrganizationInfo? = null + projectOrganizationInfo: ProjectOrganizationInfo? = null, + beforeProductName: String? = null ): ProjectDiffVO { val isUseFixedOrganization = projectOrganizationInfo != null val subjectScopes = tProjectRecord.subjectScopes?.let { @@ -187,7 +188,9 @@ object ProjectUtils { projectType = projectType, afterProjectType = projectApprovalInfo?.projectType, productId = productId, - afterProductId = projectApprovalInfo?.productId + afterProductId = projectApprovalInfo?.productId, + productName = beforeProductName, + afterProductName = projectApprovalInfo?.productName ) } } diff --git a/src/backend/ci/core/quality/api-quality/src/main/kotlin/com/tencent/devops/quality/api/v2/AppQualityRuleResource.kt b/src/backend/ci/core/quality/api-quality/src/main/kotlin/com/tencent/devops/quality/api/v2/AppQualityRuleResource.kt new file mode 100644 index 00000000000..bc368a3fc8c --- /dev/null +++ b/src/backend/ci/core/quality/api-quality/src/main/kotlin/com/tencent/devops/quality/api/v2/AppQualityRuleResource.kt @@ -0,0 +1,38 @@ +package com.tencent.devops.quality.api.v2 + +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.quality.api.v2.pojo.response.QualityRuleMatchTask +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +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 + +@Tag(name = "USER_RULE_V2", description = "质量红线-拦截规则v2") +@Path("/app/rules/v2") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface AppQualityRuleResource { + @Operation(summary = "匹配拦截规则") + @Path("/{projectId}/matchRuleList") + @GET + fun matchRuleList( + @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 = false, example = "1") + @QueryParam("pipelineId") + pipelineId: String + ): Result> +} diff --git a/src/backend/ci/core/quality/biz-quality/src/main/kotlin/com/tencent/devops/quality/resources/v2/AppQualityRuleResourceImpl.kt b/src/backend/ci/core/quality/biz-quality/src/main/kotlin/com/tencent/devops/quality/resources/v2/AppQualityRuleResourceImpl.kt new file mode 100644 index 00000000000..cfc524bf514 --- /dev/null +++ b/src/backend/ci/core/quality/biz-quality/src/main/kotlin/com/tencent/devops/quality/resources/v2/AppQualityRuleResourceImpl.kt @@ -0,0 +1,33 @@ +package com.tencent.devops.quality.resources.v2 + +import com.tencent.devops.common.api.exception.ParamBlankException +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.web.RestResource +import com.tencent.devops.quality.api.v2.AppQualityRuleResource +import com.tencent.devops.quality.api.v2.pojo.response.QualityRuleMatchTask +import com.tencent.devops.quality.service.v2.QualityRuleCheckService +import org.springframework.beans.factory.annotation.Autowired + +@RestResource +class AppQualityRuleResourceImpl @Autowired constructor( + private val ruleCheckService: QualityRuleCheckService +) : AppQualityRuleResource { + override fun matchRuleList( + userId: String, + projectId: String, + pipelineId: String + ): Result> { + checkParam(userId, projectId) + val result = ruleCheckService.userGetMatchRuleList(projectId, pipelineId) + return Result(result) + } + + private fun checkParam(userId: String, projectId: String) { + if (userId.isBlank()) { + throw ParamBlankException("Invalid userId") + } + if (projectId.isBlank()) { + throw ParamBlankException("Invalid projectId") + } + } +} diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryAuthorizationResource.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryAuthorizationResource.kt new file mode 100644 index 00000000000..9d5c625a5c2 --- /dev/null +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryAuthorizationResource.kt @@ -0,0 +1,61 @@ +/* + * 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.repository.api + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +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 + +@Tag(name = "SERVICE_AUTHORIZATION", description = "代码库授权管理") +@Path("/service/repository/authorization") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface ServiceRepositoryAuthorizationResource { + @Operation(summary = "重置代码库授权管理") + @POST + @Path("/{projectId}/resetRepositoryAuthorization/{preCheck}") + fun resetRepositoryAuthorization( + @Parameter(description = "项目ID", required = true) + @PathParam("projectId") + projectId: String, + @Parameter(description = "是否为预检查", required = true) + @PathParam("preCheck") + preCheck: Boolean, + @Parameter(description = "请求体", required = true) + resourceAuthorizationHandoverDTOs: List + ): Result>> +} diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryPacResource.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryPacResource.kt index a64c78b6bcb..9befd8ea37b 100644 --- a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryPacResource.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceRepositoryPacResource.kt @@ -28,6 +28,8 @@ package com.tencent.devops.repository.api +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.enums.ScmType import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.repository.pojo.Repository @@ -37,10 +39,12 @@ import io.swagger.v3.oas.annotations.Parameter import javax.ws.rs.Consumes import javax.ws.rs.GET import javax.ws.rs.POST +import javax.ws.rs.PUT import javax.ws.rs.Path import javax.ws.rs.PathParam import javax.ws.rs.Produces import javax.ws.rs.QueryParam +import javax.ws.rs.HeaderParam import javax.ws.rs.core.MediaType @Tag(name = "SERVICE_PAC_REPOSITORY", description = "服务-PAC-代码库") @@ -74,4 +78,33 @@ interface ServiceRepositoryPacResource { @QueryParam("scmType") scmType: ScmType ): Result + @Operation(summary = "开启pac") + @PUT + @Path("/{projectId}/{repositoryHashId}/enable") + fun enablePac( + @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("repositoryHashId") + repositoryHashId: String + ): Result + + @Operation(summary = "关闭pac") + @PUT + @Path("/{projectId}/{repositoryHashId}/disable") + fun disablePac( + @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("repositoryHashId") + repositoryHashId: String + ): Result } diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/UserRepositoryConfigResource.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/UserRepositoryConfigResource.kt new file mode 100644 index 00000000000..18d2b7cabee --- /dev/null +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/UserRepositoryConfigResource.kt @@ -0,0 +1,50 @@ +/* + * 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.repository.api + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.repository.pojo.RepositoryConfig +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import javax.ws.rs.Consumes +import javax.ws.rs.GET +import javax.ws.rs.Path +import javax.ws.rs.Produces +import javax.ws.rs.core.MediaType + +@Tag(name = "USER_REPOSITORY_MANAGER", description = "用户-代码库配置") +@Path("/user/repositories/config") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +interface UserRepositoryConfigResource { + + @Operation(summary = "获取代码库配置列表") + @GET + @Path("/") + fun list(): Result> +} diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/scm/ServiceTGitResource.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/scm/ServiceTGitResource.kt index 3e77f401b21..d727f275852 100644 --- a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/scm/ServiceTGitResource.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/api/scm/ServiceTGitResource.kt @@ -36,6 +36,7 @@ import com.tencent.devops.repository.pojo.git.GitCodeProjectInfo import com.tencent.devops.repository.pojo.git.GitUserInfo import com.tencent.devops.scm.code.git.api.GitBranch import com.tencent.devops.scm.enums.GitAccessLevelEnum +import com.tencent.devops.scm.pojo.ChangeFileInfo import com.tencent.devops.scm.pojo.GitFileInfo import io.swagger.v3.oas.annotations.tags.Tag import io.swagger.v3.oas.annotations.Operation @@ -186,4 +187,37 @@ interface ServiceTGitResource { @QueryParam("tokenType") tokenType: TokenTypeEnum = TokenTypeEnum.OAUTH ): Result + + @Operation(summary = "获取两次提交的差异文件列表") + @GET + @Path("/getChangeFileList") + fun getChangeFileList( + @Parameter(description = "token") + @QueryParam("token") + token: String, + @Parameter(description = "token类型 0：oauth 1:privateKey", required = true) + @QueryParam("tokenType") + tokenType: TokenTypeEnum, + @Parameter(description = "gitProjectId") + @QueryParam("gitProjectId") + gitProjectId: String, + @Parameter(description = "旧commit") + @QueryParam("from") + from: String, + @Parameter(description = "新commit") + @QueryParam("to") + to: String, + @Parameter(description = "true：两个点比较差异，false：三个点比较差异。默认是 false") + @QueryParam("straight") + straight: Boolean? = false, + @Parameter(description = "页码") + @QueryParam("page") + page: Int, + @Parameter(description = "每页大小") + @QueryParam("pageSize") + pageSize: Int, + @Parameter(description = "代码库url") + @QueryParam("url") + url: String + ): Result> } diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/constant/RepositoryMessageCode.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/constant/RepositoryMessageCode.kt index 31c3eb1e598..9ddc4cc7723 100644 --- a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/constant/RepositoryMessageCode.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/constant/RepositoryMessageCode.kt @@ -90,6 +90,11 @@ object RepositoryMessageCode { const val ATOM_REPO_CAN_NOT_EDIT = "2115040" // 插件仓库不得修改 const val ATOM_REPO_CAN_NOT_DELETE = "2115041" // 插件仓库不得删除 + const val ERROR_USER_HAVE_NOT_USED_OAUTH = "2115042" // 用户没有使用过Oauth + const val ERROR_USER_HAVE_NOT_DOWNLOAD_PEM = "2115043" // 用户（{0}）无（{1}）项目下载权限 + const val NOT_GITHUB_AUTHORIZED_BY_OAUTH = "2115044" // 用户[{0}]尚未进行GITHUB OAUTH授权，请先授权。 + const val REPOSITORY_NO_SUPPORT_OAUTH = "2115045" // （{0}）类型代码库暂不支持OAUTH授权 + const val BK_REQUEST_FILE_SIZE_LIMIT = "bkRequestFileSizeLimit" // 请求文件不能超过1M const val OPERATION_ADD_CHECK_RUNS = "OperationAddCheckRuns" // 添加检测任务 const val OPERATION_UPDATE_CHECK_RUNS = "OperationUpdateCheckRuns" // 更新检测任务 diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryConfig.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryConfig.kt new file mode 100644 index 00000000000..7598617a5cc --- /dev/null +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryConfig.kt @@ -0,0 +1,44 @@ +/* + * 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.repository.pojo + +import com.tencent.devops.common.api.enums.ScmType +import com.tencent.devops.repository.pojo.enums.RepositoryConfigStatusEnum +import io.swagger.v3.oas.annotations.media.Schema + +@Schema(title = "代码库配置") +data class RepositoryConfig( + @get:Schema(title = "代码库类型", required = false) + val scmType: ScmType, + @get:Schema(title = "代码库名称", required = false) + val name: String, + @get:Schema(title = "代码库状态", required = false) + val status: RepositoryConfigStatusEnum, + @get:Schema(title = "文档连接", required = false) + val docUrl: String? = "" +) diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryInfo.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryInfo.kt index 0fb0baf5764..05cb2b24fc3 100644 --- a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryInfo.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/RepositoryInfo.kt @@ -42,6 +42,8 @@ data class RepositoryInfo( val url: String, @get:Schema(title = "类型", required = true) val type: ScmType, + @get:Schema(title = "创建时间", required = true) + val createdTime: Long? = null, @get:Schema(title = "最后更新时间", required = true) val updatedTime: Long, @get:Schema(title = "创建人", required = false) diff --git a/src/backend/ci/core/worker/worker-agent/src/main/kotlin/com/tencent/devops/agent/service/SampleRepoServiceImpl.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/enums/RepositoryConfigStatusEnum.kt similarity index 75% rename from src/backend/ci/core/worker/worker-agent/src/main/kotlin/com/tencent/devops/agent/service/SampleRepoServiceImpl.kt rename to src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/enums/RepositoryConfigStatusEnum.kt index 1ef3a6fdffc..f80c97270cd 100644 --- a/src/backend/ci/core/worker/worker-agent/src/main/kotlin/com/tencent/devops/agent/service/SampleRepoServiceImpl.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/enums/RepositoryConfigStatusEnum.kt @@ -25,22 +25,17 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.tencent.devops.agent.service +package com.tencent.devops.repository.pojo.enums -import com.tencent.bkrepo.repository.pojo.token.TokenType -import com.tencent.devops.worker.common.service.RepoService +import io.swagger.v3.oas.annotations.media.Schema -class SampleRepoServiceImpl : RepoService { +@Schema(title = "代码库配置状态") +enum class RepositoryConfigStatusEnum { + OK, - override fun getRepoToken( - userId: String, - projectId: String, - repoName: String, - path: String, - type: TokenType, - expireSeconds: Long? - ): String? { - // 开源版暂不支持用token去上传或下载 - return null - } + // 禁用,前端不展示 + DISABLED, + + // 部署中,配置还没有准备好,如github app还没有申请 + DEPLOYING } diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/github/GithubCheckRuns.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/github/GithubCheckRuns.kt index a1828ca31cd..0beed6a55f6 100644 --- a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/github/GithubCheckRuns.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/pojo/github/GithubCheckRuns.kt @@ -28,6 +28,8 @@ package com.tencent.devops.repository.pojo import com.fasterxml.jackson.annotation.JsonProperty +import com.tencent.devops.repository.sdk.github.pojo.CheckRunOutput +import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Schema @Schema(title = "check run 模型") @@ -52,5 +54,7 @@ data class GithubCheckRuns( val conclusion: String?, @JsonProperty("completed_at") @get:Schema(title = "完成于", description = "completed_at") - val completedAt: String? + val completedAt: String?, + @Parameter(description = "output", required = true) + val output: CheckRunOutput? = null ) diff --git a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/sdk/github/pojo/CheckRunOutput.kt b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/sdk/github/pojo/CheckRunOutput.kt index 3e3b9fd6220..7cd98c8c574 100644 --- a/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/sdk/github/pojo/CheckRunOutput.kt +++ b/src/backend/ci/core/repository/api-repository/src/main/kotlin/com/tencent/devops/repository/sdk/github/pojo/CheckRunOutput.kt @@ -1,13 +1,16 @@ package com.tencent.devops.repository.sdk.github.pojo import com.fasterxml.jackson.annotation.JsonProperty +import io.swagger.v3.oas.annotations.Parameter data class CheckRunOutput( @JsonProperty("annotations_count") - val annotationsCount: Int, + val annotationsCount: Int? = 0, @JsonProperty("annotations_url") - val annotationsUrl: String, + val annotationsUrl: String? = "", val summary: String?, - val text: String?, - val title: String? + var text: String?, + val title: String?, + @Parameter(description = "报表数据", required = true) + val reportData: Pair, MutableMap>>>? = Pair(listOf(), mutableMapOf()) ) diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/GithubTokenDao.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/GithubTokenDao.kt index c93beefb9ed..e016c2c5f77 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/GithubTokenDao.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/GithubTokenDao.kt @@ -88,10 +88,16 @@ class GithubTokenDao { fun getOrNull( dslContext: DSLContext, userId: String, - githubTokenType: GithubTokenType = GithubTokenType.GITHUB_APP + githubTokenType: GithubTokenType? ): TRepositoryGithubTokenRecord? { with(TRepositoryGithubToken.T_REPOSITORY_GITHUB_TOKEN) { - return dslContext.selectFrom(this).where(USER_ID.eq(userId)).and(TYPE.eq(githubTokenType.name)).fetchOne() + return dslContext.selectFrom(this).where(USER_ID.eq(userId)) + .let { + if (githubTokenType != null) { + it.and(TYPE.eq(githubTokenType.name)) + } else it + } + .fetchOne() } } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/RepositoryDao.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/RepositoryDao.kt index 4efd5f778e1..8cca0ff5383 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/RepositoryDao.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/RepositoryDao.kt @@ -29,21 +29,27 @@ package com.tencent.devops.repository.dao import com.tencent.devops.common.api.enums.ScmType import com.tencent.devops.common.api.util.HashUtil +import com.tencent.devops.common.api.util.timestampmilli +import com.tencent.devops.common.db.utils.skipCheck import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.model.repository.tables.TRepository import com.tencent.devops.model.repository.tables.TRepositoryCodeGit import com.tencent.devops.model.repository.tables.records.TRepositoryRecord import com.tencent.devops.repository.constant.RepositoryMessageCode.GIT_NOT_FOUND +import com.tencent.devops.repository.pojo.RepositoryInfo +import com.tencent.devops.repository.pojo.enums.RepoAuthType import com.tencent.devops.repository.pojo.enums.RepositorySortEnum import com.tencent.devops.repository.pojo.enums.RepositorySortTypeEnum -import java.time.LocalDateTime -import javax.ws.rs.NotFoundException import org.jooq.Condition import org.jooq.DSLContext +import org.jooq.Record import org.jooq.Record1 import org.jooq.Result +import org.jooq.SelectForStep import org.jooq.impl.DSL import org.springframework.stereotype.Repository +import java.time.LocalDateTime +import javax.ws.rs.NotFoundException @Repository @Suppress("ALL") @@ -222,6 +228,89 @@ class RepositoryDao { } } + fun listRepositoryAuthorization( + dslContext: DSLContext, + projectId: String, + limit: Int, + offset: Int + ): List { + val repositoryAuthorizationQuery = buildRepositoryAuthorizationQuery( + dslContext = dslContext, + projectId = projectId + ) + with(TRepository.T_REPOSITORY) { + return dslContext.select() + .from(repositoryAuthorizationQuery) + .limit(limit) + .offset(offset) + .skipCheck() + .fetch() + .map { + RepositoryInfo( + repositoryId = it[REPOSITORY_ID], + repositoryHashId = HashUtil.encodeOtherLongId(it[REPOSITORY_ID]), + aliasName = it[ALIAS_NAME], + url = it[URL], + type = ScmType.valueOf(it[TYPE]), + createUser = it[USER_ID], + createdTime = it[CREATED_TIME].timestampmilli(), + updatedTime = it[UPDATED_TIME].timestampmilli() + ) + } + } + } + + fun countRepositoryAuthorization( + dslContext: DSLContext, + projectId: String + ): Int { + val repositoryAuthorizationQuery = buildRepositoryAuthorizationQuery( + dslContext = dslContext, + projectId = projectId + ) + return dslContext.fetchCount(repositoryAuthorizationQuery) + } + + private fun buildRepositoryAuthorizationQuery( + dslContext: DSLContext, + projectId: String + ): SelectForStep { + val tRepositoryCodeGit = TRepositoryCodeGit.T_REPOSITORY_CODE_GIT + with(TRepository.T_REPOSITORY) { + val codeGitQuery = dslContext.select( + REPOSITORY_ID, + ALIAS_NAME, + URL, + TYPE, + USER_ID, + CREATED_TIME, + UPDATED_TIME + ) + .from(this) + .join(tRepositoryCodeGit) + .on(REPOSITORY_ID.eq(tRepositoryCodeGit.REPOSITORY_ID)) + .where(IS_DELETED.eq(false)) + .and(PROJECT_ID.eq(projectId)) + .and(TYPE.eq(ScmType.CODE_GIT.name)) + .and(tRepositoryCodeGit.AUTH_TYPE.eq(RepoAuthType.OAUTH.name)) + + val gitHubQuery = dslContext.select( + REPOSITORY_ID, + ALIAS_NAME, + URL, + TYPE, + USER_ID, + CREATED_TIME, + UPDATED_TIME + ).from(this) + .where(IS_DELETED.eq(false)) + .and(PROJECT_ID.eq(projectId)) + .and(TYPE.eq(ScmType.GITHUB.name)) + + return codeGitQuery.unionAll(gitHubQuery).orderBy(CREATED_TIME.desc()) + } + } + fun listByProject( dslContext: DSLContext, projectIds: Collection, diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthResourceImpl.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthResourceImpl.kt index 627910de54f..71b6880eb77 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthResourceImpl.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthResourceImpl.kt @@ -44,16 +44,16 @@ class ServiceRepositoryAuthResourceImpl @Autowired constructor( val method = callBackInfo.method val page = callBackInfo.page val projectId = callBackInfo.filter.parent?.id ?: "" // FETCH_INSTANCE_INFO场景下iam不会传parentId - when (method) { + return when (method) { CallbackMethodEnum.LIST_INSTANCE -> { - return repositoryAuthService.getRepository(projectId, page.offset.toInt(), page.limit.toInt(), token) + repositoryAuthService.getRepository(projectId, page.offset.toInt(), page.limit.toInt(), token) } CallbackMethodEnum.FETCH_INSTANCE_INFO -> { val ids = callBackInfo.filter.idList.map { it.toString() } - return repositoryAuthService.getRepositoryInfo(ids, token) + repositoryAuthService.getRepositoryInfo(ids, token) } CallbackMethodEnum.SEARCH_INSTANCE -> { - return repositoryAuthService.searchRepositoryInstances( + repositoryAuthService.searchRepositoryInstances( projectId = projectId, keyword = callBackInfo.filter.keyword, limit = page.limit.toInt(), @@ -61,7 +61,17 @@ class ServiceRepositoryAuthResourceImpl @Autowired constructor( token = token ) } + CallbackMethodEnum.LIST_RESOURCE_AUTHORIZATION -> { + repositoryAuthService.getRepositoryAuthorization( + projectId = projectId, + limit = page.limit.toInt(), + offset = page.offset.toInt(), + token = token + ) + } + else -> { + null + } } - return null } } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthorizationResourceImpl.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthorizationResourceImpl.kt new file mode 100644 index 00000000000..52b9d66544d --- /dev/null +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryAuthorizationResourceImpl.kt @@ -0,0 +1,27 @@ +package com.tencent.devops.repository.resources + +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.common.web.RestResource +import com.tencent.devops.repository.api.ServiceRepositoryAuthorizationResource +import com.tencent.devops.repository.service.permission.RepositoryAuthorizationService + +@RestResource +class ServiceRepositoryAuthorizationResourceImpl constructor( + private val repositoryAuthorizationService: RepositoryAuthorizationService +) : ServiceRepositoryAuthorizationResource { + override fun resetRepositoryAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List + ): Result>> { + return Result( + repositoryAuthorizationService.resetRepositoryAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs + ) + ) + } +} diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryPacResourceImpl.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryPacResourceImpl.kt index 95cbeedd501..88df89976bf 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryPacResourceImpl.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/ServiceRepositoryPacResourceImpl.kt @@ -54,6 +54,28 @@ class ServiceRepositoryPacResourceImpl @Autowired constructor( return Result(true) } + override fun enablePac(userId: String, projectId: String, repositoryHashId: String): Result { + repositoryPacService.enablePac( + userId = userId, + projectId = projectId, + repositoryHashId = repositoryHashId + ) + return Result(true) + } + + override fun disablePac( + userId: String, + projectId: String, + repositoryHashId: String + ): Result { + repositoryPacService.disablePac( + userId = userId, + projectId = projectId, + repositoryHashId = repositoryHashId + ) + return Result(true) + } + override fun getPacRepository(externalId: String, scmType: ScmType): Result { return Result(repositoryPacService.getPacRepository(externalId = externalId, scmType = scmType)) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryConfigResourceImpl.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryConfigResourceImpl.kt new file mode 100644 index 00000000000..228d1f966bb --- /dev/null +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryConfigResourceImpl.kt @@ -0,0 +1,77 @@ +/* + * 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.repository.resources + +import com.tencent.devops.common.api.enums.ScmType +import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.web.RestResource +import com.tencent.devops.common.web.utils.I18nUtil +import com.tencent.devops.repository.api.UserRepositoryConfigResource +import com.tencent.devops.repository.pojo.RepositoryConfig +import com.tencent.devops.repository.pojo.enums.RepositoryConfigStatusEnum +import com.tencent.devops.scm.config.GitConfig +import org.springframework.beans.factory.annotation.Autowired + +@RestResource +class UserRepositoryConfigResourceImpl @Autowired constructor( + private val gitConfig: GitConfig +) : UserRepositoryConfigResource { + + companion object { + // 后续需改造数据库字段 + val DOC_URL_MAP = mapOf( + ScmType.GITHUB.name to "/docs/markdown/Devops//UserGuide/Setup/guidelines-bkdevops-githubapp.md" + ) + } + + override fun list(): Result> { + // TODO 源码管理需要优化 + val managers = ScmType.values().map { + val status = when { + it == ScmType.GITHUB && gitConfig.githubClientId.isBlank() -> + RepositoryConfigStatusEnum.DEPLOYING + + it == ScmType.CODE_GIT && gitConfig.clientId.isBlank() -> + RepositoryConfigStatusEnum.DISABLED + + else -> + RepositoryConfigStatusEnum.OK + } + RepositoryConfig( + scmType = it, + name = I18nUtil.getCodeLanMessage( + messageCode = "TRIGGER_TYPE_${it.name}", + defaultMessage = it.name + ), + status = status, + docUrl = DOC_URL_MAP[it.name] ?: "" + ) + } + return Result(managers) + } +} diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryPacResourceImpl.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryPacResourceImpl.kt index 7b85f8e0dde..938cf3deaa4 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryPacResourceImpl.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryPacResourceImpl.kt @@ -35,11 +35,13 @@ import com.tencent.devops.common.web.RestResource import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.repository.api.UserRepositoryPacResource import com.tencent.devops.repository.service.RepositoryPacService +import com.tencent.devops.scm.config.GitConfig import org.springframework.beans.factory.annotation.Autowired @RestResource class UserRepositoryPacResourceImpl @Autowired constructor( - private val repositoryPacService: RepositoryPacService + private val repositoryPacService: RepositoryPacService, + private val gitConfig: GitConfig ) : UserRepositoryPacResource { override fun getPacProjectId( @@ -122,14 +124,19 @@ class UserRepositoryPacResourceImpl @Autowired constructor( } override fun supportScmType(): Result> { - return Result(listOf(ScmType.CODE_GIT).map { - IdValue( - id = it.name, - value = I18nUtil.getCodeLanMessage( - messageCode = "TRIGGER_TYPE_${it.name}", - defaultMessage = it.name + // TODO 源码管理需要优化 + return if (gitConfig.clientId.isBlank()) { + return Result(emptyList()) + } else { + Result(listOf(ScmType.CODE_GIT).map { + IdValue( + id = it.name, + value = I18nUtil.getCodeLanMessage( + messageCode = "TRIGGER_TYPE_${it.name}", + defaultMessage = it.name + ) ) - ) - }) + }) + } } } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/scm/ServiceTGitResourceImpl.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/scm/ServiceTGitResourceImpl.kt index 586e95db190..b75022ac628 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/scm/ServiceTGitResourceImpl.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/resources/scm/ServiceTGitResourceImpl.kt @@ -44,6 +44,7 @@ import com.tencent.devops.repository.service.RepositoryService import com.tencent.devops.repository.service.tgit.ITGitService import com.tencent.devops.scm.code.git.api.GitBranch import com.tencent.devops.scm.enums.GitAccessLevelEnum +import com.tencent.devops.scm.pojo.ChangeFileInfo import com.tencent.devops.scm.pojo.GitFileInfo import javax.servlet.http.HttpServletResponse import org.springframework.beans.factory.annotation.Autowired @@ -170,4 +171,30 @@ class ServiceTGitResourceImpl @Autowired constructor( ) ) } + + override fun getChangeFileList( + token: String, + tokenType: TokenTypeEnum, + gitProjectId: String, + from: String, + to: String, + straight: Boolean?, + page: Int, + pageSize: Int, + url: String + ): Result> { + return Result( + gitService.getChangeFileList( + tokenType = tokenType, + gitProjectId = gitProjectId, + token = token, + from = from, + to = to, + straight = straight, + page = page, + pageSize = pageSize, + url = url + ) + ) + } } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/OPRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/OPRepositoryService.kt index e821f8042bf..4c6e546275b 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/OPRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/OPRepositoryService.kt @@ -348,7 +348,11 @@ class OPRepositoryService @Autowired constructor( val limit = 100 logger.info("OPRepositoryService:begin updateCodeGithubProjectId") do { - val repoRecords = codeGithubDao.getAllRepo(dslContext, limit, offset) + val repoRecords = codeGithubDao.getAllRepo( + dslContext = dslContext, + limit = limit, + offset = offset + ) val repoSize = repoRecords?.size logger.info("repoSize:$repoSize") val repositoryIds = repoRecords?.map { it.repositoryId } ?: ArrayList() diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryAuthService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryAuthService.kt index 32093adf173..0d5ae9b7177 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryAuthService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryAuthService.kt @@ -27,12 +27,16 @@ package com.tencent.devops.repository.service +import com.tencent.bk.sdk.iam.dto.callback.response.BaseDataResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO +import com.tencent.devops.common.auth.api.AuthResourceType import com.tencent.devops.common.auth.api.AuthTokenApi +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationResponse import com.tencent.devops.common.auth.callback.FetchInstanceInfo import com.tencent.devops.common.auth.callback.ListInstanceInfo +import com.tencent.devops.common.auth.callback.ListResourcesAuthorizationDTO import com.tencent.devops.common.auth.callback.SearchInstanceInfo import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired @@ -122,6 +126,46 @@ class RepositoryAuthService @Autowired constructor( return result.buildSearchInstanceResult(repositorytInfo, count) } + fun getRepositoryAuthorization( + projectId: String, + offset: Int, + limit: Int, + token: String + ): ListResourcesAuthorizationDTO { + authTokenApi.checkToken(token) + val count = repositoryService.listRepositoryAuthorization( + projectId = projectId, + limit = limit, + offset = offset + ).first + val repositoryInfos = repositoryService.listRepositoryAuthorization( + projectId = projectId, + limit = limit, + offset = offset + ).second + val data = BaseDataResponseDTO() + val result = ListResourcesAuthorizationDTO(data) + if (repositoryInfos.isEmpty()) { + logger.info("$projectId There is no assembly line under the project") + return result.buildResourcesAuthorizationListResult() + } + val entityInfos = mutableListOf() + repositoryInfos.map { + val entity = ResourceAuthorizationResponse( + projectCode = projectId, + resourceType = AuthResourceType.PIPELINE_DEFAULT.value, + resourceName = it.aliasName, + resourceCode = it.repositoryHashId!!, + handoverTime = it.updatedTime, + handoverFrom = it.createUser!! + ) + entityInfos.add(entity) + } + logger.info("entityInfo $entityInfos, count $count") + data.result = entityInfos + return result.buildResourcesAuthorizationListResult() + } + companion object { val logger = LoggerFactory.getLogger(RepositoryAuthService::class.java) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt index d5ed7d1f034..a273036b64f 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt @@ -58,24 +58,31 @@ import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.model.repository.tables.records.TRepositoryRecord import com.tencent.devops.process.api.service.ServicePipelineYamlResource import com.tencent.devops.repository.constant.RepositoryMessageCode +import com.tencent.devops.repository.constant.RepositoryMessageCode.ERROR_USER_HAVE_NOT_DOWNLOAD_PEM +import com.tencent.devops.repository.constant.RepositoryMessageCode.NOT_AUTHORIZED_BY_OAUTH +import com.tencent.devops.repository.constant.RepositoryMessageCode.NOT_GITHUB_AUTHORIZED_BY_OAUTH import com.tencent.devops.repository.constant.RepositoryMessageCode.PAC_REPO_CAN_NOT_DELETE import com.tencent.devops.repository.constant.RepositoryMessageCode.PAC_REPO_CAN_NOT_RENAME +import com.tencent.devops.repository.constant.RepositoryMessageCode.REPOSITORY_NO_SUPPORT_OAUTH import com.tencent.devops.repository.constant.RepositoryMessageCode.USER_CREATE_PEM_ERROR import com.tencent.devops.repository.dao.RepositoryCodeGitDao import com.tencent.devops.repository.dao.RepositoryDao import com.tencent.devops.repository.pojo.AtomRefRepositoryInfo import com.tencent.devops.repository.pojo.AuthorizeResult import com.tencent.devops.repository.pojo.CodeGitRepository +import com.tencent.devops.repository.pojo.GithubRepository import com.tencent.devops.repository.pojo.RepoRename import com.tencent.devops.repository.pojo.Repository import com.tencent.devops.repository.pojo.RepositoryDetailInfo import com.tencent.devops.repository.pojo.RepositoryInfo import com.tencent.devops.repository.pojo.RepositoryInfoWithPermission +import com.tencent.devops.repository.pojo.enums.GithubAccessLevelEnum import com.tencent.devops.repository.pojo.enums.RedirectUrlTypeEnum import com.tencent.devops.repository.pojo.enums.RepoAuthType import com.tencent.devops.repository.pojo.enums.TokenTypeEnum import com.tencent.devops.repository.pojo.enums.VisibilityLevelEnum import com.tencent.devops.repository.pojo.git.UpdateGitProjectInfo +import com.tencent.devops.repository.service.github.IGithubService import com.tencent.devops.repository.service.loader.CodeRepositoryServiceRegistrar import com.tencent.devops.repository.service.scm.IGitOauthService import com.tencent.devops.repository.service.scm.IGitService @@ -87,15 +94,16 @@ import com.tencent.devops.scm.pojo.GitCommit import com.tencent.devops.scm.pojo.GitProjectInfo import com.tencent.devops.scm.pojo.GitRepositoryDirItem import com.tencent.devops.scm.pojo.GitRepositoryResp -import java.time.LocalDateTime -import java.util.Base64 -import javax.ws.rs.NotFoundException +import com.tencent.devops.scm.utils.code.git.GitUtils import org.jooq.DSLContext import org.jooq.impl.DSL import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service +import java.time.LocalDateTime +import java.util.Base64 +import javax.ws.rs.NotFoundException @Service @Suppress("ALL") @@ -108,6 +116,7 @@ class RepositoryService @Autowired constructor( private val tGitOAuthService: TGitOAuthService, private val dslContext: DSLContext, private val repositoryPermissionService: RepositoryPermissionService, + private val githubService: IGithubService, private val client: Client ) { @@ -538,6 +547,12 @@ class RepositoryService @Autowired constructor( .setInstanceName(repository.aliasName) .setInstance(repository) createResource(userId, projectId, repositoryId, repository.aliasName) + repositoryService.addResourceAuthorization( + projectId = projectId, + userId = userId, + repositoryId = repositoryId, + repository = repository + ) try { if (repository.enablePac == true) { client.get(ServicePipelineYamlResource::class).enable( @@ -606,7 +621,7 @@ class RepositoryService @Autowired constructor( return compose(repository) } - private fun getRepository(projectId: String, repositoryConfig: RepositoryConfig): TRepositoryRecord { + fun getRepository(projectId: String, repositoryConfig: RepositoryConfig): TRepositoryRecord { logger.info("[$projectId]Start to get the repository - ($repositoryConfig)") return when (repositoryConfig.repositoryType) { RepositoryType.ID -> { @@ -619,7 +634,7 @@ class RepositoryService @Autowired constructor( } } - private fun compose(repository: TRepositoryRecord): Repository { + fun compose(repository: TRepositoryRecord): Repository { val codeRepositoryService = CodeRepositoryServiceRegistrar.getServiceByScmType(repository.type) return codeRepositoryService.compose(repository = repository) } @@ -1326,7 +1341,7 @@ class RepositoryService @Autowired constructor( if (atomRefRepositoryInfo.isEmpty()) { return } - val repoInfos = mutableListOf () + val repoInfos = mutableListOf() // 过滤无效数据 atomRefRepositoryInfo.forEach { val repositoryRecord = repositoryDao.getById( @@ -1385,6 +1400,166 @@ class RepositoryService @Autowired constructor( } } + fun listRepositoryAuthorization( + projectId: String, + limit: Int, + offset: Int + ): Pair> { + val repositoryAuthorizationInfos = repositoryDao.listRepositoryAuthorization( + dslContext = dslContext, + projectId = projectId, + limit = limit, + offset = offset + ) + val count = repositoryDao.countRepositoryAuthorization( + dslContext = dslContext, + projectId = projectId + ) + return Pair(count, repositoryAuthorizationInfos) + } + + fun getRepository(projectId: String, repositoryHashId: String?, repoAliasName: String?): Repository { + if (repoAliasName.isNullOrBlank() && repoAliasName.isNullOrBlank()) { + throw IllegalArgumentException("repositoryHashId or repoAliasName can not be null") + } + return compose( + getRepository( + projectId = projectId, + repositoryConfig = if (repositoryHashId.isNullOrBlank()) { + RepositoryConfig( + repositoryHashId = repositoryHashId, + repositoryName = null, + repositoryType = RepositoryType.ID + ) + } else { + RepositoryConfig( + repositoryHashId = null, + repositoryName = repoAliasName, + repositoryType = RepositoryType.NAME + ) + } + ) + ) + } + + /** + * 检查代码库下载权限 + */ + fun checkRepoDownloadPem( + userId: String, + projectId: String, + repository: Repository + ) { + val projectName = repository.projectName + val language = I18nUtil.getLanguage(userId) + val (havePermission, repoLink) = when (repository) { + is CodeGitRepository -> { + val token = gitOauthService.getAccessToken(userId = userId)?.accessToken ?: throw OperationException( + MessageUtil.getMessageByLocale( + NOT_AUTHORIZED_BY_OAUTH, + language, + arrayOf(userId) + ) + ) + val members = try { + gitService.getProjectMembersAll( + token = token, + gitProjectId = projectName, + search = userId, + page = 1, + pageSize = 100, + tokenType = TokenTypeEnum.OAUTH + ).data + } catch (ignored: Exception) { + logger.warn("get git repository members failed: $ignored") + null + } ?: emptyList() + (members.find { + it.username == userId && it.accessLevel >= GitAccessLevelEnum.REPORTER.level + } != null) to GitUtils.getHttpUrl(repository.url) + } + + is GithubRepository -> { + val token = githubService.getAccessToken(userId) ?: throw OperationException( + MessageUtil.getMessageByLocale( + NOT_GITHUB_AUTHORIZED_BY_OAUTH, + language, + arrayOf(userId) + ) + ) + // github 用户信息 + val user = githubService.getUser(token.accessToken) ?: throw OperationException( + MessageUtil.getMessageByLocale( + NOT_GITHUB_AUTHORIZED_BY_OAUTH, + language, + arrayOf(userId) + ) + ) + // 是否有下载权限 + val permission = githubService.getRepositoryPermissions( + projectName = projectName, + userId = user.login, + token = token.accessToken + )?.permission + // Github只有oauth + (GithubAccessLevelEnum.getGithubAccessLevel(permission).level >= GithubAccessLevelEnum.READ.level) to + repository.url + } + + else -> { + throw OperationException( + MessageUtil.getMessageByLocale( + REPOSITORY_NO_SUPPORT_OAUTH, + language, + arrayOf(repository.getScmType().name) + ) + ) + } + } + if (!havePermission) { + throw OperationException( + MessageUtil.getMessageByLocale( + ERROR_USER_HAVE_NOT_DOWNLOAD_PEM, + language, + arrayOf(userId, repoLink, repository.aliasName) + ) + ) + } + } + + /** + * 重置oauth用户 + */ + fun reOauth( + repository: Repository, + repositoryRecord: TRepositoryRecord, + userId: String, + projectId: String + ) { + // 更新授权用户 + val targetRepo = when (repository) { + is CodeGitRepository -> repository.copy(userName = userId) + is GithubRepository -> repository.copy(userName = userId) + else -> { + throw OperationException( + MessageUtil.getMessageByLocale( + REPOSITORY_NO_SUPPORT_OAUTH, + I18nUtil.getLanguage(userId), + arrayOf(repository.getScmType().name) + ) + ) + } + } + val codeRepositoryService = CodeRepositoryServiceRegistrar.getService(repository) + codeRepositoryService.edit( + userId = userId, + projectId = projectId, + repositoryHashId = repository.repoHashId!!, + repository = targetRepo, + record = repositoryRecord + ) + } + companion object { private val logger = LoggerFactory.getLogger(RepositoryService::class.java) const val MAX_ALIAS_LENGTH = 255 diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryUserService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryUserService.kt index 10f52d28fda..7cc5f30f80d 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryUserService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryUserService.kt @@ -62,7 +62,11 @@ class RepositoryUserService @Autowired constructor( * @param projectCode 项目代码 * @param repositoryHashId 代码库HashId */ - fun updateRepositoryUserInfo(userId: String, projectCode: String, repositoryHashId: String): Result { + fun updateRepositoryUserInfo( + userId: String, + projectCode: String, + repositoryHashId: String + ): Result { val repositoryId = HashUtil.decodeOtherIdToLong(repositoryHashId) val repositoryRecord = repositoryDao.get(dslContext, repositoryId) when (repositoryRecord.type) { diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitRepositoryService.kt index 061aba2d7f2..cbc9e51386c 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitRepositoryService.kt @@ -32,6 +32,10 @@ import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.exception.OperationException import com.tencent.devops.common.api.util.HashUtil import com.tencent.devops.common.api.util.MessageUtil +import com.tencent.devops.common.api.util.timestampmilli +import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.model.repository.tables.records.TRepositoryRecord import com.tencent.devops.repository.constant.RepositoryConstants @@ -52,6 +56,7 @@ import com.tencent.devops.repository.pojo.enums.GitAccessLevelEnum import com.tencent.devops.repository.pojo.enums.RepoAuthType import com.tencent.devops.repository.pojo.enums.TokenTypeEnum import com.tencent.devops.repository.service.CredentialService +import com.tencent.devops.repository.service.permission.RepositoryAuthorizationService import com.tencent.devops.repository.service.scm.IGitOauthService import com.tencent.devops.repository.service.scm.IGitService import com.tencent.devops.repository.service.scm.IScmOauthService @@ -67,6 +72,7 @@ import org.jooq.impl.DSL import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component +import java.time.LocalDateTime @Component class CodeGitRepositoryService @Autowired constructor( @@ -77,7 +83,8 @@ class CodeGitRepositoryService @Autowired constructor( private val scmService: IScmService, private val gitOauthService: IGitOauthService, private val scmOauthService: IScmOauthService, - private val gitService: IGitService + private val gitService: IGitService, + private val repositoryAuthorizationService: RepositoryAuthorizationService ) : CodeRepositoryService { override fun repositoryType(): String { return CodeGitRepository::class.java.name @@ -199,6 +206,25 @@ class CodeGitRepositoryService @Autowired constructor( authType = repository.authType, gitProjectId = gitProjectId ) + val repositoryCodeRecord = repositoryCodeGitDao.get( + dslContext = transactionContext, + repositoryId = repositoryId + ) + if (repositoryCodeRecord.authType == RepoAuthType.OAUTH.name && + repositoryCodeRecord.userName != repository.userName) { + repositoryAuthorizationService.batchModifyHandoverFrom( + projectId = projectId, + resourceAuthorizationHandoverList = listOf( + ResourceAuthorizationHandoverDTO( + projectCode = projectId, + resourceType = AuthResourceType.CODE_REPERTORY.value, + resourceName = record.aliasName, + resourceCode = repositoryHashId, + handoverTo = repository.userName + ) + ) + ) + } } } @@ -497,6 +523,31 @@ class CodeGitRepositoryService @Autowired constructor( ) } + override fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: CodeGitRepository + ) { + with(repository) { + if (authType == RepoAuthType.OAUTH) { + repositoryAuthorizationService.addResourceAuthorization( + projectId = projectId, + listOf( + ResourceAuthorizationDTO( + projectCode = projectId, + resourceType = AuthResourceType.CODE_REPERTORY.value, + resourceName = repository.aliasName, + resourceCode = HashUtil.encodeOtherLongId(repositoryId), + handoverFrom = userId, + handoverTime = LocalDateTime.now().timestampmilli() + ) + ) + ) + } + } + } + companion object { private val logger = LoggerFactory.getLogger(CodeGitRepositoryService::class.java) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGithubRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGithubRepositoryService.kt index 0050c419296..ab5a0362ef3 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGithubRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGithubRepositoryService.kt @@ -30,6 +30,10 @@ import com.tencent.devops.common.api.enums.ScmType import com.tencent.devops.common.api.exception.OperationException import com.tencent.devops.common.api.util.HashUtil import com.tencent.devops.common.api.util.MessageUtil +import com.tencent.devops.common.api.util.timestampmilli +import com.tencent.devops.common.auth.api.AuthResourceType +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.model.repository.tables.records.TRepositoryRecord import com.tencent.devops.repository.constant.RepositoryMessageCode @@ -42,6 +46,7 @@ import com.tencent.devops.repository.pojo.enums.RepoAuthType import com.tencent.devops.repository.sdk.github.request.GetRepositoryRequest import com.tencent.devops.repository.sdk.github.service.GithubRepositoryService import com.tencent.devops.repository.service.github.GithubTokenService +import com.tencent.devops.repository.service.permission.RepositoryAuthorizationService import com.tencent.devops.scm.pojo.GitFileInfo import com.tencent.devops.scm.utils.code.git.GitUtils import org.jooq.DSLContext @@ -49,6 +54,7 @@ import org.jooq.impl.DSL import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component +import java.time.LocalDateTime @Component class CodeGithubRepositoryService @Autowired constructor( @@ -56,7 +62,8 @@ class CodeGithubRepositoryService @Autowired constructor( private val repositoryGithubDao: RepositoryGithubDao, private val dslContext: DSLContext, private val githubRepositoryService: GithubRepositoryService, - private val githubTokenService: GithubTokenService + private val githubTokenService: GithubTokenService, + private val repositoryAuthorizationService: RepositoryAuthorizationService ) : CodeRepositoryService { override fun repositoryType(): String { return GithubRepository::class.java.name @@ -121,8 +128,10 @@ class CodeGithubRepositoryService @Autowired constructor( ).url var gitProjectId: Long? = null if (sourceUrl != repository.url) { - logger.info("repository url unMatch,need change gitProjectId,sourceUrl=[$sourceUrl] " + - "targetUrl=[${repository.url}]") + logger.info( + "repository url unMatch,need change gitProjectId,sourceUrl=[$sourceUrl] " + + "targetUrl=[${repository.url}]" + ) // Git项目ID gitProjectId = getProjectId(repository, userId) } @@ -136,12 +145,30 @@ class CodeGithubRepositoryService @Autowired constructor( updateUser = userId ) repositoryGithubDao.edit( - dslContext, + transactionContext, repositoryId, repository.projectName, repository.userName, gitProjectId = gitProjectId ) + val githubRepositoryRecord = repositoryGithubDao.get( + dslContext = transactionContext, + repositoryId = repositoryId + ) + if (githubRepositoryRecord.userName != repository.userName) { + repositoryAuthorizationService.batchModifyHandoverFrom( + projectId = projectId, + resourceAuthorizationHandoverList = listOf( + ResourceAuthorizationHandoverDTO( + projectCode = projectId, + resourceType = AuthResourceType.CODE_REPERTORY.value, + resourceName = record.aliasName, + resourceCode = repositoryHashId, + handoverTo = repository.userName + ) + ) + ) + } } } @@ -210,4 +237,27 @@ class CodeGithubRepositoryService @Autowired constructor( ) = emptyList() override fun getPacRepository(externalId: String): TRepositoryRecord? = null + + override fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: GithubRepository + ) { + with(repository) { + repositoryAuthorizationService.addResourceAuthorization( + projectId = projectId, + listOf( + ResourceAuthorizationDTO( + projectCode = projectId, + resourceType = AuthResourceType.CODE_REPERTORY.value, + resourceName = repository.aliasName, + resourceCode = HashUtil.encodeOtherLongId(repositoryId), + handoverFrom = userId, + handoverTime = LocalDateTime.now().timestampmilli() + ) + ) + ) + } + } } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitlabRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitlabRepositoryService.kt index 8b43023fb4d..3746f088acd 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitlabRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitlabRepositoryService.kt @@ -299,6 +299,13 @@ class CodeGitlabRepositoryService @Autowired constructor( ) } + override fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: CodeGitlabRepository + ) = Unit + companion object { private val logger = LoggerFactory.getLogger(CodeGitlabRepositoryService::class.java) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeP4RepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeP4RepositoryService.kt index 7655d5337a4..267823ecf39 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeP4RepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeP4RepositoryService.kt @@ -236,6 +236,13 @@ class CodeP4RepositoryService @Autowired constructor( override fun getPacRepository(externalId: String): TRepositoryRecord? = null + override fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: CodeP4Repository + ) = Unit + companion object { private val logger = LoggerFactory.getLogger(CodeP4RepositoryService::class.java) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeRepositoryService.kt index 865cba9df57..8648d2984d5 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeRepositoryService.kt @@ -72,4 +72,11 @@ interface CodeRepositoryService { fun getGitFileTree(projectId: String, userId: String, record: TRepositoryRecord): List fun getPacRepository(externalId: String): TRepositoryRecord? + + fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: T + ) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeSvnRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeSvnRepositoryService.kt index af2a7939daa..75dd4f6cd37 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeSvnRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeSvnRepositoryService.kt @@ -300,6 +300,13 @@ class CodeSvnRepositoryService @Autowired constructor( override fun getPacRepository(externalId: String): TRepositoryRecord? = null + override fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: CodeSvnRepository + ) = Unit + companion object { private val logger = LoggerFactory.getLogger(CodeSvnRepositoryService::class.java) } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeTGitRepositoryService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeTGitRepositoryService.kt index 8aff174fe30..5374f049a52 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeTGitRepositoryService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeTGitRepositoryService.kt @@ -330,4 +330,11 @@ class CodeTGitRepositoryService @Autowired constructor( companion object { private val logger = LoggerFactory.getLogger(CodeTGitRepositoryService::class.java) } + + override fun addResourceAuthorization( + projectId: String, + userId: String, + repositoryId: Long, + repository: CodeTGitRepository + ) = Unit } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/GithubService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/GithubService.kt index 58359a9dca0..0d7d662b501 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/GithubService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/GithubService.kt @@ -58,9 +58,14 @@ import com.tencent.devops.repository.pojo.github.GithubRepo import com.tencent.devops.repository.pojo.github.GithubRepoBranch import com.tencent.devops.repository.pojo.github.GithubRepoTag import com.tencent.devops.repository.pojo.github.GithubTag +import com.tencent.devops.repository.pojo.github.GithubToken +import com.tencent.devops.repository.sdk.github.pojo.RepositoryPermissions import com.tencent.devops.repository.sdk.github.request.GetRepositoryContentRequest +import com.tencent.devops.repository.sdk.github.request.GetRepositoryPermissionsRequest +import com.tencent.devops.repository.sdk.github.response.GetUserResponse import com.tencent.devops.repository.sdk.github.service.GithubRepositoryService import com.tencent.devops.repository.sdk.github.service.GithubUserService +import com.tencent.devops.repository.utils.scm.QualityUtils import com.tencent.devops.scm.config.GitConfig import com.tencent.devops.scm.exception.GithubApiException import com.tencent.devops.scm.pojo.Project @@ -137,7 +142,14 @@ class GithubService @Autowired constructor( ) { logger.warn("conclusion and completedAt must be null or not null together") } - + checkRuns.output?.let { + if (it.reportData?.second?.isNotEmpty() == true) { + it.text = QualityUtils.getQualityReport( + titleData = it.reportData!!.first, + resultData = it.reportData!!.second + ) + } + } val body = objectMapper.writeValueAsString(checkRuns) val request = buildPatch(token, "repos/$projectName/check-runs/$checkRunId", body) val operation = getMessageByLocale(OPERATION_UPDATE_CHECK_RUNS) @@ -430,6 +442,34 @@ class GithubService @Autowired constructor( return AuthorizeResult(200, "") } + override fun getAccessToken(userId: String): GithubToken? { + return githubTokenService.getAccessToken(userId) + } + + override fun getUser(token: String): GetUserResponse? { + return try { + githubUserService.getUser(token) + } catch (ignored: Exception) { + logger.warn("fail to get github user failed: $ignored") + null + } + } + + override fun getRepositoryPermissions(projectName: String, userId: String, token: String): RepositoryPermissions? { + return try { + githubRepositoryService.getRepositoryPermissions( + request = GetRepositoryPermissionsRequest( + repoName = projectName, + username = userId + ), + token = token + ) + } catch (ignored: Exception) { + logger.warn("get github repository permissions failed: $ignored") + null + } + } + companion object { private val logger = LoggerFactory.getLogger(GithubService::class.java) private const val PAGE_SIZE = 100 diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/IGithubService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/IGithubService.kt index 6fc85010310..9aeed354215 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/IGithubService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/github/IGithubService.kt @@ -32,6 +32,9 @@ import com.tencent.devops.repository.pojo.GithubCheckRuns import com.tencent.devops.repository.pojo.GithubCheckRunsResponse import com.tencent.devops.repository.pojo.github.GithubBranch import com.tencent.devops.repository.pojo.github.GithubTag +import com.tencent.devops.repository.pojo.github.GithubToken +import com.tencent.devops.repository.sdk.github.pojo.RepositoryPermissions +import com.tencent.devops.repository.sdk.github.response.GetUserResponse interface IGithubService { @@ -68,4 +71,10 @@ interface IGithubService { refreshToken: Boolean?, resetType: String? ): AuthorizeResult + + fun getAccessToken(userId: String): GithubToken? + + fun getUser(token: String): GetUserResponse? + + fun getRepositoryPermissions(projectName: String, userId: String, token: String): RepositoryPermissions? } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/permission/RepositoryAuthorizationService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/permission/RepositoryAuthorizationService.kt new file mode 100644 index 00000000000..f355a9ffed3 --- /dev/null +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/permission/RepositoryAuthorizationService.kt @@ -0,0 +1,122 @@ +package com.tencent.devops.repository.service.permission + +import com.tencent.devops.common.api.enums.RepositoryConfig +import com.tencent.devops.common.api.enums.RepositoryType +import com.tencent.devops.common.api.exception.PermissionForbiddenException +import com.tencent.devops.common.auth.api.AuthAuthorizationApi +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverDTO +import com.tencent.devops.common.auth.api.pojo.ResourceAuthorizationHandoverResult +import com.tencent.devops.common.auth.enums.ResourceAuthorizationHandoverStatus +import com.tencent.devops.repository.pojo.Repository +import com.tencent.devops.repository.service.RepositoryService +import org.slf4j.LoggerFactory +import org.springframework.stereotype.Service + +@Service +class RepositoryAuthorizationService constructor( + private val authAuthorizationApi: AuthAuthorizationApi, + private val repositoryService: RepositoryService +) { + fun batchModifyHandoverFrom( + projectId: String, + resourceAuthorizationHandoverList: List + ) { + authAuthorizationApi.batchModifyHandoverFrom( + projectId = projectId, + resourceAuthorizationHandoverList = resourceAuthorizationHandoverList + ) + } + + fun addResourceAuthorization( + projectId: String, + resourceAuthorizationList: List + ) { + authAuthorizationApi.addResourceAuthorization( + projectId = projectId, + resourceAuthorizationList = resourceAuthorizationList + ) + } + + fun resetRepositoryAuthorization( + projectId: String, + preCheck: Boolean, + resourceAuthorizationHandoverDTOs: List + ): Map> { + logger.info("reset repository authorization|$preCheck|$projectId|$resourceAuthorizationHandoverDTOs") + return authAuthorizationApi.resetResourceAuthorization( + projectId = projectId, + preCheck = preCheck, + resourceAuthorizationHandoverDTOs = resourceAuthorizationHandoverDTOs, + handoverResourceAuthorization = ::handoverRepositoryAuthorization + ) + } + + private fun handoverRepositoryAuthorization( + preCheck: Boolean, + resourceAuthorizationHandoverDTO: ResourceAuthorizationHandoverDTO + ): ResourceAuthorizationHandoverResult { + with(resourceAuthorizationHandoverDTO) { + val handoverTo = handoverTo!! + try { + val repositoryRecord = repositoryService.getRepository( + projectId = projectCode, + repositoryConfig = RepositoryConfig( + repositoryName = null, + repositoryHashId = resourceCode, + repositoryType = RepositoryType.ID + ) + ) + val repository = repositoryService.compose(repositoryRecord) + validateResourcePermission( + userId = resourceAuthorizationHandoverDTO.handoverTo!!, + projectCode = resourceAuthorizationHandoverDTO.projectCode, + repository = repository + ) + if (!preCheck) { + // 重置权限 + repositoryService.reOauth( + repository = repository, + repositoryRecord = repositoryRecord, + userId = handoverTo, + projectId = projectCode + ) + } + } catch (ignore: Exception) { + return ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.FAILED, + message = when (ignore) { + is PermissionForbiddenException -> ignore.defaultMessage + else -> ignore.message + } + ) + } + return ResourceAuthorizationHandoverResult( + status = ResourceAuthorizationHandoverStatus.SUCCESS + ) + } + } + + /** + * 校验资源权限 + * @param userId 用户名 + * @param projectCode 项目英文名称 + * @param repository 代码库关联信息 + */ + private fun validateResourcePermission( + userId: String, + projectCode: String, + repository: Repository + ) { + // 校验下载权限 + repositoryService.checkRepoDownloadPem( + userId = userId, + projectId = projectCode, + repository = repository + ) + } + + companion object { + private val logger = LoggerFactory.getLogger(RepositoryAuthorizationService::class.java) + } +} diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/ITGitService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/ITGitService.kt index 993e3ba4d89..369e93c8935 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/ITGitService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/ITGitService.kt @@ -37,6 +37,7 @@ import com.tencent.devops.repository.pojo.oauth.GitToken import com.tencent.devops.scm.code.git.api.GitBranch import com.tencent.devops.scm.code.git.api.GitTag import com.tencent.devops.scm.enums.GitAccessLevelEnum +import com.tencent.devops.scm.pojo.ChangeFileInfo import com.tencent.devops.scm.pojo.GitFileInfo import javax.servlet.http.HttpServletResponse @@ -95,4 +96,16 @@ interface ITGitService { owned: Boolean?, minAccessLevel: GitAccessLevelEnum? ): List + + fun getChangeFileList( + token: String, + tokenType: TokenTypeEnum, + gitProjectId: String, + from: String, + to: String, + straight: Boolean? = false, + page: Int, + pageSize: Int, + url: String + ): List } diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/TGitService.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/TGitService.kt index 7b0eaa8ec5a..f28867db192 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/TGitService.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/tgit/TGitService.kt @@ -50,7 +50,9 @@ import com.tencent.devops.scm.code.git.api.GitTag import com.tencent.devops.scm.code.git.api.GitTagCommit import com.tencent.devops.scm.config.GitConfig import com.tencent.devops.scm.enums.GitAccessLevelEnum +import com.tencent.devops.scm.pojo.ChangeFileInfo import com.tencent.devops.scm.pojo.GitFileInfo +import com.tencent.devops.scm.utils.code.git.GitUtils import java.net.URLEncoder import javax.servlet.http.HttpServletResponse import javax.ws.rs.core.Response @@ -77,7 +79,7 @@ class TGitService @Autowired constructor( "${gitConfig.tGitUrl}/oauth/token?client_id=${gitConfig.tGitClientId}" + "&client_secret=${gitConfig.tGitClientSecret}&code=$code" + "&grant_type=authorization_code&" + - "redirect_uri=${URLEncoder.encode(gitConfig.tGitWebhookUrl, "utf-8")}" + "redirect_uri=${urlEncode(gitConfig.tGitWebhookUrl)}" logger.info("getToken url>> $tokenUrl") val request = Request.Builder() .url(tokenUrl) @@ -150,7 +152,7 @@ class TGitService @Autowired constructor( val pageNotNull = page ?: 1 val pageSizeNotNull = pageSize ?: 20 logger.info("start to get the $userId's $repository branch by accessToken") - val repoId = URLEncoder.encode(repository, "utf-8") + val repoId = urlEncode(repository) val url = "${gitConfig.tGitApiUrl}/projects/$repoId/repository/branches" + "?access_token=$accessToken&page=$pageNotNull&per_page=$pageSizeNotNull" + if (search != null) { @@ -213,7 +215,7 @@ class TGitService @Autowired constructor( val pageNotNull = page ?: 1 val pageSizeNotNull = pageSize ?: 20 logger.info("start to get the $userId's $repository tag by page: $pageNotNull pageSize: $pageSizeNotNull") - val repoId = URLEncoder.encode(repository, "utf-8") + val repoId = urlEncode(repository) val url = "${gitConfig.tGitApiUrl}/projects/$repoId/repository/tags" + "?access_token=$accessToken&page=$pageNotNull&per_page=$pageSizeNotNull" val res = mutableListOf() @@ -274,8 +276,8 @@ class TGitService @Autowired constructor( ): String { val startEpoch = System.currentTimeMillis() try { - var url = "${gitConfig.tGitApiUrl}/projects/${URLEncoder.encode(repoName, "UTF-8")}/repository/blobs/" + - "${URLEncoder.encode(ref, "UTF-8")}?filepath=${URLEncoder.encode(filePath, "UTF-8")}" + var url = "${gitConfig.tGitApiUrl}/projects/${urlEncode(repoName)}/repository/blobs/" + + "${urlEncode(ref)}?filepath=${urlEncode(filePath)}" logger.info("[$repoName|$filePath|$authType|$ref] Start to get the git file content from $url") val request = if (authType == RepoAuthType.OAUTH) { @@ -317,9 +319,9 @@ class TGitService @Autowired constructor( ) { val startEpoch = System.currentTimeMillis() try { - val url = "${gitConfig.gitApiUrl}/projects/${URLEncoder.encode(repoName, "UTF-8")}/repository/" + - "blobs/${URLEncoder.encode(ref, "UTF-8")}?" + - "filepath=${URLEncoder.encode(filePath, "UTF-8")}&access_token=$token" + val url = "${gitConfig.gitApiUrl}/projects/${urlEncode(repoName)}/repository/" + + "blobs/${urlEncode(ref)}?" + + "filepath=${urlEncode(filePath)}&access_token=$token" val request = Request.Builder() .url(url) @@ -353,16 +355,16 @@ class TGitService @Autowired constructor( try { val url = StringBuilder( "${gitConfig.tGitApiUrl}/projects/" + - "${URLEncoder.encode(gitProjectId, "UTF-8")}/repository/tree" + "${urlEncode(gitProjectId)}/repository/tree" ) setToken(tokenType, url, token) with(url) { append( - "&path=${URLEncoder.encode(path, "UTF-8")}" + "&path=${urlEncode(path)}" ) append( if (!ref.isNullOrBlank()) { - "&ref_name=${URLEncoder.encode(ref, "UTF-8")}" + "&ref_name=${urlEncode(ref)}" } else { "" } @@ -457,6 +459,55 @@ class TGitService @Autowired constructor( return sb.toString() } + override fun getChangeFileList( + token: String, + tokenType: TokenTypeEnum, + gitProjectId: String, + from: String, + to: String, + straight: Boolean?, + page: Int, + pageSize: Int, + url: String + ): List { + val host = GitUtils.getGitApiUrl(apiUrl = gitConfig.tGitApiUrl, repoUrl = url) + val apiUrl = StringBuilder("$host/projects/${urlEncode(gitProjectId)}/" + + "repository/compare/changed_files/list") + setToken(tokenType, apiUrl, token) + val requestUrl = apiUrl.toString().addParams( + mapOf( + "from" to from, + "to" to to, + "straight" to straight, + "page" to page, + "pageSize" to pageSize + ) + ) + val res = mutableListOf() + val request = Request.Builder() + .url(requestUrl) + .get() + .build() + var result = res.toList() + logger.info("getChangeFileList: $requestUrl") + OkhttpUtils.doHttp(request).use { response -> + if (!response.isSuccessful) { + throw RemoteServiceException( + httpStatus = response.code, + errorMessage = "(${response.code})${response.message}" + ) + } + val data = response.body?.string() ?: return@use + val repoList = JsonParser().parse(data).asJsonArray + if (!repoList.isJsonNull) { + result = JsonUtil.to(data, object : TypeReference>() {}) + } + } + return result + } + + private fun urlEncode(s: String) = URLEncoder.encode(s, "UTF-8") + companion object { private val logger = LoggerFactory.getLogger(TGitService::class.java) private const val PAGE_SIZE = 100 diff --git a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/utils/scm/QualityUtils.kt b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/utils/scm/QualityUtils.kt index 01e483ff90f..6da598e6c1e 100644 --- a/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/utils/scm/QualityUtils.kt +++ b/src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/utils/scm/QualityUtils.kt @@ -37,10 +37,15 @@ object QualityUtils { val url = titleData[4] val pipelineNameTitle = titleData[5] val ruleName = titleData[6] - + // codecc开源扫描不需要展示title,只需要展示质量红线明细 + val (showTitle, pipelineLinkElement) = if (url.isBlank()) { + Pair(false, pipelineName) + } else { + Pair(true, "$pipelineName") + } val title = "" + "" + - "" + + "" + "" + "" + "" + @@ -72,6 +77,10 @@ object QualityUtils { } body.append("
$pipelineNameTitle：$pipelineName$pipelineLinkElement触发方式：$triggerType质量红线：
") - return title + body.toString() + return if (showTitle) { + title + body.toString() + } else { + body.toString() + } } } diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserAtomResource.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserAtomResource.kt index 4a2a23abeb7..194d5ff94a3 100644 --- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserAtomResource.kt +++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserAtomResource.kt @@ -49,6 +49,7 @@ import javax.ws.rs.Consumes import javax.ws.rs.DELETE import javax.ws.rs.GET import javax.ws.rs.HeaderParam +import javax.ws.rs.POST import javax.ws.rs.PUT import javax.ws.rs.Path import javax.ws.rs.PathParam @@ -206,4 +207,12 @@ interface UserAtomResource { @Parameter(description = "卸载插件请求包体", required = true) unInstallReq: UnInstallReq ): Result + + @Operation(summary = "批量获取插件输出信息") + @POST + @Path("/output/info/list") + fun getAtomOutputInfos( + @Parameter(description = "插件信息集合，格式：插件标识@版本号", required = true) + atomInfos: Set + ): Result?> } diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/OpStoreComponentResource.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/OpStoreComponentResource.kt index 59b82941628..a48548ca6d1 100644 --- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/OpStoreComponentResource.kt +++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/OpStoreComponentResource.kt @@ -26,6 +26,7 @@ */ package com.tencent.devops.store.api.common +import com.tencent.devops.common.api.annotation.BkInterfaceI18n 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.Page @@ -79,6 +80,10 @@ interface OpStoreComponentResource { @Operation(summary = "获取组件列表") @GET @Path("/types/{storeType}/component/list") + @BkInterfaceI18n( + keyPrefixNames = ["{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", + "releaseInfo"] + ) @Suppress("LongParameterList") fun listComponents( @Parameter(description = "userId", required = true) @@ -122,6 +127,10 @@ interface OpStoreComponentResource { @Operation(summary = "根据组件标识获取组件版本列表") @GET @Path("/types/{storeType}/codes/{storeCode}/component/version/list") + @BkInterfaceI18n( + keyPrefixNames = ["{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", + "releaseInfo"] + ) fun getComponentVersionsByCode( @Parameter(description = "userId", required = true) @HeaderParam(AUTH_HEADER_USER_ID) @@ -147,6 +156,9 @@ interface OpStoreComponentResource { @Operation(summary = "根据组件ID获取组件详情") @GET @Path("/types/{storeType}/ids/{storeId}/component/detail") + @BkInterfaceI18n( + keyPrefixNames = ["{data.storeType}", "{data.storeCode}", "{data.version}", "releaseInfo"] + ) fun getComponentDetailInfoById( @Parameter(description = "userId", required = true) @HeaderParam(AUTH_HEADER_USER_ID) diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/ServiceStoreComponentResource.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/ServiceStoreComponentResource.kt index dc7a6e220a3..80613600e52 100644 --- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/ServiceStoreComponentResource.kt +++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/ServiceStoreComponentResource.kt @@ -63,8 +63,7 @@ interface ServiceStoreComponentResource { @Path("/types/{storeType}/component/main/page/list") @GET @BkInterfaceI18n( - keyPrefixNames = [ - "{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", + keyPrefixNames = ["{data[*].records[*].type}", "{data[*].records[*].code}", "{data[*].records[*].version}", "releaseInfo" ] ) @@ -98,7 +97,7 @@ interface ServiceStoreComponentResource { @GET @BkInterfaceI18n( keyPrefixNames = [ - "{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", + "{data.records[*].type}", "{data.records[*].code}", "{data.records[*].version}", "releaseInfo" ] ) @@ -173,7 +172,7 @@ interface ServiceStoreComponentResource { @Path("/types/{storeType}/ids/{storeId}/component/detail") @BkInterfaceI18n( keyPrefixNames = [ - "{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", + "{data.storeType}", "{data.storeCode}", "{data.version}", "releaseInfo" ] ) diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/UserStoreComponentQueryResource.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/UserStoreComponentQueryResource.kt index 11b7e508bb7..c6cb9267aed 100644 --- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/UserStoreComponentQueryResource.kt +++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/api/common/UserStoreComponentQueryResource.kt @@ -119,8 +119,7 @@ interface UserStoreComponentQueryResource { @GET @Path("/types/{storeType}/ids/{storeId}/component/detail") @BkInterfaceI18n( - keyPrefixNames = ["{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", - "releaseInfo"] + keyPrefixNames = ["{data.storeType}", "{data.storeCode}", "{data.version}", "releaseInfo"] ) fun getComponentDetailInfoById( @Parameter(description = "userId", required = true) @@ -140,8 +139,7 @@ interface UserStoreComponentQueryResource { @GET @Path("/types/{storeType}/codes/{storeCode}/component/detail") @BkInterfaceI18n( - keyPrefixNames = ["{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", - "releaseInfo"] + keyPrefixNames = ["{data.storeType}", "{data.storeCode}", "{data.version}", "releaseInfo"] ) fun getComponentDetailInfoByCode( @Parameter(description = "userId", required = true) @@ -161,8 +159,9 @@ interface UserStoreComponentQueryResource { @Path("/types/{storeType}/component/main/page/list") @GET @BkInterfaceI18n( - keyPrefixNames = ["{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", - "releaseInfo"] + keyPrefixNames = ["{data[*].records[*].type}", "{data[*].records[*].code}", "{data[*].records[*].version}", + "releaseInfo" + ] ) @Suppress("LongParameterList") fun getMainPageComponents( @@ -193,8 +192,10 @@ interface UserStoreComponentQueryResource { @Path("/types/{storeType}/component/list") @GET @BkInterfaceI18n( - keyPrefixNames = ["{data.records[*].storeType}", "{data.records[*].storeCode}", "{data.records[*].version}", - "releaseInfo"] + keyPrefixNames = [ + "{data.records[*].type}", "{data.records[*].code}", "{data.records[*].version}", + "releaseInfo" + ] ) @Suppress("LongParameterList") fun queryComponents( diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/constant/StoreMessageCode.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/constant/StoreMessageCode.kt index 5addf12b76b..377c9b2e4fa 100644 --- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/constant/StoreMessageCode.kt +++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/constant/StoreMessageCode.kt @@ -91,8 +91,6 @@ object StoreMessageCode { const val GET_ATOM_LANGUAGE_ENV_INFO_FAILED = "2120039" // 获取插件开发语言相关的环境变量信息失败 // 研发商店：插件配置文件[task.json]config配置格式不正确,{0} const val TASK_JSON_CONFIG_IS_INVALID = "2120040" - // 研发商店：java插件配置文件[task.json]target配置不正确,java插件的target命令配置需要以java开头 - const val JAVA_ATOM_TASK_JSON_TARGET_IS_INVALID = "2120041" const val USER_TEMPLATE_VERSION_IS_NOT_FINISH = "2120201" // 研发商店：模板{0}的{1}版本发布未结束，请稍后再试 const val USER_TEMPLATE_RELEASE_STEPS_ERROR = "2120202" // 研发商店：模板发布流程状态变更顺序不正确 diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/common/MyStoreComponent.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/common/MyStoreComponent.kt index 7b68809be3f..9d03e9af195 100644 --- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/common/MyStoreComponent.kt +++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/common/MyStoreComponent.kt @@ -27,6 +27,8 @@ package com.tencent.devops.store.pojo.common +import com.tencent.devops.common.api.annotation.BkFieldI18n +import com.tencent.devops.common.api.enums.I18nSourceEnum import io.swagger.v3.oas.annotations.media.Schema @Schema(title = "研发商店-我的组件信息") @@ -38,6 +40,7 @@ data class MyStoreComponent( @get:Schema(title = "store组件类型", required = true) val storeType: String, @get:Schema(title = "store组件名称", required = true) + @BkFieldI18n(source = I18nSourceEnum.DB) val name: String, @get:Schema(title = "开发语言", required = false) val language: String? = null, diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/resources/UserAtomResourceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/resources/UserAtomResourceImpl.kt index 8b2ecc6111e..c90e610616a 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/resources/UserAtomResourceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/resources/UserAtomResourceImpl.kt @@ -31,6 +31,7 @@ import com.tencent.devops.common.api.pojo.Page import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.web.RestResource import com.tencent.devops.store.api.atom.UserAtomResource +import com.tencent.devops.store.atom.service.AtomPropService import com.tencent.devops.store.pojo.atom.AtomBaseInfoUpdateRequest import com.tencent.devops.store.pojo.atom.AtomResp import com.tencent.devops.store.pojo.atom.AtomRespItem @@ -42,8 +43,10 @@ import com.tencent.devops.store.atom.service.AtomService import org.springframework.beans.factory.annotation.Autowired @RestResource -class UserAtomResourceImpl @Autowired constructor(private val atomService: AtomService) : - UserAtomResource { +class UserAtomResourceImpl @Autowired constructor( + private val atomService: AtomService, + private val atomPropService: AtomPropService +) : UserAtomResource { override fun getPipelineAtom( projectCode: String, @@ -133,4 +136,8 @@ class UserAtomResourceImpl @Autowired constructor(private val atomService: AtomS ): Result { return atomService.uninstallAtom(userId, projectCode, atomCode, unInstallReq) } + + override fun getAtomOutputInfos(atomInfos: Set): Result?> { + return Result(atomPropService.getAtomOutputInfos(atomInfos)) + } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomBusHandleService.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomBusHandleService.kt index 3f87712e67a..75f80455e62 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomBusHandleService.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomBusHandleService.kt @@ -48,9 +48,4 @@ interface AtomBusHandleService { * 处理系统预置指令及用户（task.json.target）设置指令逻辑 */ fun handleTarget(reqTarget: String?, target: String): String - - /** - * 检查系统预置指令（task.json.target）设置指令逻辑 - */ - fun checkTarget(target: String): Boolean } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomPropService.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomPropService.kt index 562b5747857..14e6af6bc50 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomPropService.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/AtomPropService.kt @@ -39,4 +39,11 @@ interface AtomPropService { fun getAtomProps( atomCodes: Set ): Map? + + /** + * 获取插件输出信息 + * @param atomInfos 插件信息集合，格式：插件标识@版本号 + * @return 插件输出信息集合，格式：key-插件标识@版本号， value-插件输出对象 + */ + fun getAtomOutputInfos(atomInfos: Set): Map? } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomPropServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomPropServiceImpl.kt index 041334f0853..049b9231146 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomPropServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomPropServiceImpl.kt @@ -29,30 +29,54 @@ package com.tencent.devops.store.atom.service.impl import com.fasterxml.jackson.core.type.TypeReference import com.github.benmanes.caffeine.cache.Caffeine +import com.tencent.devops.common.api.constant.CommonMessageCode +import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.util.RegexUtils +import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.model.store.tables.TAtom +import com.tencent.devops.store.atom.dao.AtomDao import com.tencent.devops.store.atom.dao.AtomPropDao import com.tencent.devops.store.pojo.atom.AtomProp import com.tencent.devops.store.atom.service.AtomPropService +import com.tencent.devops.store.common.service.StoreI18nMessageService import com.tencent.devops.store.common.service.action.StoreDecorateFactory +import com.tencent.devops.store.common.utils.StoreUtils +import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum +import com.tencent.devops.store.pojo.common.ATOM_OUTPUT +import com.tencent.devops.store.pojo.common.enums.StoreTypeEnum import org.apache.commons.collections4.ListUtils import org.jooq.DSLContext import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service import java.util.concurrent.TimeUnit @Service class AtomPropServiceImpl @Autowired constructor( private val dslContext: DSLContext, - private val atomPropDao: AtomPropDao + private val atomPropDao: AtomPropDao, + private val atomDao: AtomDao, + private val storeI18nMessageService: StoreI18nMessageService ) : AtomPropService { + companion object { + private const val DEFAULT_MAX_QUERY_NUM = 100 + } + private val atomPropCache = Caffeine.newBuilder() .maximumSize(5000) .expireAfterWrite(6, TimeUnit.HOURS) .build() + private val atomOutputCache = Caffeine.newBuilder() + .maximumSize(5000) + .expireAfterWrite(6, TimeUnit.HOURS) + .build() + + @Value("\${store.maxQueryNum:100}") + private val maxQueryNum: Int = DEFAULT_MAX_QUERY_NUM + override fun getAtomProps(atomCodes: Set): Map? { var atomPropMap: MutableMap? = null // 从缓存中查找插件属性信息 @@ -91,7 +115,7 @@ class AtomPropServiceImpl @Autowired constructor( logoUrl = logoUrl?.let { StoreDecorateFactory.get(StoreDecorateFactory.Kind.HOST)?.decorate(logoUrl) as? String } - logoUrl = RegexUtils.trimProtocol(atomPropRecord[tAtom.LOGO_URL]) + logoUrl = RegexUtils.trimProtocol(logoUrl) val atomProp = AtomProp( atomCode = atomCode, os = JsonUtil.to(atomPropRecord[tAtom.OS], object : TypeReference>() {}), @@ -105,4 +129,50 @@ class AtomPropServiceImpl @Autowired constructor( } return atomPropMap } + + @Suppress("UNCHECKED_CAST") + override fun getAtomOutputInfos(atomInfos: Set): Map? { + // 检查查询的梳理是否超过了系统限制 + if (atomInfos.size > maxQueryNum) { + throw ErrorCodeException( + errorCode = CommonMessageCode.ERROR_QUERY_NUM_TOO_BIG, params = arrayOf(maxQueryNum.toString()) + ) + } + var atomOutputInfoMap: MutableMap? = null + atomInfos.forEach { atomInfo -> + // 获取请求用户的语言 + val language = I18nUtil.getRequestUserLanguage() + val cacheKey = "$atomInfo@$language" + // 从缓存中获取指定插件输出参数 + var outputInfo = atomOutputCache.getIfPresent(cacheKey) + if (atomOutputInfoMap == null) { + atomOutputInfoMap = mutableMapOf() + } + if (outputInfo != null) { + atomOutputInfoMap!![atomInfo] = outputInfo + } else { + // 获取插件标识和版本号 + val arrays = atomInfo.split("@") + val atomCode = arrays[0] + val version = arrays[1] + val atomRecord = atomDao.getPipelineAtom(dslContext, atomCode, version) ?: return@forEach + val propMap = JsonUtil.toMap(atomRecord.props) + val outputDataMap = propMap[ATOM_OUTPUT] as? Map + if (outputDataMap.isNullOrEmpty()) { + return@forEach + } + outputInfo = storeI18nMessageService.parseJsonStrI18nInfo( + jsonStr = JsonUtil.toJson(outputDataMap), keyPrefix = StoreUtils.getStoreFieldKeyPrefix( + storeType = StoreTypeEnum.ATOM, storeCode = atomCode, version = atomRecord.version + ) + ) + atomOutputInfoMap!![atomInfo] = outputInfo + if (AtomStatusEnum.getProcessingStatusList().contains(atomRecord.atomStatus)) { + // 把状态为非流程中状态的插件版本输出信息放入缓存 + atomOutputCache.put(cacheKey, outputInfo) + } + } + } + return atomOutputInfoMap + } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/CommonAtomBusHandleHandleServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/CommonAtomBusHandleHandleServiceImpl.kt index 1754bd44041..34346558783 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/CommonAtomBusHandleHandleServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/CommonAtomBusHandleHandleServiceImpl.kt @@ -42,8 +42,4 @@ class CommonAtomBusHandleHandleServiceImpl : AtomBusHandleService { override fun handleTarget(reqTarget: String?, target: String): String { return if (reqTarget.isNullOrBlank()) target else reqTarget } - - override fun checkTarget(target: String): Boolean { - return true - } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/GolangAtomBusHandleHandleServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/GolangAtomBusHandleHandleServiceImpl.kt index b92f2bd2532..bade45dce67 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/GolangAtomBusHandleHandleServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/GolangAtomBusHandleHandleServiceImpl.kt @@ -72,8 +72,4 @@ class GolangAtomBusHandleHandleServiceImpl : AtomBusHandleService { override fun handleTarget(reqTarget: String?, target: String): String { return if (reqTarget.isNullOrBlank()) target else reqTarget } - - override fun checkTarget(target: String): Boolean { - return true - } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/JavaAtomBusHandleHandleServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/JavaAtomBusHandleHandleServiceImpl.kt index 0c08d291d09..88b7a0ab3b9 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/JavaAtomBusHandleHandleServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/JavaAtomBusHandleHandleServiceImpl.kt @@ -28,9 +28,7 @@ package com.tencent.devops.store.atom.service.impl import com.tencent.devops.common.api.enums.OSType -import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.store.atom.service.AtomBusHandleService -import com.tencent.devops.store.constant.StoreMessageCode class JavaAtomBusHandleHandleServiceImpl : AtomBusHandleService { @@ -42,15 +40,6 @@ class JavaAtomBusHandleHandleServiceImpl : AtomBusHandleService { } } - override fun checkTarget(target: String): Boolean { - if (!target.startsWith("java")) { - throw ErrorCodeException( - errorCode = StoreMessageCode.JAVA_ATOM_TASK_JSON_TARGET_IS_INVALID - ) - } - return true - } - override fun handleOsArch(osName: String, osArch: String): String { // worker就是通过java取的osArch，故无需转换 return osArch @@ -60,12 +49,21 @@ class JavaAtomBusHandleHandleServiceImpl : AtomBusHandleService { if (reqTarget.isNullOrBlank()) { return target } - val javaPath = reqTarget.substringBefore("-jar").trim() - // 获取插件配置的JVM指令 - val jvmOptions = target.substringAfter("java").substringBefore("-jar").trim() - // 获取插件jar包路径 - val jarPath = reqTarget.substringAfter("-jar").trim() + // 获取启动命令的java路径 + val javaPath = reqTarget.substringBefore(" -").trim() + // 获取启动命令的前缀路径 + val prefixPath = target.substringBefore(getJarName(target)).substringAfter(target.substringBefore(" -")).trim() + // 获取插件jar包名称 + val jarName = getJarName(reqTarget) + // 获取启动命令的后缀路径 + val suffixPath = target.substringAfter(".jar").trim() + return "$javaPath $prefixPath $jarName $suffixPath".trim() + } - return "$javaPath $jvmOptions -jar $jarPath" + private fun getJarName(target: String): String { + val regex = Regex("(\\S+\\.jar)") + val matchResult = regex.find(target) + val jarName = matchResult?.value ?: "" + return jarName } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomCommonServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomCommonServiceImpl.kt index 6d652b31585..39b87f62679 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomCommonServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomCommonServiceImpl.kt @@ -454,7 +454,6 @@ class MarketAtomCommonServiceImpl : MarketAtomCommonService { params = arrayOf(KEY_TARGET) ) } - atomBusHandleService.checkTarget(target) val osArch = osExecutionInfoMap[KEY_OS_ARCH] as? String val defaultFlag = osExecutionInfoMap[KEY_DEFAULT_FLAG] as? Boolean ?: false // 统计每种操作系统默认环境配置数量 @@ -501,7 +500,6 @@ class MarketAtomCommonServiceImpl : MarketAtomCommonService { params = arrayOf(KEY_TARGET) ) } - atomBusHandleService.checkTarget(target) val pkgLocalPath = executionInfoMap[KEY_PACKAGE_PATH] as? String ?: "" val atomEnvRequest = AtomEnvRequest( userId = userId, diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/NodeJsAtomBusHandleHandleServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/NodeJsAtomBusHandleHandleServiceImpl.kt index a6fe4fdda53..a6c9b58a60e 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/NodeJsAtomBusHandleHandleServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/NodeJsAtomBusHandleHandleServiceImpl.kt @@ -76,8 +76,4 @@ class NodeJsAtomBusHandleHandleServiceImpl : AtomBusHandleService { } override fun handleTarget(reqTarget: String?, target: String): String = target - - override fun checkTarget(target: String): Boolean { - return true - } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/PythonAtomBusHandleHandleServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/PythonAtomBusHandleHandleServiceImpl.kt index 2a0b5b53154..74016d7e264 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/PythonAtomBusHandleHandleServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/PythonAtomBusHandleHandleServiceImpl.kt @@ -44,10 +44,6 @@ class PythonAtomBusHandleHandleServiceImpl : AtomBusHandleService { return target } - override fun checkTarget(target: String): Boolean { - return true - } - override fun handleOsArch(osName: String, osArch: String): String { // python插件目前没有用到osArch，无需转换 return osArch diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/SampleAtomReleaseServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/SampleAtomReleaseServiceImpl.kt index 9868e7a4016..e1d7949f49d 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/SampleAtomReleaseServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/SampleAtomReleaseServiceImpl.kt @@ -41,6 +41,7 @@ import com.tencent.devops.common.api.constant.SUCCESS import com.tencent.devops.common.api.constant.TEST import com.tencent.devops.common.api.constant.UNDO import com.tencent.devops.common.api.pojo.Result +import com.tencent.devops.common.redis.RedisLock import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.store.atom.service.SampleAtomReleaseService import com.tencent.devops.store.constant.StoreMessageCode @@ -49,6 +50,7 @@ import com.tencent.devops.store.pojo.atom.AtomReleaseRequest import com.tencent.devops.store.pojo.atom.MarketAtomCreateRequest import com.tencent.devops.store.pojo.atom.MarketAtomUpdateRequest import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum +import com.tencent.devops.store.pojo.common.STORE_LATEST_TEST_FLAG_KEY_PREFIX import com.tencent.devops.store.pojo.common.publication.ReleaseProcessItem import com.tencent.devops.store.pojo.common.enums.StoreTypeEnum import org.jooq.DSLContext @@ -89,7 +91,24 @@ class SampleAtomReleaseServiceImpl : SampleAtomReleaseService, AtomReleaseServic branch: String?, validOsNameFlag: Boolean?, validOsArchFlag: Boolean? - ) = Unit + ) { + val record = marketAtomDao.getAtomRecordById(dslContext, atomId) + record?.let { + RedisLock( + redisOperation, + "$STORE_LATEST_TEST_FLAG_KEY_PREFIX:${record.atomCode}", + 60L + ).use { redisLock -> + redisLock.lock() + marketAtomDao.setupAtomLatestTestFlag( + dslContext = dslContext, + userId = userId, + atomCode = record.atomCode, + atomId = atomId + ) + } + } + } override fun validateUpdateMarketAtomReq( userId: String, diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreBaseQueryDao.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreBaseQueryDao.kt index 99a427ff452..346e05033fe 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreBaseQueryDao.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreBaseQueryDao.kt @@ -139,12 +139,12 @@ class StoreBaseQueryDao { return with(TStoreBase.T_STORE_BASE) { val conditions = mutableListOf(STORE_CODE.`in`(storeCodes)) conditions.add(STORE_TYPE.eq(storeType.type.toByte())) + val testStatusEnumList = listOf( + StoreStatusEnum.TESTING, + StoreStatusEnum.AUDITING + ) if (testComponentFlag) { - val statusEnumList = listOf( - StoreStatusEnum.TESTING, - StoreStatusEnum.AUDITING - ) - conditions.add(STATUS.`in`(statusEnumList)) + conditions.add(STATUS.`in`(testStatusEnumList)) val subQuery = dslContext.select( STORE_CODE, STORE_TYPE, @@ -163,6 +163,7 @@ class StoreBaseQueryDao { .fetch() } else { conditions.add(LATEST_FLAG.eq(true)) + conditions.add(STATUS.notIn(testStatusEnumList)) dslContext.selectFrom(this) .where(conditions) .fetch() diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreProjectRelDao.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreProjectRelDao.kt index ac5f2962b24..2ebc12cae21 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreProjectRelDao.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreProjectRelDao.kt @@ -266,7 +266,8 @@ class StoreProjectRelDao { storeProjectTypes?.let { conditions.add(TYPE.`in`(storeProjectTypes)) } - instanceId?.let { + // 测试中的应用对应的调试项目下无需判断测试版本的应用已安装 + if (!instanceId.isNullOrBlank() && storeProjectTypes?.contains(StoreProjectTypeEnum.TEST.type.toByte()) != true) { conditions.add(INSTANCE_ID.eq(instanceId)) } val baseQuery = dslContext.select(STORE_CODE, VERSION) @@ -574,4 +575,19 @@ class StoreProjectRelDao { .execute() } } + + fun getInitProjectInfoByStoreCode( + dslContext: DSLContext, + storeCode: String, + storeType: Byte + ): TStoreProjectRelRecord? { + with(TStoreProjectRel.T_STORE_PROJECT_REL) { + return dslContext.selectFrom(this) + .where(STORE_CODE.eq(storeCode) + .and(STORE_TYPE.eq(storeType)) + .and(TYPE.eq(StoreProjectTypeEnum.INIT.type.toByte())) + ) + .fetchOne() + } + } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/resources/OpStoreMemberResourceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/resources/OpStoreMemberResourceImpl.kt index e903334ffd5..d46fa1de44e 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/resources/OpStoreMemberResourceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/resources/OpStoreMemberResourceImpl.kt @@ -80,6 +80,12 @@ class OpStoreMemberResourceImpl : OpStoreMemberResource { } private fun getStoreMemberService(storeType: StoreTypeEnum): StoreMemberService { - return SpringContextUtil.getBean(StoreMemberService::class.java, "${storeType.name.lowercase()}MemberService") + val beanName = "${storeType.name.lowercase()}MemberService" + return if (SpringContextUtil.isBeanExist(beanName)) { + SpringContextUtil.getBean(StoreMemberService::class.java, beanName) + } else { + // 获取默认的成员bean对象 + SpringContextUtil.getBean(StoreMemberService::class.java) + } } } diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt index 7da9c718d60..092d3aa6e55 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt @@ -769,7 +769,6 @@ class StoreComponentQueryServiceImpl : StoreComponentQueryService { ) { val projectCode = storeInfoQuery.projectCode!! val storeType = StoreTypeEnum.valueOf(storeInfoQuery.storeType) - val validStoreCodes = mutableSetOf() // 查询项目下已安装的组件版本信息 val installComponentMap = storeProjectService.getProjectComponents( projectCode = projectCode, @@ -779,7 +778,6 @@ class StoreComponentQueryServiceImpl : StoreComponentQueryService { ), instanceId = storeInfoQuery.instanceId ) ?: emptyMap() - validStoreCodes.addAll(installComponentMap.keys) // 查询项目下可调试的组件版本信息 val testComponentMap = storeProjectService.getProjectComponents( projectCode = projectCode, @@ -789,25 +787,25 @@ class StoreComponentQueryServiceImpl : StoreComponentQueryService { ), instanceId = storeInfoQuery.instanceId ) ?: emptyMap() - validStoreCodes.addAll(testComponentMap.keys) val publicComponentList = storeBaseFeatureQueryDao.getAllPublicComponent(dslContext, storeType) - validStoreCodes.addAll(publicComponentList) val tStoreBase = TStoreBase.T_STORE_BASE - // 查询非测试或者审核中组件最新发布版本信息 - val componentVersionMap = storeBaseQueryDao.getValidComponentsByCodes( - dslContext = dslContext, - storeCodes = validStoreCodes, - storeType = storeType, - testComponentFlag = false - ).intoMap({ it[tStoreBase.STORE_CODE] }, { it[tStoreBase.VERSION] }).toMutableMap() // 查询测试或者审核中组件最新版本信息 val testComponentVersionMap = storeBaseQueryDao.getValidComponentsByCodes( dslContext = dslContext, - storeCodes = validStoreCodes, + storeCodes = testComponentMap.keys.plus(publicComponentList), storeType = storeType, testComponentFlag = true ).intoMap({ it[tStoreBase.STORE_CODE] }, { it[tStoreBase.VERSION] }) val testStoreCodes = testComponentVersionMap.keys + // 查询非测试或者审核中组件最新发布版本信息 + val normalStoreCodes = installComponentMap.keys.plus(publicComponentList).toMutableSet() + normalStoreCodes.removeAll(testStoreCodes) + val componentVersionMap = storeBaseQueryDao.getValidComponentsByCodes( + dslContext = dslContext, + storeCodes = normalStoreCodes, + storeType = storeType, + testComponentFlag = false + ).intoMap({ it[tStoreBase.STORE_CODE] }, { it[tStoreBase.VERSION] }).toMutableMap() componentVersionMap.putAll(testComponentVersionMap) // 比较当前安装的版本与组件最新版本 val finalNormalStoreCodes = mutableSetOf() diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt index 0b420f5f231..6eabb73ba41 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt @@ -373,19 +373,26 @@ class StoreProjectServiceImpl @Autowired constructor( dslContext.transaction { configuration -> val context = DSL.using(configuration) // 获取组件当前初始化项目 - val initProjectCode = storeProjectRelDao.getInitProjectCodeByStoreCode( + val initProjectInfo = storeProjectRelDao.getInitProjectInfoByStoreCode( dslContext = context, storeCode = storeProjectInfo.storeCode, storeType = storeProjectInfo.storeType.type.toByte() )!! // 更新组件关联初始化项目 storeProjectRelDao.updateStoreInitProject(context, userId, storeProjectInfo) + storeProjectRelDao.deleteUserStoreTestProject( + dslContext = context, + userId = initProjectInfo.creator, + storeType = storeProjectInfo.storeType, + storeCode = storeProjectInfo.storeCode, + storeProjectType = StoreProjectTypeEnum.TEST + ) storeProjectRelDao.addStoreProjectRel( dslContext = context, userId = userId, storeType = storeProjectInfo.storeType.type.toByte(), storeCode = storeProjectInfo.storeCode, - projectCode = initProjectCode, + projectCode = storeProjectInfo.projectId, type = StoreProjectTypeEnum.TEST.type.toByte() ) val storePipelineRel = storePipelineRelDao.getStorePipelineRel( @@ -400,7 +407,7 @@ class StoreProjectServiceImpl @Autowired constructor( userId = userId, pipelineId = it.pipelineId, channelCode = ChannelCode.AM, - projectId = initProjectCode, + projectId = initProjectInfo.projectCode, checkFlag = false ) } diff --git a/src/backend/ci/core/stream/api-stream/src/main/kotlin/com/tencent/devops/stream/pojo/message/UserMessageType.kt b/src/backend/ci/core/stream/api-stream/src/main/kotlin/com/tencent/devops/stream/pojo/message/UserMessageType.kt index 6e497f56d16..df10860ed63 100644 --- a/src/backend/ci/core/stream/api-stream/src/main/kotlin/com/tencent/devops/stream/pojo/message/UserMessageType.kt +++ b/src/backend/ci/core/stream/api-stream/src/main/kotlin/com/tencent/devops/stream/pojo/message/UserMessageType.kt @@ -31,8 +31,14 @@ package com.tencent.devops.stream.pojo.message * 用户消息通知的类型 */ enum class UserMessageType { - // 有失败的消息组 + // 有失败的消息组 最终状态 REQUEST, - // 只有成功的消息组 - ONLY_SUCCESS + // 只有成功的消息组 最终或中间状态 + ONLY_SUCCESS; + + companion object { + fun parse(message: String): UserMessageType { + return values().find { it.name == message } ?: REQUEST + } + } } diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/pojo/UserMessageData.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/pojo/UserMessageData.kt new file mode 100644 index 00000000000..7cc79f1586f --- /dev/null +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/pojo/UserMessageData.kt @@ -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.stream.pojo + +data class UserMessageData( + val projectId: String, + val userId: String, + val messageId: String, + val messageType: String, + val messageTitle: String +) diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamPipelineService.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamPipelineService.kt index 4300ec6fac0..77f37ee70ac 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamPipelineService.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamPipelineService.kt @@ -33,12 +33,13 @@ import com.tencent.devops.common.api.util.PageUtil import com.tencent.devops.common.client.Client import com.tencent.devops.common.pipeline.Model import com.tencent.devops.common.pipeline.enums.ChannelCode +import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting import com.tencent.devops.common.redis.RedisLock import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.model.stream.tables.records.TGitPipelineResourceRecord import com.tencent.devops.process.api.service.ServicePipelineResource -import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting import com.tencent.devops.process.yaml.v2.utils.ScriptYmlUtils +import com.tencent.devops.project.api.service.ServiceProjectResource import com.tencent.devops.stream.config.StreamGitConfig import com.tencent.devops.stream.dao.GitPipelineResourceDao import com.tencent.devops.stream.dao.GitRequestEventBuildDao @@ -391,6 +392,13 @@ class StreamPipelineService @Autowired constructor( gitProjectId = gitProjectId.toLong(), scmType = gitConfig.getScmType() ) + val pipelineAsCodeSettings = try { + client.get(ServiceProjectResource::class).get(gitProjectCode) + .data?.properties?.pipelineAsCodeSettings + } catch (ignore: Throwable) { + logger.warn("StreamYamlTrigger get project[$gitProjectCode] as code settings error.", ignore) + null + } val realPipeline: StreamTriggerPipeline // 避免出现多个触发拿到空的pipelineId后依次进来创建，所以需要在锁后重新获取pipeline triggerLock.use { @@ -404,7 +412,10 @@ class StreamPipelineService @Autowired constructor( userId = userId, gitProjectId = gitProjectId.toLong(), projectCode = gitProjectCode, - modelAndSetting = StreamPipelineUtils.createEmptyPipelineAndSetting(realPipeline.displayName), + modelAndSetting = StreamPipelineUtils.createEmptyPipelineAndSetting( + realPipeline.displayName, + pipelineAsCodeSettings + ), updateLastModifyUser = true, branch = branch, // 空model计算md5没有意义，直接传空 diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/BaseManualTriggerService.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/BaseManualTriggerService.kt index c1c11fa71bf..d52b0eb580b 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/BaseManualTriggerService.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/BaseManualTriggerService.kt @@ -103,6 +103,7 @@ abstract class BaseManualTriggerService @Autowired constructor( triggerBuildReq = triggerBuildReq ) + action.data.watcherStart("baseManualTriggerService.triggerBuild") val buildPipeline = gitPipelineResourceDao.getPipelineById( dslContext = dslContext, gitProjectId = action.data.getGitProjectId().toLong(), @@ -250,7 +251,7 @@ abstract class BaseManualTriggerService @Autowired constructor( ) var buildId: BuildId? = null - StreamTriggerExceptionHandlerUtil.handleManualTrigger { + StreamTriggerExceptionHandlerUtil.handleManualTrigger(action) { buildId = trigger(action, originYaml, triggerBuildReq) } return buildId @@ -262,6 +263,7 @@ abstract class BaseManualTriggerService @Autowired constructor( originYaml: String, triggerBuildReq: TriggerBuildReq ): BuildId? { + action.data.watcherStart("baseManualTriggerService.trigger") val yamlReplaceResult = streamYamlTrigger.prepareCIBuildYaml(action)!! val parsedYaml = if (action.metaData.streamObjectKind.needInput()) { YamlCommonUtils.toYamlNotNull( diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestRepoService.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestRepoService.kt index 546351076b1..88d2406aa31 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestRepoService.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestRepoService.kt @@ -90,6 +90,7 @@ class StreamTriggerRequestRepoService @Autowired constructor( actionSetting = null )!! + action.data.watcherStart("streamTriggerRequestRepoService.repoTriggerBuild") action.data.context.repoTrigger = RepoTrigger("", triggerPipelineList) logger.info( @@ -139,6 +140,7 @@ class StreamTriggerRequestRepoService @Autowired constructor( private fun triggerPerPipeline( action: BaseAction ): Boolean { + action.data.watcherStart("streamTriggerRequestRepoService.triggerPerPipeline") logger.info( "StreamTriggerRequestRepoService|triggerPerPipeline" + "|requestEventId|${action.data.context.requestEventId}" diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestService.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestService.kt index 0a487a9f078..c4254d94db3 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestService.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamTriggerRequestService.kt @@ -134,6 +134,7 @@ class StreamTriggerRequestService @Autowired constructor( logger.warn("StreamTriggerRequestService|start|request event not support|$event") return false } + action.data.watcherStart("streamTriggerRequestService.start") val eventCommon = action.data.eventCommon // 初始化setting @@ -205,6 +206,7 @@ class StreamTriggerRequestService @Autowired constructor( private fun checkRequest( action: BaseAction ): Boolean { + action.data.watcherStart("streamTriggerRequestService.checkRequest") logger.info( "StreamTriggerRequestService|checkRequest" + "|requestEventId|${action.data.context.requestEventId}|action|${action.format()}" @@ -257,6 +259,7 @@ class StreamTriggerRequestService @Autowired constructor( action: BaseAction, path2PipelineExists: Map ): Boolean { + action.data.watcherStart("streamTriggerRequestService.matchAndTriggerPipeline") logger.info( "StreamTriggerRequestService|matchAndTriggerPipeline" + "|requestEventId|${action.data.context.requestEventId}|action|${action.format()}" diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBaseBuild.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBaseBuild.kt index 45351cb3065..e45219ab496 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBaseBuild.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBaseBuild.kt @@ -34,6 +34,7 @@ import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatch import com.tencent.devops.common.pipeline.Model import com.tencent.devops.common.pipeline.enums.ChannelCode import com.tencent.devops.common.pipeline.pojo.BuildParameters +import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.model.stream.tables.records.TGitPipelineResourceRecord @@ -45,7 +46,6 @@ import com.tencent.devops.process.pojo.BuildId import com.tencent.devops.process.pojo.BuildTemplateAcrossInfo import com.tencent.devops.process.pojo.TemplateAcrossInfoType import com.tencent.devops.process.pojo.code.PipelineBuildCommit -import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting import com.tencent.devops.process.pojo.webhook.WebhookTriggerParams import com.tencent.devops.process.utils.PIPELINE_NAME import com.tencent.devops.process.yaml.v2.enums.TemplateType @@ -262,7 +262,10 @@ class StreamYamlBaseBuild @Autowired constructor( userId = pipeline.creator ?: "", gitProjectId = gitProjectId.toLong(), projectCode = projectCode, - modelAndSetting = StreamPipelineUtils.createEmptyPipelineAndSetting(pipeline.displayName), + modelAndSetting = StreamPipelineUtils.createEmptyPipelineAndSetting( + pipeline.displayName, + action.data.context.pipelineAsCodeSettings + ), updateLastModifyUser = true ) streamPipelineBranchService.saveOrUpdate( @@ -338,6 +341,7 @@ class StreamYamlBaseBuild @Autowired constructor( gitRequestEventDao.updateChangeYamlList(dslContext, action.data.context.requestEventId!!, forkMrYamlList) } + action.data.watcherStart("streamYamlBaseBuild.startBuild.StreamBuildLock") // 修改流水线并启动构建，需要加锁保证事务性 val buildLock = StreamBuildLock( redisOperation = redisOperation, @@ -468,6 +472,7 @@ class StreamYamlBaseBuild @Autowired constructor( gitBuildId: Long, yamlTransferData: YamlTransferData? ) { + action.data.watcherStart("streamYamlBaseBuild.afterStartBuild") try { val event = gitRequestEventDao.getWithEvent( dslContext = dslContext, id = action.data.context.requestEventId!! @@ -477,8 +482,7 @@ class StreamYamlBaseBuild @Autowired constructor( projectCode = action.getProjectCode(), event = event, gitProjectId = action.data.getGitProjectId().toLong(), - messageType = UserMessageType.ONLY_SUCCESS, - isSave = true + messageType = UserMessageType.ONLY_SUCCESS ) if (action is StreamRepoTriggerAction) { diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBuild.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBuild.kt index 2d8fd82c68e..aa7d65db8cc 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBuild.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlBuild.kt @@ -155,6 +155,7 @@ class StreamYamlBuild @Autowired constructor( yamlTransferData: YamlTransferData?, manualInputs: Map? ): BuildId? { + action.data.watcherStart("streamYamlBuild.gitStartBuild") logger.info( "StreamYamlBuild|gitStartBuild" + "|eventId|${action.data.context.requestEventId}|action|${action.format()}" @@ -187,7 +188,10 @@ class StreamYamlBuild @Autowired constructor( userId = action.data.getUserId(), gitProjectId = action.data.eventCommon.gitProjectId.toLong(), projectCode = action.getProjectCode(), - modelAndSetting = StreamPipelineUtils.createEmptyPipelineAndSetting(realPipeline.displayName), + modelAndSetting = StreamPipelineUtils.createEmptyPipelineAndSetting( + realPipeline.displayName, + action.data.context.pipelineAsCodeSettings + ), updateLastModifyUser = true ) } @@ -235,6 +239,7 @@ class StreamYamlBuild @Autowired constructor( TriggerReason.PIPELINE_PREPARE_ERROR ) } + is QualityRulesException -> { Triple( false, @@ -246,6 +251,7 @@ class StreamYamlBuild @Autowired constructor( is StreamTriggerBaseException, is ErrorCodeException -> { throw e } + else -> { logger.warn("StreamYamlBuild|gitStartBuild|${action.data.context.requestEventId}|error", e) Triple(false, e.message, TriggerReason.UNKNOWN_ERROR) @@ -320,6 +326,7 @@ class StreamYamlBuild @Autowired constructor( yamlTransferData: YamlTransferData?, manualInputs: Map? ): BuildId? { + action.data.watcherStart("streamYamlBuild.startBuildPipeline") logger.info( "StreamYamlBuild|startBuildPipeline" + "|requestEventId|${action.data.context.requestEventId}|action|${action.format()}" @@ -399,6 +406,7 @@ class StreamYamlBuild @Autowired constructor( // 判断是否更新最后修改人 val updateLastModifyUser = action.needUpdateLastModifyUser(pipeline.filePath) + action.data.watcherStart("streamYamlBuild.savePipeline.StreamBuildLock") StreamBuildLock( redisOperation = redisOperation, gitProjectId = action.data.getGitProjectId().toLong(), diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlTrigger.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlTrigger.kt index 524d3ad9560..4ca35b79585 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlTrigger.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/StreamYamlTrigger.kt @@ -111,9 +111,9 @@ class StreamYamlTrigger @Autowired constructor( action: BaseAction, trigger: String? ) { - logger.info("|${action.data.context.requestEventId}|checkAndTrigger|action|${action.format()}") val buildPipeline = action.data.context.pipeline!! - + action.data.watcherStart("|${buildPipeline.pipelineId}|streamYamlTrigger.checkAndTrigger") + logger.info("|${action.data.context.requestEventId}|checkAndTrigger|action|${action.format()}") val filePath = buildPipeline.filePath // 流水线未启用则跳过 if (!buildPipeline.enabled) { @@ -177,6 +177,7 @@ class StreamYamlTrigger @Autowired constructor( yamlSchemaCheck.check(action = action, templateType = null, isCiFile = true) // 进入触发流程 + action.data.watcherStart("streamYamlTrigger.trigger") trigger(action, triggerEvent) } @@ -193,12 +194,31 @@ class StreamYamlTrigger @Autowired constructor( action: BaseAction, triggerEvent: Pair?, TriggerResult>? ): Boolean { + action.data.watcherStart("streamYamlTrigger.triggerBuild") logger.info( "StreamYamlTrigger|triggerBuild|requestEventId" + "|${action.data.context.requestEventId}|action|${action.format()}" ) var pipeline = action.data.context.pipeline!! + // 获取蓝盾流水线的pipelineAsCodeSetting + val projectCode = GitCommonUtils.getCiProjectId(pipeline.gitProjectId.toLong(), streamGitConfig.getScmType()) + action.data.context.pipelineAsCodeSettings = try { + if (pipeline.pipelineId.isNotBlank()) { + client.get(ServicePipelineSettingResource::class).getPipelineSetting( + projectId = projectCode, + pipelineId = pipeline.pipelineId, + channelCode = ChannelCode.GIT + ).data?.pipelineAsCodeSettings + } else { + client.get(ServiceProjectResource::class).get(projectCode) + .data?.properties?.pipelineAsCodeSettings + } + } catch (ignore: Throwable) { + logger.warn("StreamYamlTrigger get project[$projectCode] as code settings error.", ignore) + null + } + // 提前创建新流水线，保证git提交后 stream上能看到 if (pipeline.pipelineId.isBlank()) { pipeline = StreamTriggerPipeline( @@ -225,24 +245,6 @@ class StreamYamlTrigger @Autowired constructor( ) } - // 获取蓝盾流水线的pipelineAsCodeSetting - val projectCode = GitCommonUtils.getCiProjectId(pipeline.gitProjectId.toLong(), streamGitConfig.getScmType()) - action.data.context.pipelineAsCodeSettings = try { - if (pipeline.pipelineId.isNotBlank()) { - client.get(ServicePipelineSettingResource::class).getPipelineSetting( - projectId = projectCode, - pipelineId = pipeline.pipelineId, - channelCode = ChannelCode.GIT - ).data?.pipelineAsCodeSettings - } else { - client.get(ServiceProjectResource::class).get(projectCode) - .data?.properties?.pipelineAsCodeSettings - } - } catch (ignore: Throwable) { - logger.warn("StreamYamlTrigger get project[$projectCode] as code settings error.", ignore) - null - } - // 拼接插件时会需要传入GIT仓库信息需要提前刷新下状态，只有url或者名称不对才更新 val gitProjectInfo = action.api.getGitProjectInfo( action.getGitCred(), diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/EventActionFactory.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/EventActionFactory.kt index c234c80405c..dcb2e8750e7 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/EventActionFactory.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/EventActionFactory.kt @@ -30,8 +30,10 @@ package com.tencent.devops.stream.trigger.actions import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import com.tencent.devops.common.api.enums.ScmType +import com.tencent.devops.common.api.util.Watcher import com.tencent.devops.common.client.Client import com.tencent.devops.common.redis.RedisOperation +import com.tencent.devops.common.service.trace.TraceTag import com.tencent.devops.common.webhook.pojo.code.CodeWebhookEvent import com.tencent.devops.common.webhook.pojo.code.git.GitEvent import com.tencent.devops.common.webhook.pojo.code.git.GitIssueEvent @@ -79,6 +81,7 @@ import com.tencent.devops.stream.trigger.service.StreamTriggerTokenService import com.tencent.devops.stream.trigger.timer.service.StreamTimerService import org.jooq.DSLContext import org.slf4j.LoggerFactory +import org.slf4j.MDC import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -111,7 +114,6 @@ class EventActionFactory @Autowired constructor( fun load(event: CodeWebhookEvent): BaseAction? { val action = loadEvent(event) ?: return null - return action.init() } @@ -133,6 +135,7 @@ class EventActionFactory @Autowired constructor( return null } } + ScmType.GITHUB -> { when (actionCommonData.eventType) { GithubPushEvent.classType -> objectMapper.readValue(eventStr) @@ -143,6 +146,7 @@ class EventActionFactory @Autowired constructor( } } } + else -> TODO("对接其他Git平台时需要补充") } @@ -177,6 +181,7 @@ class EventActionFactory @Autowired constructor( ScmType.CODE_GIT -> { objectMapper.readValue(event) } + ScmType.GITHUB -> { when (objectKind) { StreamObjectKind.PULL_REQUEST.value -> objectMapper.readValue(event) @@ -185,6 +190,7 @@ class EventActionFactory @Autowired constructor( else -> throw IllegalArgumentException("$objectKind in github load action not support yet") } } + else -> TODO("对接其他Git平台时需要补充") } @@ -206,6 +212,7 @@ class EventActionFactory @Autowired constructor( ) tGitPushAction } + is GitMergeRequestEvent -> { val tGitMrAction = TGitMrActionGit( dslContext = dslContext, @@ -218,6 +225,7 @@ class EventActionFactory @Autowired constructor( ) tGitMrAction } + is GitTagPushEvent -> { val tGitTagPushAction = TGitTagPushActionGit( apiService = tGitApiService, @@ -225,6 +233,7 @@ class EventActionFactory @Autowired constructor( ) tGitTagPushAction } + is GitIssueEvent -> { val tGitIssueAction = TGitIssueActionGit( dslContext = dslContext, @@ -234,6 +243,7 @@ class EventActionFactory @Autowired constructor( ) tGitIssueAction } + is GitReviewEvent -> { val tGitReviewAction = TGitReviewActionGit( dslContext = dslContext, @@ -243,6 +253,7 @@ class EventActionFactory @Autowired constructor( ) tGitReviewAction } + is GitNoteEvent -> { val tGitNoteAction = TGitNoteActionGit( dslContext = dslContext, @@ -252,6 +263,7 @@ class EventActionFactory @Autowired constructor( ) tGitNoteAction } + is GithubPushEvent -> { when { event.ref.startsWith("refs/heads/") -> GithubPushActionGit( @@ -266,13 +278,16 @@ class EventActionFactory @Autowired constructor( pipelineDelete = pipelineDelete, gitCheckService = gitCheckService ) + event.ref.startsWith("refs/tags/") -> GithubTagPushActionGit( apiService = githubApiService, gitCheckService = gitCheckService ) + else -> return null } } + is GithubPullRequestEvent -> { GithubPRActionGit( apiService = githubApiService, @@ -284,6 +299,7 @@ class EventActionFactory @Autowired constructor( dslContext = dslContext ) } + else -> { return null } @@ -295,9 +311,11 @@ class EventActionFactory @Autowired constructor( gitAction.isStreamDeleteAction() -> { StreamDeleteAction(gitAction) } + else -> gitAction } + action.data.watcher = Watcher("stream_action_watcher|${MDC.get(TraceTag.BIZID)}") return action } diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/data/ActionData.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/data/ActionData.kt index e10f438db25..020b4d8808d 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/data/ActionData.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/data/ActionData.kt @@ -27,6 +27,7 @@ package com.tencent.devops.stream.trigger.actions.data +import com.tencent.devops.common.api.util.Watcher import com.tencent.devops.common.webhook.pojo.code.CodeWebhookEvent import com.tencent.devops.stream.trigger.actions.data.context.StreamTriggerContext @@ -42,10 +43,18 @@ data class ActionData( ) { // 需要根据各事件源的event去拿的通用数据，随event改变可能会不同 lateinit var eventCommon: EventCommonData + lateinit var watcher: Watcher // Stream触发时需要的配置信息 lateinit var setting: StreamTriggerSetting val isSettingInitialized get() = this::setting.isInitialized + val isWatcherInitialized get() = this::watcher.isInitialized + + fun watcherStart(id: String) { + if (isWatcherInitialized) { + watcher.start(id) + } + } // 方便日志打印 fun format() = "${event::class.qualifiedName}|$context|$eventCommon|$setting" diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandler.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandler.kt index 590d3221dbc..239407b7122 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandler.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandler.kt @@ -28,6 +28,7 @@ package com.tencent.devops.stream.trigger.exception.handler import com.tencent.devops.common.api.exception.ErrorCodeException +import com.tencent.devops.common.service.utils.LogUtils import com.tencent.devops.process.yaml.v2.enums.StreamObjectKind import com.tencent.devops.stream.pojo.enums.TriggerReason import com.tencent.devops.stream.trigger.actions.BaseAction @@ -84,6 +85,11 @@ class StreamTriggerExceptionHandler @Autowired constructor( logger.error("BKSystemErrorMonitor|StreamTriggerExceptionHandler|action|${action.format()}", e) return null } + } finally { + if (action.data.isWatcherInitialized) { + action.data.watcher.stop() + LogUtils.printCostTimeWE(action.data.watcher, warnThreshold = 1000, errorThreshold = 5000) + } } } diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandlerUtil.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandlerUtil.kt index 97938e6184b..1a5e8454426 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandlerUtil.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/exception/handler/StreamTriggerExceptionHandlerUtil.kt @@ -29,9 +29,11 @@ package com.tencent.devops.stream.trigger.exception.handler import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.exception.OauthForbiddenException +import com.tencent.devops.common.service.utils.LogUtils import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.stream.common.exception.ErrorCodeEnum import com.tencent.devops.stream.pojo.enums.TriggerReason +import com.tencent.devops.stream.trigger.actions.BaseAction import com.tencent.devops.stream.trigger.exception.StreamTriggerBaseException import com.tencent.devops.stream.trigger.exception.StreamTriggerException import com.tencent.devops.stream.trigger.exception.StreamTriggerThirdException @@ -39,9 +41,12 @@ import com.tencent.devops.stream.trigger.exception.StreamTriggerThirdException @Suppress("ALL") object StreamTriggerExceptionHandlerUtil { - fun handleManualTrigger(action: () -> Unit) { + fun handleManualTrigger( + action: BaseAction, + f: () -> Unit + ) { try { - action() + f() } catch (e: Throwable) { val (errorCode, message) = when (e) { is OauthForbiddenException -> { @@ -81,6 +86,11 @@ object StreamTriggerExceptionHandlerUtil { params = arrayOf(message ?: "None"), defaultMessage = message ) + } finally { + if (action.data.isWatcherInitialized) { + action.data.watcher.stop() + LogUtils.printCostTimeWE(action.data.watcher, warnThreshold = 1000, errorThreshold = 5000) + } } } diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/StreamEventService.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/StreamEventService.kt index 6764ac2a25b..018f66214c2 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/StreamEventService.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/StreamEventService.kt @@ -28,21 +28,18 @@ package com.tencent.devops.stream.trigger.service import com.tencent.devops.common.api.exception.ParamBlankException -import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.stream.config.StreamGitConfig import com.tencent.devops.stream.constant.StreamMessageCode.STARTUP_CONFIG_MISSING import com.tencent.devops.stream.dao.GitRequestEventBuildDao import com.tencent.devops.stream.dao.GitRequestEventDao import com.tencent.devops.stream.dao.GitRequestEventNotBuildDao -import com.tencent.devops.stream.dao.StreamUserMessageDao import com.tencent.devops.stream.pojo.GitRequestEvent import com.tencent.devops.stream.pojo.enums.TriggerReason import com.tencent.devops.stream.pojo.message.UserMessageType import com.tencent.devops.stream.service.StreamGitProjectInfoCache import com.tencent.devops.stream.service.StreamWebsocketService import com.tencent.devops.stream.trigger.actions.BaseAction -import com.tencent.devops.stream.trigger.pojo.StreamMessageSaveLock import com.tencent.devops.stream.trigger.pojo.enums.StreamCommitCheckState import com.tencent.devops.stream.trigger.pojo.enums.toGitState import com.tencent.devops.stream.trigger.service.GitCheckService.Companion.GIT_COMMIT_CHECK_NONE_TARGET_BRANCH @@ -59,15 +56,14 @@ import org.springframework.stereotype.Service @Service class StreamEventService @Autowired constructor( private val dslContext: DSLContext, - private val redisOperation: RedisOperation, private val streamGitConfig: StreamGitConfig, private val gitCheckService: GitCheckService, - private val userMessageDao: StreamUserMessageDao, private val gitRequestEventNotBuildDao: GitRequestEventNotBuildDao, private val gitRequestEventDao: GitRequestEventDao, private val websocketService: StreamWebsocketService, private val gitRequestEventBuildDao: GitRequestEventBuildDao, - private val streamGitProjectInfoCache: StreamGitProjectInfoCache + private val streamGitProjectInfoCache: StreamGitProjectInfoCache, + private val userMessageConsumer: UserMessageConsumer ) { // 触发检查错误,未涉及版本解析 fun saveTriggerNotBuildEvent( @@ -180,26 +176,12 @@ class StreamEventService @Autowired constructor( branch = branch ) - // eventId只用保存一次，先查询一次，如果没有在去修改 if (saveUserMessage( userId = userId, projectCode = projectCode, event = event, gitProjectId = gitProjectId, - messageType = UserMessageType.REQUEST, - isSave = false // 只update - ) - ) { - return messageId - } - - if (saveUserMessage( - userId = userId, - projectCode = projectCode, - event = event, - gitProjectId = gitProjectId, - messageType = UserMessageType.REQUEST, - isSave = true + messageType = UserMessageType.REQUEST ) ) { websocketService.pushNotifyWebsocket( @@ -215,52 +197,26 @@ class StreamEventService @Autowired constructor( projectCode: String, event: GitRequestEvent, gitProjectId: Long, - messageType: UserMessageType, - isSave: Boolean = true + messageType: UserMessageType ): Boolean { - val messageTitle = if (isSave) lazy { - val checkRepoHookTrigger = gitProjectId != event.gitProjectId - val realEvent = if (checkRepoHookTrigger) { - // 当gitProjectId与event的不同时，说明是远程仓库触发的 - val pathWithNamespace = streamGitProjectInfoCache.getAndSaveGitProjectInfo( - gitProjectId = event.gitProjectId, - useAccessToken = true, - userId = userId - )?.pathWithNamespace - GitCommonUtils.checkAndGetRepoBranch(event, pathWithNamespace) - } else event - StreamTriggerMessageUtils.getEventMessageTitle(realEvent, checkRepoHookTrigger) - } else null - - val saveLock = StreamMessageSaveLock(redisOperation, userId, projectCode, event.id.toString()) - saveLock.use { - saveLock.lock() - val exist = userMessageDao.getMessageExist(dslContext, projectCode, userId, event.id.toString()) - if (isSave) { - if (exist != null) { - return false - } - userMessageDao.save( - dslContext = dslContext, - projectId = projectCode, - userId = userId, - messageType = messageType, - messageId = event.id.toString(), - messageTitle = messageTitle?.value ?: "" - ) - } else { - if (exist == null || exist.messageType == messageType.name) { - return false - } - userMessageDao.updateMessageType( - dslContext = dslContext, - projectId = projectCode, - userId = userId, - messageId = event.id.toString(), - messageType = messageType - ) - } - } + val checkRepoHookTrigger = gitProjectId != event.gitProjectId + val realEvent = if (checkRepoHookTrigger) { + // 当gitProjectId与event的不同时，说明是远程仓库触发的 + val pathWithNamespace = streamGitProjectInfoCache.getAndSaveGitProjectInfo( + gitProjectId = event.gitProjectId, + useAccessToken = true, + userId = userId + )?.pathWithNamespace + GitCommonUtils.checkAndGetRepoBranch(event, pathWithNamespace) + } else event + val messageTitle = StreamTriggerMessageUtils.getEventMessageTitle(realEvent, checkRepoHookTrigger) + userMessageConsumer.addData( + projectId = projectCode, + userId = userId, + messageType = messageType, + messageId = event.id.toString(), + messageTitle = messageTitle + ) return true } diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/UserMessageConsumer.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/UserMessageConsumer.kt new file mode 100644 index 00000000000..7e699517789 --- /dev/null +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/service/UserMessageConsumer.kt @@ -0,0 +1,175 @@ +package com.tencent.devops.stream.trigger.service + +import com.tencent.devops.common.api.util.JsonUtil +import com.tencent.devops.common.api.util.UUIDUtil +import com.tencent.devops.common.redis.RedisLock +import com.tencent.devops.common.redis.RedisOperation +import com.tencent.devops.common.service.BkTag +import com.tencent.devops.stream.dao.StreamUserMessageDao +import com.tencent.devops.stream.pojo.UserMessageData +import com.tencent.devops.stream.pojo.message.UserMessageType +import org.jooq.DSLContext +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.beans.factory.annotation.Value +import org.springframework.boot.ApplicationArguments +import org.springframework.boot.ApplicationRunner +import org.springframework.stereotype.Component + +@Component +class UserMessageConsumer @Autowired constructor( + private val dslContext: DSLContext, + private val userMessageDao: StreamUserMessageDao, + @Qualifier("redisStringHashOperation") + private val redisHashOperation: RedisOperation, + private val bkTag: BkTag +) : ApplicationRunner { + + companion object { + private val logger = LoggerFactory.getLogger(UserMessageConsumer::class.java) + } + + override fun run(args: ApplicationArguments) { + Thread(UserMessageProcess(this)).start() + } + + fun bufferKey() = "stream_user_message_consumer:${bkTag.getLocalTag()}:buffer" + + @Value("\${queue.max.size:10000}") + private var maxSize: Int = 10000 // 默认值 + private var size = 0 + + private class UserMessageProcess( + private val consumer: UserMessageConsumer + ) : Runnable { + + private val lock = "user_message_process_${consumer.bkTag.getLocalTag()}" + private val key = consumer.bufferKey() + + companion object { + const val SLEEP = 5000L + const val CHUNKED = 200 + } + + override fun run() { + logger.info("UserMessageProcess begin") + while (true) { + val redisLock = RedisLock(consumer.redisHashOperation, lock, 60L) + try { + val lockSuccess = redisLock.tryLock() + val massages = consumer.redisHashOperation.hkeys(key) ?: emptySet() + consumer.size = massages.size + if (lockSuccess && massages.isNotEmpty()) { + execute(massages) + } + } catch (e: Throwable) { + logger.error("UserMessageProcess failed ${e.message}", e) + } finally { + Thread.sleep(SLEEP) + redisLock.unlock() + } + } + } + + private fun execute(massages: Set) { + val needDelete = mutableListOf() + massages.chunked(CHUNKED).forEach { keys -> + val updateValues = consumer.redisHashOperation.hmGet(key, keys) + ?: return@forEach + val removeDuplicates = mutableMapOf() + keys.forEachIndexed { index, key -> + needDelete.add(key) + kotlin.runCatching { + val load = JsonUtil.to(updateValues[index], UserMessageData::class.java) + val loadKey = "${load.projectId}${load.userId}${load.messageId}" + if (removeDuplicates[loadKey] != null && + removeDuplicates[loadKey]!!.messageType != UserMessageType.ONLY_SUCCESS.name + ) { + return@forEachIndexed + } + if (removeDuplicates[loadKey] != null && + load.messageType == UserMessageType.ONLY_SUCCESS.name + ) { + return@forEachIndexed + } + removeDuplicates[loadKey] = load + }.onFailure { + logger.warn("UserMessageProcess failed ${it.message}", it) + } + } + removeDuplicates.forEach { (_, v) -> + consumer.writeData( + projectId = v.projectId, + userId = v.userId, + messageId = v.messageId, + messageType = UserMessageType.parse(v.messageType), + messageTitle = v.messageTitle + ) + } + } + if (needDelete.isNotEmpty()) { + logger.info("UserMessageProcess success write ${needDelete.size} messages") + consumer.redisHashOperation.hdelete(key, needDelete.toTypedArray()) + } + } + } + + // 添加数据到队列 + fun addData( + projectId: String, + userId: String, + messageId: String, + messageType: UserMessageType, + messageTitle: String + ) { + if (size < maxSize) { + redisHashOperation.hset( + bufferKey(), + UUIDUtil.generate(), + JsonUtil.toJson( + UserMessageData( + projectId = projectId, + userId = userId, + messageId = messageId, + messageType = messageType.name, + messageTitle = messageTitle + ) + ) + ) + } else { + logger.error("Queue is full. Cannot add data.") + } + } + + fun writeData( + projectId: String, + userId: String, + messageId: String, + messageType: UserMessageType, + messageTitle: String + ) { + val exist = userMessageDao.getMessageExist(dslContext, projectId, userId, messageId) + if (exist == null) { + userMessageDao.save( + dslContext = dslContext, + projectId = projectId, + userId = userId, + messageType = messageType, + messageId = messageId, + messageTitle = messageTitle + ) + } else { + if (exist.messageType == messageType.name || exist.messageType == UserMessageType.REQUEST.name) { + return + } + userMessageDao.updateMessageType( + dslContext = dslContext, + projectId = projectId, + userId = userId, + messageId = messageId, + messageType = messageType + ) + } + } +} diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/util/StreamPipelineUtils.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/util/StreamPipelineUtils.kt index b6772051f59..0c55d9041e7 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/util/StreamPipelineUtils.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/util/StreamPipelineUtils.kt @@ -33,11 +33,11 @@ import com.tencent.devops.common.api.pojo.PipelineAsCodeSettings 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.PipelineModelAndSetting import com.tencent.devops.common.pipeline.pojo.element.trigger.ManualTriggerElement +import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.process.engine.common.VMUtils -import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting -import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting @Suppress("LongParameterList", "ReturnCount") object StreamPipelineUtils { @@ -66,38 +66,39 @@ object StreamPipelineUtils { messageId: String ) = "$streamUrl/notifications?id=$messageId#$gitProjectId" - fun createEmptyPipelineAndSetting(displayName: String) = PipelineModelAndSetting( - model = Model( - name = displayName, - desc = "", - stages = listOf( - Stage( - id = VMUtils.genStageId(1), - name = VMUtils.genStageId(1), - containers = listOf( - TriggerContainer( - id = "0", - name = I18nUtil.getCodeLanMessage( - messageCode = BK_BUILD_TRIGGER, - language = I18nUtil.getDefaultLocaleLanguage() - ), - elements = listOf( - ManualTriggerElement( - name = I18nUtil.getCodeLanMessage( - messageCode = BK_MANUAL_TRIGGER, - language = I18nUtil.getDefaultLocaleLanguage() - ), - id = "T-1-1-1" + fun createEmptyPipelineAndSetting(displayName: String, pipelineAsCodeSettings: PipelineAsCodeSettings?) = + PipelineModelAndSetting( + model = Model( + name = displayName, + desc = "", + stages = listOf( + Stage( + id = VMUtils.genStageId(1), + name = VMUtils.genStageId(1), + containers = listOf( + TriggerContainer( + id = "0", + name = I18nUtil.getCodeLanMessage( + messageCode = BK_BUILD_TRIGGER, + language = I18nUtil.getDefaultLocaleLanguage() + ), + elements = listOf( + ManualTriggerElement( + name = I18nUtil.getCodeLanMessage( + messageCode = BK_MANUAL_TRIGGER, + language = I18nUtil.getDefaultLocaleLanguage() + ), + id = "T-1-1-1" + ) ) ) ) ) ) + ), + setting = PipelineSetting( + cleanVariablesWhenRetry = true, + pipelineAsCodeSettings = pipelineAsCodeSettings ?: PipelineAsCodeSettings() ) - ), - setting = PipelineSetting( - cleanVariablesWhenRetry = true, - pipelineAsCodeSettings = PipelineAsCodeSettings() ) - ) } diff --git a/src/backend/ci/core/worker/worker-agent/src/main/resources/.agent.properties b/src/backend/ci/core/worker/worker-agent/src/main/resources/.agent.properties index 24343bffb64..7e156ac392d 100644 --- a/src/backend/ci/core/worker/worker-agent/src/main/resources/.agent.properties +++ b/src/backend/ci/core/worker/worker-agent/src/main/resources/.agent.properties @@ -32,6 +32,5 @@ landun.gateway=##gateWay## devops.parallel.task.count=4 landun.env=##landun.env## agentCollectorOn=##agentCollectorOn## -repo.class.name=com.tencent.devops.agent.service.SampleRepoServiceImpl devops.public.host.maxFileCacheSize=209715200 devops.public.third.maxFileCacheSize=2147483648 diff --git a/src/backend/ci/core/worker/worker-agent/src/test/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtilsTest.kt b/src/backend/ci/core/worker/worker-agent/src/test/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtilsTest.kt new file mode 100644 index 00000000000..8ca9f96a843 --- /dev/null +++ b/src/backend/ci/core/worker/worker-agent/src/test/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtilsTest.kt @@ -0,0 +1,127 @@ +package com.tencent.devops.worker.common.utils + +import java.io.File +import java.security.AccessController +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test +import sun.security.action.GetPropertyAction + +class CommandLineUtilsTest { + + @Test + fun reportProgressRateTest() { + fun func(str: String) = CommandLineUtils.reportProgressRate("test", str) + /*不识别*/ + Assertions.assertEquals(func("echo \"::set-progress-rate 0.3758\""), null) + Assertions.assertEquals(func("echo '::set-progress-rate 0.3758'"), null) + Assertions.assertEquals(func("echo ::set-progress-rate 0.3758"), null) + Assertions.assertEquals(func("print(\"::set-progress-rate 0.3758\")"), null) + /*windows兼容*/ + Assertions.assertEquals(func("\"::set-progress-rate 0.3758\""), 0.3758) + /*默认*/ + Assertions.assertEquals(func("::set-progress-rate 0.3758"), 0.3758) + /*兼容多空格*/ + Assertions.assertEquals(func("::set-progress-rate 0.3758"), 0.3758) + Assertions.assertEquals(func(" ::set-progress-rate 0.3758"), 0.3758) + } + + @Test + fun appendVariableToFileTest() { + fun func(str: String) = CommandLineUtils.appendVariableToFile( + str, File( + AccessController + .doPrivileged(GetPropertyAction("java.io.tmpdir")) + ), "appendVariableToFileTest" + ) + /*不识别*/ + Assertions.assertEquals(func("echo \"::set-variable name=RESULT::test\""), null) + Assertions.assertEquals(func("echo '::set-variable name=RESULT::test'"), null) + Assertions.assertEquals(func("echo ::set-variable name=RESULT::test"), null) + Assertions.assertEquals(func("print(\"::set-variable name=RESULT::test\")"), null) + /*多空格*/ + Assertions.assertEquals(func(" ::set-variable name=RESULT::test"), null) + Assertions.assertEquals(func("::set-variable name=RESULT::test"), null) + /*windows兼容*/ + Assertions.assertEquals(func("\"::set-variable name=RESULT::test\""), "variables.RESULT=test\n") + /*默认*/ + Assertions.assertEquals(func("::set-variable name=RESULT::test"), "variables.RESULT=test\n") + } + + @Test + fun appendRemarkToFileTest() { + fun func(str: String) = CommandLineUtils.appendRemarkToFile( + str, File( + AccessController + .doPrivileged(GetPropertyAction("java.io.tmpdir")) + ), "appendRemarkToFileTest" + ) + /*不识别*/ + Assertions.assertEquals(func("echo \"::set-remark 备注信息\""), null) + Assertions.assertEquals(func("echo '::set-remark 备注信息'"), null) + Assertions.assertEquals(func("echo ::set-remark 备注信息"), null) + Assertions.assertEquals(func("print(\"::set-remark 备注信息\")"), null) + /*多空格*/ + Assertions.assertEquals(func(" ::set-remark 备注信息"), null) + /*windows兼容*/ + Assertions.assertEquals(func("\"::set-remark 备注信息\""), "BK_CI_BUILD_REMARK=备注信息\n") + /*默认*/ + Assertions.assertEquals(func("::set-remark 备注信息"), "BK_CI_BUILD_REMARK=备注信息\n") + Assertions.assertEquals(func("::set-remark 备注信息"), "BK_CI_BUILD_REMARK= 备注信息\n") + } + + @Test + fun appendOutputToFileTest() { + val jobId = "job_xx" + val stepId = "step_xx" + fun func(str: String) = CommandLineUtils.appendOutputToFile( + tmpLine = str, + workspace = File( + AccessController + .doPrivileged(GetPropertyAction("java.io.tmpdir")) + ), + resultLogFile = "appendOutputToFileTest", + jobId = jobId, + stepId = stepId + ) + /*不识别*/ + Assertions.assertEquals(func("echo \"::set-output name=RESULT::test\""), null) + Assertions.assertEquals(func("echo '::set-output name=RESULT::test'"), null) + Assertions.assertEquals(func("echo ::set-output name=RESULT::test"), null) + Assertions.assertEquals(func("print(\"::set-output name=RESULT::test\")"), null) + /*多空格*/ + Assertions.assertEquals(func(" ::set-output name=RESULT::test"), null) + Assertions.assertEquals(func("::set-output name=RESULT::test"), null) + /*windows兼容*/ + Assertions.assertEquals( + func("\"::set-output name=RESULT::test\""), + "jobs.$jobId.steps.$stepId.outputs.RESULT=test\n" + ) + /*默认*/ + Assertions.assertEquals( + func("::set-output name=RESULT::test"), + "jobs.$jobId.steps.$stepId.outputs.RESULT=test\n" + ) + } + + @Test + fun appendGateToFileTest() { + fun func(str: String) = CommandLineUtils.appendGateToFile( + str, File( + AccessController + .doPrivileged(GetPropertyAction("java.io.tmpdir")) + ), "appendGateToFileTest" + ) + /*不识别*/ + Assertions.assertEquals(func("echo \"::set-gate-value name=pass_rate::0.9\""), null) + Assertions.assertEquals(func("echo '::set-gate-value name=pass_rate::0.9'"), null) + Assertions.assertEquals(func("echo ::set-gate-value name=pass_rate::0.9"), null) + Assertions.assertEquals(func("print(\"::set-gate-value name=pass_rate::0.9\")"), null) + /*多空格*/ + Assertions.assertEquals(func(" ::set-gate-value name=pass_rate::0.9"), null) + Assertions.assertEquals(func("::set-gate-value name=pass_rate::0.9"), null) + /*windows兼容*/ + Assertions.assertEquals(func("\"::set-gate-value name=pass_rate::0.9\""), "pass_rate=0.9\n") + /*默认*/ + Assertions.assertEquals(func("::set-gate-value name=pass_rate::0.9"), "pass_rate=0.9\n") + } +} diff --git a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveResourceApi.kt b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveResourceApi.kt index e43e22d865b..1d7320adb55 100644 --- a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveResourceApi.kt +++ b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveResourceApi.kt @@ -29,6 +29,7 @@ package com.tencent.devops.worker.common.api.archive import com.fasterxml.jackson.module.kotlin.readValue import com.google.gson.JsonParser +import com.tencent.bkrepo.repository.pojo.token.TokenType import com.tencent.devops.artifactory.constant.REALM_LOCAL import com.tencent.devops.artifactory.pojo.GetFileDownloadUrlsResponse import com.tencent.devops.artifactory.pojo.enums.FileTypeEnum @@ -207,4 +208,15 @@ class ArchiveResourceApi : AbstractBuildResourceApi(), ArchiveSDKApi { val responseContent = request(request, "upload file:$fileName fail") return objectMapper.readValue(responseContent) } + + override fun getRepoToken( + userId: String, + projectId: String, + repoName: String, + path: String, + type: TokenType, + expireSeconds: Long + ): String? { + return null + } } diff --git a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/BkRepoArchiveResourceApi.kt b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/BkRepoArchiveResourceApi.kt index 4913a680f9a..6f8b3728618 100644 --- a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/BkRepoArchiveResourceApi.kt +++ b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/archive/BkRepoArchiveResourceApi.kt @@ -29,6 +29,7 @@ package com.tencent.devops.worker.common.api.archive import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue +import com.tencent.bkrepo.repository.pojo.token.TokenType import com.tencent.devops.artifactory.constant.REALM_BK_REPO import com.tencent.devops.artifactory.pojo.enums.FileTypeEnum import com.tencent.devops.common.api.exception.RemoteServiceException @@ -37,6 +38,7 @@ import com.tencent.devops.common.api.pojo.ErrorCode import com.tencent.devops.common.api.pojo.ErrorType import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.api.util.MessageUtil +import com.tencent.devops.common.util.HttpRetryUtils import com.tencent.devops.process.pojo.BuildVariables import com.tencent.devops.worker.common.api.AbstractBuildResourceApi import com.tencent.devops.worker.common.api.ApiPriority @@ -308,4 +310,28 @@ class BkRepoArchiveResourceApi : AbstractBuildResourceApi(), ArchiveSDKApi { val responseContent = request(request, "upload file[$fileName] failed") return objectMapper.readValue(responseContent) } + + override fun getRepoToken( + userId: String, + projectId: String, + repoName: String, + path: String, + type: TokenType, + expireSeconds: Long + ): String? { + return if (bkrepoResourceApi.tokenAccess()) { + HttpRetryUtils.retry(retryTime = 3, retryPeriodMills = 1000) { + bkrepoResourceApi.createBkRepoTemporaryToken( + userId = userId, + projectId = projectId, + repoName = repoName, + path = path, + type = type, + expireSeconds = expireSeconds + ) + } + } else { + null + } + } } diff --git a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/BkRepoReportResourceApi.kt b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/BkRepoReportResourceApi.kt index d63bcc28774..4e794f8c5bf 100644 --- a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/BkRepoReportResourceApi.kt +++ b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/BkRepoReportResourceApi.kt @@ -28,10 +28,12 @@ package com.tencent.devops.worker.common.api.report import com.fasterxml.jackson.module.kotlin.readValue +import com.tencent.bkrepo.repository.pojo.token.TokenType import com.tencent.devops.artifactory.constant.REALM_BK_REPO import com.tencent.devops.common.api.exception.RemoteServiceException import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.api.util.MessageUtil +import com.tencent.devops.common.util.HttpRetryUtils import com.tencent.devops.process.pojo.BuildVariables import com.tencent.devops.process.pojo.report.ReportEmail import com.tencent.devops.process.pojo.report.enums.ReportTypeEnum @@ -197,4 +199,28 @@ class BkRepoReportResourceApi : AbstractBuildResourceApi(), ReportSDKApi { } bkrepoResourceApi.setPipelineMetadata("report", buildVariables) } + + override fun getRepoToken( + userId: String, + projectId: String, + repoName: String, + path: String, + type: TokenType, + expireSeconds: Long + ): String? { + return if (bkrepoResourceApi.tokenAccess()) { + HttpRetryUtils.retry(retryTime = 3, retryPeriodMills = 1000) { + bkrepoResourceApi.createBkRepoTemporaryToken( + userId = userId, + projectId = projectId, + repoName = repoName, + path = path, + type = type, + expireSeconds = expireSeconds + ) + } + } else { + null + } + } } diff --git a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportResourceApi.kt b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportResourceApi.kt index e630cfc4967..eed76bb621a 100644 --- a/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportResourceApi.kt +++ b/src/backend/ci/core/worker/worker-api-sdk/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportResourceApi.kt @@ -29,6 +29,7 @@ package com.tencent.devops.worker.common.api.report import com.fasterxml.jackson.module.kotlin.readValue import com.google.gson.JsonParser +import com.tencent.bkrepo.repository.pojo.token.TokenType import com.tencent.devops.artifactory.constant.REALM_LOCAL import com.tencent.devops.artifactory.pojo.enums.FileTypeEnum import com.tencent.devops.common.api.exception.RemoteServiceException @@ -134,6 +135,17 @@ class ReportResourceApi : AbstractBuildResourceApi(), ReportSDKApi { return objectMapper.readValue(responseContent) } + override fun getRepoToken( + userId: String, + projectId: String, + repoName: String, + path: String, + type: TokenType, + expireSeconds: Long + ): String? { + return null + } + companion object { private val logger = LoggerFactory.getLogger(ReportResourceApi::class.java) } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/BuildArchiveGetTask.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/BuildArchiveGetTask.kt index fa6e16eb0c0..f64b2b7090a 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/BuildArchiveGetTask.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/BuildArchiveGetTask.kt @@ -44,7 +44,6 @@ import com.tencent.devops.worker.common.api.ArtifactApiFactory import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi import com.tencent.devops.worker.common.api.process.BuildSDKApi import com.tencent.devops.worker.common.logger.LoggerService -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.task.ITask import com.tencent.devops.worker.common.task.TaskClassType import com.tencent.devops.worker.common.utils.TaskUtil @@ -108,7 +107,7 @@ class BuildArchiveGetTask : ITask() { count = files.size LoggerService.addNormalLine("total $count file(s) found") files.forEachIndexed { index, (fileUrl, file) -> - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = archiveGetResourceApi.getRepoToken( userId = buildVariables.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables.projectId, repoName = "pipeline", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/CustomizeArchiveGetTask.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/CustomizeArchiveGetTask.kt index a6bb7053d0c..79c14fc491d 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/CustomizeArchiveGetTask.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/CustomizeArchiveGetTask.kt @@ -39,7 +39,6 @@ import com.tencent.devops.process.utils.PIPELINE_START_USER_ID import com.tencent.devops.worker.common.api.ArtifactApiFactory import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi import com.tencent.devops.worker.common.logger.LoggerService -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.task.ITask import com.tencent.devops.worker.common.task.TaskClassType import com.tencent.devops.worker.common.utils.TaskUtil @@ -92,7 +91,7 @@ class CustomizeArchiveGetTask : ITask() { count = files.size LoggerService.addNormalLine("total $count file(s) found") files.forEachIndexed { index, (fileUrl, file) -> - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = archiveGetResourceApi.getRepoToken( userId = buildVariables.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables.projectId, repoName = "custom", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/ReportArchiveTask.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/ReportArchiveTask.kt index 8ca1d186a5c..591c304d499 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/ReportArchiveTask.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/ReportArchiveTask.kt @@ -50,10 +50,10 @@ import com.tencent.devops.worker.common.constants.WorkerMessageCode.FOLDER_NOT_E import com.tencent.devops.worker.common.constants.WorkerMessageCode.UPLOAD_CUSTOM_OUTPUT_SUCCESS import com.tencent.devops.worker.common.env.AgentEnv import com.tencent.devops.worker.common.logger.LoggerService -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.task.ITask import com.tencent.devops.worker.common.task.TaskClassType import com.tencent.devops.worker.common.utils.TaskUtil +import org.slf4j.LoggerFactory import java.io.File import java.nio.file.Path import java.nio.file.Paths @@ -61,7 +61,6 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException import java.util.regex.Pattern -import org.slf4j.LoggerFactory @TaskClassType(classTypes = [ReportArchiveElement.classType]) class ReportArchiveTask : ITask() { @@ -81,7 +80,7 @@ class ReportArchiveTask : ITask() { val reportType = taskParams["reportType"] ?: ReportTypeEnum.INTERNAL.name val indexFileParam: String var indexFileContent: String - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = api.getRepoToken( userId = buildVariables.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables.projectId, repoName = "report", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/SingleFileArchiveTask.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/SingleFileArchiveTask.kt index e222f0e457c..6b2b6eda434 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/SingleFileArchiveTask.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/SingleFileArchiveTask.kt @@ -37,9 +37,10 @@ import com.tencent.devops.common.archive.element.SingleArchiveElement import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildVariables import com.tencent.devops.process.utils.PIPELINE_START_USER_ID +import com.tencent.devops.worker.common.api.ArtifactApiFactory +import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi import com.tencent.devops.worker.common.constants.WorkerMessageCode.NO_MATCHING_ARCHIVE_FILE import com.tencent.devops.worker.common.env.AgentEnv -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.task.ITask import com.tencent.devops.worker.common.task.TaskClassType import com.tencent.devops.worker.common.utils.ArchiveUtils.archiveCustomFiles @@ -50,12 +51,14 @@ import java.io.File @TaskClassType(classTypes = [SingleArchiveElement.classType]) class SingleFileArchiveTask : ITask() { + private val api = ArtifactApiFactory.create(ArchiveSDKApi::class) + override fun execute(buildTask: BuildTask, buildVariables: BuildVariables, workspace: File) { val taskParams = buildTask.params ?: mapOf() val filePath = taskParams["filePath"] ?: throw ParamBlankException("param [filePath] is empty") val isCustomize = taskParams["customize"] ?: throw ParamBlankException("param [isCustomize] is empty") TaskUtil.setTaskId(buildTask.taskId ?: "") - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = api.getRepoToken( userId = buildVariables.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables.projectId, repoName = if (isCustomize.toBoolean()) "custom" else "pipeline", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/Runner.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/Runner.kt index 31be9ef9fe7..82c9adc42a3 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/Runner.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/Runner.kt @@ -42,6 +42,7 @@ import com.tencent.devops.common.pipeline.enums.BuildTaskStatus import com.tencent.devops.common.pipeline.pojo.BuildParameters import com.tencent.devops.common.pipeline.pojo.element.Element import com.tencent.devops.process.engine.common.VMUtils +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildVariables import com.tencent.devops.process.utils.PIPELINE_RETRY_COUNT @@ -84,6 +85,7 @@ object Runner { var workspacePathFile: File? = null val buildVariables = getBuildVariables() var failed = false + var errMsg: String? = null try { BuildEnv.setBuildId(buildVariables.buildId) @@ -108,7 +110,7 @@ object Runner { } catch (ignore: Exception) { failed = true logger.warn("Catch unknown exceptions", ignore) - val errMsg = when (ignore) { + errMsg = when (ignore) { is java.lang.IllegalArgumentException -> MessageUtil.getMessageByLocale( messageCode = PARAMETER_ERROR, @@ -142,7 +144,7 @@ object Runner { throw ignore } finally { // 对应prepareWorker的兜底动作 - finishWorker(buildVariables) + finishWorker(buildVariables, errMsg) finally(workspacePathFile, failed) if (systemExit) { @@ -155,15 +157,29 @@ object Runner { try { // 启动成功, 报告process我已经启动了 return EngineService.setStarted() - } catch (e: Exception) { - logger.warn("Set started catch unknown exceptions", e) + } catch (ignored: Exception) { + logger.warn("Set started catch unknown exceptions", ignored) + handleStartException(ignored) + throw ignored + } + } + + private fun handleStartException(ignored: Exception) { + var endBuildFlag = true + if (ignored is RemoteServiceException) { + val errorCode = ignored.errorCode + if (errorCode == 2101182 || errorCode == 2101255) { + // 当构建已结束或者已经启动构建机时则不需要调结束构建接口 + endBuildFlag = false + } + } + if (endBuildFlag) { // 启动失败，尝试结束构建 try { - EngineService.endBuild(emptyMap(), DockerEnv.getBuildId()) - } catch (e: Exception) { - logger.warn("End build catch unknown exceptions", e) + EngineService.endBuild(emptyMap(), DockerEnv.getBuildId(), BuildJobResult(ignored.message)) + } catch (ignored: Exception) { + logger.warn("End build catch unknown exceptions", ignored) } - throw e } } @@ -202,9 +218,9 @@ object Runner { return workspaceAndLogPath.first } - private fun finishWorker(buildVariables: BuildVariables) { + private fun finishWorker(buildVariables: BuildVariables, errMsg: String? = null) { LoggerService.stop() - EngineService.endBuild(buildVariables.variables) + EngineService.endBuild(variables = buildVariables.variables, result = BuildJobResult(errMsg)) Heartbeat.stop() } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/AbstractBuildResourceApi.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/AbstractBuildResourceApi.kt index 7a5849df3dc..8ed4ab5acc7 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/AbstractBuildResourceApi.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/AbstractBuildResourceApi.kt @@ -36,6 +36,7 @@ import com.tencent.devops.common.api.auth.AUTH_HEADER_DEVOPS_VM_SEQ_ID import com.tencent.devops.common.api.constant.HTTP_404 import com.tencent.devops.common.api.exception.ClientException import com.tencent.devops.common.api.exception.RemoteServiceException +import com.tencent.devops.common.api.util.JsonSchemaUtil import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.worker.common.CommonEnv @@ -200,7 +201,18 @@ abstract class AbstractBuildResourceApi : WorkerRestApiSDK { "Fail to request($request) with code ${response.code} ," + " message ${response.message} and response ($responseContent)" ) - throw RemoteServiceException(errorMessage, response.code, responseContent) + val errorCode = if (responseContent != null && JsonSchemaUtil.isJsonObject(responseContent)) { + val responseMap = JsonUtil.toMap(responseContent) + responseMap[RemoteServiceException::errorCode.name]?.toString()?.toInt() + } else { + null + } + throw RemoteServiceException( + errorMessage = errorMessage, + httpStatus = response.code, + responseContent = responseContent, + errorCode = errorCode + ) } return response.body!!.string() } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveSDKApi.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveSDKApi.kt index e97a82dc0ab..7c1cf620f5e 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveSDKApi.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/archive/ArchiveSDKApi.kt @@ -27,6 +27,7 @@ package com.tencent.devops.worker.common.api.archive +import com.tencent.bkrepo.repository.pojo.token.TokenType import com.tencent.devops.artifactory.pojo.enums.FileTypeEnum import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.process.pojo.BuildVariables @@ -134,4 +135,16 @@ interface ArchiveSDKApi : WorkerRestApiSDK { headers: Map? = emptyMap(), isVmBuildEnv: Boolean? = null ): Result + + /** + * 获取仓库token + */ + fun getRepoToken( + userId: String, + projectId: String, + repoName: String, + path: String, + type: TokenType, + expireSeconds: Long + ): String? } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/EngineBuildSDKApi.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/EngineBuildSDKApi.kt index f90b9a19ad1..d029d3ce522 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/EngineBuildSDKApi.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/EngineBuildSDKApi.kt @@ -31,6 +31,7 @@ import com.tencent.devops.common.api.pojo.ErrorInfo import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.pipeline.pojo.JobHeartbeatRequest import com.tencent.devops.engine.api.pojo.HeartBeatInfo +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTaskResult import com.tencent.devops.process.pojo.BuildVariables @@ -46,7 +47,12 @@ interface EngineBuildSDKApi : WorkerRestApiSDK { fun completeTask(result: BuildTaskResult, retryCount: Int): Result - fun endTask(variables: Map, envBuildId: String, retryCount: Int): Result + fun endTask( + variables: Map, + envBuildId: String, + retryCount: Int, + result: BuildJobResult + ): Result fun heartbeat(executeCount: Int = 1, jobHeartbeatRequest: JobHeartbeatRequest): Result diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/impl/EngineBuildResourceApi.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/impl/EngineBuildResourceApi.kt index e9e3dcc9b8c..b99407dadd9 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/impl/EngineBuildResourceApi.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/impl/EngineBuildResourceApi.kt @@ -33,6 +33,7 @@ import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.common.api.util.MessageUtil import com.tencent.devops.common.pipeline.pojo.JobHeartbeatRequest import com.tencent.devops.engine.api.pojo.HeartBeatInfo +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTaskResult import com.tencent.devops.process.pojo.BuildVariables @@ -49,6 +50,7 @@ import com.tencent.devops.worker.common.constants.WorkerMessageCode.REPORT_TASK_ import com.tencent.devops.worker.common.env.AgentEnv import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody @Suppress("UNUSED", "TooManyFunctions") @ApiPriority(priority = 1) @@ -117,13 +119,21 @@ open class EngineBuildResourceApi : AbstractBuildResourceApi(), EngineBuildSDKAp return objectMapper.readValue(responseContent) } - override fun endTask(variables: Map, envBuildId: String, retryCount: Int): Result { + override fun endTask( + variables: Map, + envBuildId: String, + retryCount: Int, + result: BuildJobResult + ): Result { if (envBuildId.isNotBlank()) { buildId = envBuildId } val path = getRequestUrl(path = "api/build/worker/end", retryCount = retryCount) - val request = buildPost(path) + val request = buildPost( + path, + objectMapper.writeValueAsString(result).toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull()) + ) val errorMessage = MessageUtil.getMessageByLocale( BUILD_FINISH_REQUEST_FAILED, AgentEnv.getLocaleLanguage() diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportSDKApi.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportSDKApi.kt index be461a6db16..db63f1e4bc6 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportSDKApi.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/api/report/ReportSDKApi.kt @@ -27,6 +27,7 @@ package com.tencent.devops.worker.common.api.report +import com.tencent.bkrepo.repository.pojo.token.TokenType import com.tencent.devops.common.api.pojo.Result import com.tencent.devops.process.pojo.BuildVariables import com.tencent.devops.process.pojo.report.ReportEmail @@ -75,4 +76,16 @@ interface ReportSDKApi : WorkerRestApiSDK { buildVariables: BuildVariables, token: String? = null ) + + /** + * 获取仓库token + */ + fun getRepoToken( + userId: String, + projectId: String, + repoName: String, + path: String, + type: TokenType, + expireSeconds: Long + ): String? } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/heartbeat/Heartbeat.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/heartbeat/Heartbeat.kt index 6865eb08082..61139b14bb1 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/heartbeat/Heartbeat.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/heartbeat/Heartbeat.kt @@ -29,7 +29,6 @@ package com.tencent.devops.worker.common.heartbeat import com.tencent.devops.common.api.constant.HTTP_500 import com.tencent.devops.common.api.exception.RemoteServiceException -import com.tencent.devops.common.api.util.JsonUtil import com.tencent.devops.common.pipeline.pojo.JobHeartbeatRequest import com.tencent.devops.engine.api.pojo.HeartBeatInfo import com.tencent.devops.worker.common.logger.LoggerService @@ -98,25 +97,15 @@ object Heartbeat { running = true } - private fun handleRemoteServiceException(e: RemoteServiceException) { + private fun handleRemoteServiceException(ignored: RemoteServiceException) { - if (e.httpStatus != HTTP_500 && e.responseContent.isNullOrBlank()) { + if (ignored.httpStatus != HTTP_500 && ignored.responseContent.isNullOrBlank()) { return } - - val responseContent = e.responseContent - if (responseContent!!.startsWith("{") && responseContent.endsWith("}")) { - try { - val responseMap = JsonUtil.toMap(responseContent) - val errorCode = responseMap["errorCode"] - // 流水线构建结束则正常结束进程，不再重试 - if (errorCode == 2101182) { - logger.error("build end, worker exit") - exitProcess(0) - } - } catch (t: Throwable) { - logger.warn("responseContent covert map fail", e) - } + // 流水线构建结束则正常结束进程，不再重试 + if (ignored.errorCode == 2101182) { + logger.error("build end, worker exit") + exitProcess(0) } } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt index 0a20c75b8ea..7fcad41c9c4 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt @@ -46,9 +46,9 @@ import com.tencent.devops.worker.common.LOG_SUBTAG_FLAG import com.tencent.devops.worker.common.LOG_TASK_LINE_LIMIT import com.tencent.devops.worker.common.LOG_WARN_FLAG import com.tencent.devops.worker.common.api.ApiFactory +import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi import com.tencent.devops.worker.common.api.log.LogSDKApi import com.tencent.devops.worker.common.env.AgentEnv -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.service.SensitiveValueService import com.tencent.devops.worker.common.utils.ArchiveUtils import com.tencent.devops.worker.common.utils.FileUtils @@ -72,6 +72,7 @@ import java.util.concurrent.locks.ReentrantLock object LoggerService { private val logResourceApi = ApiFactory.create(LogSDKApi::class) + private val archiveApi = ApiFactory.create(ArchiveSDKApi::class) private val logger = LoggerFactory.getLogger(LoggerService::class.java) private var future: Future? = null private val running = AtomicBoolean(true) @@ -365,7 +366,7 @@ object LoggerService { logger.info("Start to archive log files with LogMode[${AgentEnv.getLogMode()}]") try { val expireSeconds = buildVariables!!.timeoutMills / 1000 - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = archiveApi.getRepoToken( userId = buildVariables!!.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables!!.projectId, repoName = "log", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/EngineService.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/EngineService.kt index d1112180736..27a41a6a5c6 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/EngineService.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/EngineService.kt @@ -32,6 +32,7 @@ import com.tencent.devops.common.api.pojo.ErrorInfo import com.tencent.devops.common.pipeline.pojo.JobHeartbeatRequest import com.tencent.devops.common.util.HttpRetryUtils import com.tencent.devops.engine.api.pojo.HeartBeatInfo +import com.tencent.devops.process.pojo.BuildJobResult import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTaskResult import com.tencent.devops.process.pojo.BuildVariables @@ -110,16 +111,16 @@ object EngineService { } } - fun endBuild(variables: Map, buildId: String = "") { + fun endBuild(variables: Map, buildId: String = "", result: BuildJobResult) { var retryCount = 0 - val result = HttpRetryUtils.retry { + val retryResult = HttpRetryUtils.retry { if (retryCount > 0) { logger.warn("retry|time=$retryCount|endBuild") sleepInterval(retryCount) } - buildApi.endTask(variables, buildId, retryCount++) + buildApi.endTask(variables = variables, envBuildId = buildId, retryCount = retryCount++, result = result) } - if (result.isNotOk()) { + if (retryResult.isNotOk()) { throw RemoteServiceException("Failed to end build task") } } diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/market/MarketAtomTask.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/market/MarketAtomTask.kt index ed0aa052fbf..295d07ee96d 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/market/MarketAtomTask.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/market/MarketAtomTask.kt @@ -57,6 +57,7 @@ import com.tencent.devops.common.pipeline.EnvReplacementParser import com.tencent.devops.common.pipeline.container.VMBuildContainer import com.tencent.devops.common.pipeline.enums.BuildStatus import com.tencent.devops.common.service.utils.CommonUtils +import com.tencent.devops.common.webhook.pojo.code.BK_CI_RUN import com.tencent.devops.process.pojo.BuildTask import com.tencent.devops.process.pojo.BuildTemplateAcrossInfo import com.tencent.devops.process.pojo.BuildVariables @@ -83,6 +84,7 @@ import com.tencent.devops.worker.common.PIPELINE_SCRIPT_ATOM_CODE import com.tencent.devops.worker.common.WORKSPACE_CONTEXT import com.tencent.devops.worker.common.WORKSPACE_ENV import com.tencent.devops.worker.common.api.ApiFactory +import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi import com.tencent.devops.worker.common.api.archive.ArtifactoryBuildResourceApi import com.tencent.devops.worker.common.api.atom.AtomArchiveSDKApi import com.tencent.devops.worker.common.api.atom.StoreSdkApi @@ -97,7 +99,6 @@ import com.tencent.devops.worker.common.exception.TaskExecuteExceptionDecorator import com.tencent.devops.worker.common.expression.SpecialFunctions import com.tencent.devops.worker.common.logger.LoggerService import com.tencent.devops.worker.common.service.CIKeywordsService -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.task.ITask import com.tencent.devops.worker.common.task.TaskFactory import com.tencent.devops.worker.common.utils.ArchiveUtils @@ -123,6 +124,8 @@ open class MarketAtomTask : ITask() { private val storeApi = ApiFactory.create(StoreSdkApi::class) + private val archiveApi = ApiFactory.create(ArchiveSDKApi::class) + private val outputFile = "output.json" private val inputFile = "input.json" @@ -689,6 +692,7 @@ open class MarketAtomTask : ITask() { workspace: File, inputVariables: Map ) { +// logger.info("runtimeVariables is:$runtimeVariables") // 有敏感信息 val inputFileFile = File(workspace, inputFile) inputFileFile.writeText(JsonUtil.toJson(inputVariables)) } @@ -803,7 +807,11 @@ open class MarketAtomTask : ITask() { val contextKey = "jobs.${buildVariables.jobId}.steps.${buildTask.stepId}.outputs.$key" env[contextKey] = value // 原变量名输出只在未开启 pipeline as code 的逻辑中保留 - // if (buildVariables.pipelineAsCodeSettings?.enable == true) env.remove(key) + if ( + // TODO 暂时只对stream进行拦截原key + buildVariables.variables[BK_CI_RUN] == "true" && + buildVariables.pipelineAsCodeSettings?.enable == true + ) env.remove(key) } TaskUtil.removeTaskId() @@ -891,7 +899,7 @@ open class MarketAtomTask : ITask() { var oneArtifact = "" val artifactoryType = (output[ARTIFACTORY_TYPE] as? String) ?: ArtifactoryType.PIPELINE.name val customFlag = artifactoryType == ArtifactoryType.CUSTOM_DIR.name - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = archiveApi.getRepoToken( userId = buildVariables.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables.projectId, repoName = if (customFlag) "custom" else "pipeline", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ICommand.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ICommand.kt index e9ae1c86c23..23f7f94753a 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ICommand.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ICommand.kt @@ -30,6 +30,7 @@ package com.tencent.devops.worker.common.task.script import com.tencent.devops.common.api.util.KeyReplacement import com.tencent.devops.common.api.util.ReplacementUtils import com.tencent.devops.common.pipeline.EnvReplacementParser +import com.tencent.devops.process.utils.PipelineVarUtil import com.tencent.devops.store.pojo.app.BuildEnv import com.tencent.devops.worker.common.CI_TOKEN_CONTEXT import com.tencent.devops.worker.common.JOB_OS_CONTEXT @@ -79,7 +80,9 @@ interface ICommand { CI_TOKEN_CONTEXT to (variables[CI_TOKEN_CONTEXT] ?: ""), JOB_OS_CONTEXT to AgentEnv.getOS().name ) - ) + ).toMutableMap() + // 增加上下文的替换 + PipelineVarUtil.fillContextVarMap(contextMap) return if (asCodeEnabled == true) { EnvReplacementParser.parse( value = command, diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ScriptTask.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ScriptTask.kt index 94658c1d05a..e24f5fe3c51 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ScriptTask.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/task/script/ScriptTask.kt @@ -40,12 +40,12 @@ import com.tencent.devops.process.pojo.BuildVariables import com.tencent.devops.process.utils.PIPELINE_START_USER_ID import com.tencent.devops.store.pojo.app.BuildEnv import com.tencent.devops.worker.common.api.ApiFactory +import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi import com.tencent.devops.worker.common.api.quality.QualityGatewaySDKApi import com.tencent.devops.worker.common.constants.WorkerMessageCode.BK_NO_FILES_TO_ARCHIVE import com.tencent.devops.worker.common.constants.WorkerMessageCode.SCRIPT_EXECUTION_FAIL import com.tencent.devops.worker.common.env.AgentEnv import com.tencent.devops.worker.common.logger.LoggerService -import com.tencent.devops.worker.common.service.RepoServiceFactory import com.tencent.devops.worker.common.task.ITask import com.tencent.devops.worker.common.task.script.bat.WindowsScriptTask import com.tencent.devops.worker.common.utils.ArchiveUtils @@ -62,6 +62,7 @@ import java.net.URLDecoder open class ScriptTask : ITask() { private val gatewayResourceApi = ApiFactory.create(QualityGatewaySDKApi::class) + private val archiveApi = ApiFactory.create(ArchiveSDKApi::class) override fun execute(buildTask: BuildTask, buildVariables: BuildVariables, workspace: File) { val taskParams = buildTask.params ?: mapOf() @@ -130,7 +131,7 @@ open class ScriptTask : ITask() { arrayOf(archiveFileIfExecFail) ) ) - val token = RepoServiceFactory.getInstance().getRepoToken( + val token = archiveApi.getRepoToken( userId = buildVariables.variables[PIPELINE_START_USER_ID] ?: "", projectId = buildVariables.projectId, repoName = "pipeline", diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtils.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtils.kt index edfbf4422cf..60a7aee3290 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtils.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/utils/CommandLineUtils.kt @@ -172,22 +172,24 @@ object CommandLineUtils { return result.toString() } - private fun reportProgressRate( + fun reportProgressRate( taskId: String?, tmpLine: String - ) { - val pattern = Pattern.compile("::set-progress-rate\\s*(.*)") - val matcher = pattern.matcher(tmpLine) + ): Double? { + val pattern = Pattern.compile("^[\"]?::set-progress-rate\\s*(.*)$") + val matcher = pattern.matcher(tmpLine.trim()) if (matcher.find()) { - val progressRate = matcher.group(1) - if (taskId != null) { + val progressRate = matcher.group(1).removeSuffix("\"").toDoubleOrNull() + if (taskId != null && progressRate != null) { Heartbeat.recordTaskProgressRate( taskId = taskId, - progressRate = progressRate.toDouble() + progressRate = progressRate ) } logger.info("report progress rate:$tmpLine|$taskId|$progressRate") + return progressRate } + return null } private fun appendResultToFile( @@ -210,46 +212,48 @@ object CommandLineUtils { appendOutputToFile(tmpLine, workspace, resultLogFile, jobId, stepId) } - private fun appendVariableToFile( + fun appendVariableToFile( tmpLine: String, workspace: File?, resultLogFile: String - ) { + ): String? { val pattenVar = "[\"]?::set-variable\\sname=.*" val prefixVar = "::set-variable name=" if (Pattern.matches(pattenVar, tmpLine)) { val value = tmpLine.removeSurrounding("\"").removePrefix(prefixVar) val keyValue = value.split("::") if (keyValue.size >= 2) { - File(workspace, resultLogFile).appendText( - "variables.${keyValue[0]}=${value.removePrefix("${keyValue[0]}::")}\n" - ) + val res = "variables.${keyValue[0]}=${value.removePrefix("${keyValue[0]}::")}\n" + File(workspace, resultLogFile).appendText(res) + return res } } + return null } - private fun appendRemarkToFile( + fun appendRemarkToFile( tmpLine: String, workspace: File?, resultLogFile: String - ) { + ): String? { val pattenVar = "[\"]?::set-remark\\s.*" val prefixVar = "::set-remark " if (Pattern.matches(pattenVar, tmpLine)) { val value = tmpLine.removeSurrounding("\"").removePrefix(prefixVar) - File(workspace, resultLogFile).appendText( - "BK_CI_BUILD_REMARK=$value\n" - ) + val res = "BK_CI_BUILD_REMARK=$value\n" + File(workspace, resultLogFile).appendText(res) + return res } + return null } - private fun appendOutputToFile( + fun appendOutputToFile( tmpLine: String, workspace: File?, resultLogFile: String, jobId: String, stepId: String - ) { + ): String? { val pattenOutput = "[\"]?::set-output\\sname=.*" val prefixOutput = "::set-output name=" if (Pattern.matches(pattenOutput, tmpLine)) { @@ -257,29 +261,31 @@ object CommandLineUtils { val keyValue = value.split("::") val keyPrefix = "jobs.$jobId.steps.$stepId.outputs." if (keyValue.size >= 2) { - File(workspace, resultLogFile).appendText( - "$keyPrefix${keyValue[0]}=${value.removePrefix("${keyValue[0]}::")}\n" - ) + val res = "$keyPrefix${keyValue[0]}=${value.removePrefix("${keyValue[0]}::")}\n" + File(workspace, resultLogFile).appendText(res) + return res } } + return null } - private fun appendGateToFile( + fun appendGateToFile( tmpLine: String, workspace: File?, resultLogFile: String - ) { + ): String? { val pattenOutput = "[\"]?::set-gate-value\\sname=.*" val prefixOutput = "::set-gate-value name=" if (Pattern.matches(pattenOutput, tmpLine)) { val value = tmpLine.removeSurrounding("\"").removePrefix(prefixOutput) val keyValue = value.split("::") if (keyValue.size >= 2) { - File(workspace, resultLogFile).appendText( - "${keyValue[0]}=${value.removePrefix("${keyValue[0]}::")}\n" - ) + val res = "${keyValue[0]}=${value.removePrefix("${keyValue[0]}::")}\n" + File(workspace, resultLogFile).appendText(res) + return res } } + return null } fun execute(file: File, workspace: File?, print2Logger: Boolean, prefix: String = ""): String { diff --git a/src/backend/dispatch-k8s-manager/Makefile b/src/backend/dispatch-k8s-manager/Makefile index 8c4d320af44..098ce1af5d3 100644 --- a/src/backend/dispatch-k8s-manager/Makefile +++ b/src/backend/dispatch-k8s-manager/Makefile @@ -13,6 +13,9 @@ GOFLAGS := # gin export GIN_MODE=release +format: + find ./ -name "*.go" | xargs gofmt -w + test: test-unit .PHONY: test-unit diff --git a/src/backend/dispatch-k8s-manager/cmd/apiserver/apiserver.go b/src/backend/dispatch-k8s-manager/cmd/apiserver/apiserver.go index 72cc958334e..e543b6f0615 100644 --- a/src/backend/dispatch-k8s-manager/cmd/apiserver/apiserver.go +++ b/src/backend/dispatch-k8s-manager/cmd/apiserver/apiserver.go @@ -4,9 +4,11 @@ import ( "disaptch-k8s-manager/pkg/apiserver" "disaptch-k8s-manager/pkg/buildless" "disaptch-k8s-manager/pkg/config" + "disaptch-k8s-manager/pkg/constant" "disaptch-k8s-manager/pkg/cron" "disaptch-k8s-manager/pkg/db/mysql" "disaptch-k8s-manager/pkg/db/redis" + "disaptch-k8s-manager/pkg/docker" "disaptch-k8s-manager/pkg/kubeclient" "disaptch-k8s-manager/pkg/logs" "disaptch-k8s-manager/pkg/task" @@ -63,6 +65,10 @@ func main() { os.Exit(1) } + if config.Config.Docker.Enable { + docker.InitDockerCli() + } + if err := apiserver.InitApiServer(filepath.Join(outDir, "logs", config.AccessLog)); err != nil { fmt.Printf("init api server error %v\n", err) os.Exit(1) @@ -72,7 +78,7 @@ func main() { } func initConfig(configDir string) { - if debug == "true" { + if debug == "true" || os.Getenv(constant.KubernetesManagerDebugEnable) == "true" { config.Envs.IsDebug = true } else { config.Envs.IsDebug = false diff --git a/src/backend/dispatch-k8s-manager/go.mod b/src/backend/dispatch-k8s-manager/go.mod index c3ed13f45ab..92a0debe35f 100644 --- a/src/backend/dispatch-k8s-manager/go.mod +++ b/src/backend/dispatch-k8s-manager/go.mod @@ -1,8 +1,9 @@ module disaptch-k8s-manager -go 1.18 +go 1.19 require ( + github.com/docker/docker v24.0.1+incompatible github.com/gin-gonic/gin v1.9.1 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 @@ -12,12 +13,13 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/pkg/errors v0.9.1 github.com/robfig/cron/v3 v3.0.0 - github.com/sirupsen/logrus v1.8.1 + github.com/sirupsen/logrus v1.9.0 github.com/spf13/viper v1.11.0 github.com/stretchr/testify v1.8.3 github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe github.com/swaggo/gin-swagger v1.5.1 - github.com/swaggo/swag v1.8.4 + github.com/swaggo/swag v1.16.1 + golang.org/x/net v0.23.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 k8s.io/api v0.24.0 k8s.io/apimachinery v0.24.0 @@ -25,21 +27,24 @@ require ( ) require ( + github.com/BurntSushi/toml v1.2.1 // indirect github.com/KyleBanks/depth v1.2.1 // indirect - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/bytedance/sonic v1.9.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful v2.16.0+incompatible // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-logr/logr v1.2.0 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.6 // indirect - github.com/go-openapi/spec v0.20.4 // indirect - github.com/go-openapi/swag v0.19.15 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/spec v0.20.9 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect @@ -53,12 +58,16 @@ require ( github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/magiconair/properties v1.8.6 // indirect - github.com/mailru/easyjson v0.7.6 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -71,23 +80,24 @@ require ( github.com/ugorji/go/codec v1.2.11 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/mod v0.10.0 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/tools v0.6.0 // indirect + golang.org/x/tools v0.9.1 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + gotest.tools/v3 v3.4.0 // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect - sigs.k8s.io/yaml v1.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/src/backend/dispatch-k8s-manager/go.sum b/src/backend/dispatch-k8s-manager/go.sum index 472596edc4b..fe6d479eb48 100644 --- a/src/backend/dispatch-k8s-manager/go.sum +++ b/src/backend/dispatch-k8s-manager/go.sum @@ -39,6 +39,7 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= @@ -46,15 +47,16 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= @@ -78,6 +80,14 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v24.0.1+incompatible h1:NxN81beIxDlUaVt46iUQrYHD9/W3u9EGl52r86O/IGw= +github.com/docker/docker v24.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -116,18 +126,23 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= +github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8= +github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= @@ -265,8 +280,9 @@ github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamh github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= @@ -274,12 +290,16 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -296,6 +316,10 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= @@ -322,8 +346,8 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= @@ -360,8 +384,8 @@ github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9J github.com/swaggo/gin-swagger v1.5.1 h1:PFmlJU1LPn8DjrR0meVLX5gyFdgcPOkLcoFRRFx7WcY= github.com/swaggo/gin-swagger v1.5.1/go.mod h1:Cbj/MlHApPOjZdf4joWFXLLgmZVPyh54GPvPPyVjVZM= github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ= -github.com/swaggo/swag v1.8.4 h1:oGB351qH1JqUqK1tsMYEE5qTBbPk394BhsZxmUfebcI= -github.com/swaggo/swag v1.8.4/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg= +github.com/swaggo/swag v1.16.1 h1:fTNRhKstPKxcnoKsytm4sahr8FaYzUcT7i1/3nd/fBg= +github.com/swaggo/swag v1.16.1/go.mod h1:9/LMvHycG3NFHfR6LwvikHv5iFvmPADQ359cKikGxto= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= @@ -431,7 +455,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -502,6 +527,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -515,7 +541,6 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -556,6 +581,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= @@ -632,8 +658,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -773,6 +799,8 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -805,5 +833,6 @@ sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/apis.go b/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/apis.go index 48a1f63af11..9b645adf0d4 100644 --- a/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/apis.go +++ b/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/apis.go @@ -41,6 +41,7 @@ func InitApis(r *gin.Engine, handlers ...gin.HandlerFunc) { initServiceApis(apis) initIngressApis(apis) initSecretApis(apis) + initDockerApis(apis) } func ok(c *gin.Context, data interface{}) { diff --git a/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/docker.go b/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/docker.go new file mode 100644 index 00000000000..c065d92cd2c --- /dev/null +++ b/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/docker.go @@ -0,0 +1,44 @@ +package apis + +import ( + "disaptch-k8s-manager/pkg/apiserver/service" + "net/http" + + "github.com/gin-gonic/gin" +) + +const ( + dockerPrefix = "/docker" +) + +func initDockerApis(r *gin.RouterGroup) { + docker := r.Group(dockerPrefix) + { + docker.POST("/inspect", dockerInspect) + } +} + +// @Tags docker +// @Summary docker inspect命令(同时会pull) +// @Accept json +// @Product json +// @Param Devops-Token header string true "凭证信息" +// @Param info body service.DockerInspectInfo true "构建机信息" +// @Success 200 {object} types.Result{data=service.TaskId} "任务ID" +// @Router /docker/inspect [post] +func dockerInspect(c *gin.Context) { + info := &service.DockerInspectInfo{} + + if err := c.BindJSON(info); err != nil { + fail(c, http.StatusBadRequest, err) + return + } + + taskId, err := service.DockerInspect(info) + if err != nil { + fail(c, http.StatusInternalServerError, err) + return + } + + ok(c, service.TaskId{TaskId: taskId}) +} diff --git a/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/task.go b/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/task.go index e7bcbd6e7cd..216c0ea27ac 100644 --- a/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/task.go +++ b/src/backend/dispatch-k8s-manager/pkg/apiserver/apis/task.go @@ -8,9 +8,9 @@ import ( ) func initTasksApis(r *gin.RouterGroup) { - jobs := r.Group("/tasks") + tasks := r.Group("/tasks") { - jobs.GET("/:taskId/status", getTaskStatus) + tasks .GET("/:taskId/status", getTaskStatus) } } diff --git a/src/backend/dispatch-k8s-manager/pkg/apiserver/service/docker.go b/src/backend/dispatch-k8s-manager/pkg/apiserver/service/docker.go new file mode 100644 index 00000000000..aafc2f745fa --- /dev/null +++ b/src/backend/dispatch-k8s-manager/pkg/apiserver/service/docker.go @@ -0,0 +1,111 @@ +package service + +import ( + "context" + "disaptch-k8s-manager/pkg/db/mysql" + "disaptch-k8s-manager/pkg/docker" + "disaptch-k8s-manager/pkg/logs" + "disaptch-k8s-manager/pkg/task" + "disaptch-k8s-manager/pkg/types" + "encoding/json" + "strings" + "time" + + dockerTypes "github.com/docker/docker/api/types" + "github.com/pkg/errors" +) + +func DockerInspect(info *DockerInspectInfo) (string, error) { + taskId := generateTaskId() + + if err := mysql.InsertTask(types.Task{ + TaskId: taskId, + TaskKey: info.Name, + TaskBelong: types.TaskBelongDocker, + Action: types.TaskDockerActionInspect, + Status: types.TaskWaiting, + Message: nil, + ActionTime: time.Now(), + UpdateTime: time.Now(), + }); err != nil { + return "", err + } + + go inspect(taskId, info) + + return taskId, nil +} + +func inspect(taskId string, info *DockerInspectInfo) { + task.UpdateTask(taskId, types.TaskRunning) + + ctx := context.Background() + + // 拉取镜像 + pullMsg, err := docker.ImagePull(ctx, info.Ref, info.Credential.Username, info.Credential.Password) + if err != nil { + logs.Error("inspect ImagePull error", err) + task.FailTask(taskId, err.Error()) + return + } + + // 寻找ID + imageName := strings.TrimSpace(info.Ref) + imageStr := strings.TrimPrefix(strings.TrimPrefix(imageName, "http://"), "https://") + images, err := docker.ImageList(ctx) + if err != nil { + logs.Error("get image list error", err) + task.FailTask(taskId, err.Error()) + return + } + id := "" + for _, image := range images { + for _, tagName := range image.RepoTags { + if tagName == imageStr { + id = image.ID + } + } + } + if id == "" { + err = errors.Errorf("image %s not found", imageName) + logs.Errorf("pullMsg %s error %s", pullMsg, err.Error()) + task.FailTask(taskId, err.Error()) + return + } + + defer func() { + // 完事后删除镜像 + if err = docker.ImageRemove(ctx, id, dockerTypes.ImageRemoveOptions{Force: true}); err != nil { + logs.Errorf("remove image %s id %s error %s", info.Ref, id, err.Error()) + } + }() + + // 分析镜像 + image, err := docker.ImageInspect(ctx, info.Ref) + if err != nil { + logs.Error("inspect ImageInspect error", err) + task.FailTask(taskId, err.Error()) + return + } + + msg := &DockerInspectResp{ + Architecture: image.Architecture, + Os: image.Os, + Size: image.Size, + Created: image.Created, + Id: image.ID, + Author: image.Author, + Parent: image.Parent, + OsVersion: image.OsVersion, + } + + msgStr, err := json.Marshal(msg) + if err != nil { + logs.Error("inspect jsonMarshal error", err) + task.FailTask(taskId, err.Error()) + return + } + + task.OkTaskWithMessage(taskId, string(msgStr)) + +} diff --git a/src/backend/dispatch-k8s-manager/pkg/apiserver/service/docker_type.go b/src/backend/dispatch-k8s-manager/pkg/apiserver/service/docker_type.go new file mode 100644 index 00000000000..c0e3ef7d4c0 --- /dev/null +++ b/src/backend/dispatch-k8s-manager/pkg/apiserver/service/docker_type.go @@ -0,0 +1,23 @@ +package service + +type DockerInspectInfo struct { + Name string `json:"name" binding:"required"` // 任务名称，唯一 + Ref string `json:"ref" binding:"required"` // docker镜像信息 如：docker:latest + Credential Credential `json:"cred"` // 拉取镜像凭据 +} + +type Credential struct { + Username string `json:"username"` + Password string `json:"password"` +} + +type DockerInspectResp struct { + Architecture string `json:"arch"` // 架构 + Os string `json:"os"` // 系统 + Size int64 `json:"size"` // 大小 + Created string `json:"created"` // 创建时间 + Id string `json:"id"` // id + Author string `json:"author"` // 作者 + Parent string `json:"parent"` // 父镜像信息 + OsVersion string `json:"osVersion"` // 系统版本 +} diff --git a/src/backend/dispatch-k8s-manager/pkg/config/config_type.go b/src/backend/dispatch-k8s-manager/pkg/config/config_type.go index c00c1bdd966..dd90e9d6759 100644 --- a/src/backend/dispatch-k8s-manager/pkg/config/config_type.go +++ b/src/backend/dispatch-k8s-manager/pkg/config/config_type.go @@ -10,6 +10,7 @@ type ConfigYaml struct { BuildLess BuildLess `json:"buildless"` BuildAndPushImage BuildAndPushImage `json:"buildAndPushImage"` ApiServer ApiServer `json:"apiServer"` + Docker Docker `json:"docker"` } type Server struct { @@ -144,3 +145,7 @@ type BuildLess struct { VolumeMount VolumeMount `json:"volumeMount"` Volume Volume `json:"volume"` } + +type Docker struct { + Enable bool `json:"enable"` +} diff --git a/src/backend/dispatch-k8s-manager/pkg/constant/constant.go b/src/backend/dispatch-k8s-manager/pkg/constant/constant.go new file mode 100644 index 00000000000..444b4a13be6 --- /dev/null +++ b/src/backend/dispatch-k8s-manager/pkg/constant/constant.go @@ -0,0 +1,5 @@ +package constant + +const ( + KubernetesManagerDebugEnable = "KUBERNETES_MANAGER_DEBUG_ENABLE" +) diff --git a/src/backend/dispatch-k8s-manager/pkg/docker/docker.go b/src/backend/dispatch-k8s-manager/pkg/docker/docker.go new file mode 100644 index 00000000000..ca4991f3a5a --- /dev/null +++ b/src/backend/dispatch-k8s-manager/pkg/docker/docker.go @@ -0,0 +1,91 @@ +package docker + +import ( + "encoding/base64" + "encoding/json" + "io" + "strings" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/client" + "github.com/pkg/errors" + "golang.org/x/net/context" +) + +var cli *client.Client + +func InitDockerCli() error { + c, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) + if err != nil { + return err + } + cli = c + + return nil +} + +func ImageList(ctx context.Context) ([]types.ImageSummary, error) { + images, err := cli.ImageList(ctx, types.ImageListOptions{}) + if err != nil { + return nil, errors.Wrap(err, "list image error") + } + + return images, nil +} + +func ImagePull( + ctx context.Context, + ref string, + username string, + password string, +) (string, error) { + imageName := strings.TrimSpace(ref) + + reader, err := cli.ImagePull(ctx, imageName, types.ImagePullOptions{ + RegistryAuth: generateDockerAuth(username, password), + }) + if err != nil { + return "", errors.Wrap(err, "pull new image error") + } + defer reader.Close() + buf := new(strings.Builder) + _, _ = io.Copy(buf, reader) + + return buf.String(), nil +} + +func ImageInspect(ctx context.Context, imageId string) (*types.ImageInspect, error) { + image, _, err := cli.ImageInspectWithRaw(ctx, imageId) + if err != nil { + return nil, errors.Wrap(err, "image inspect error") + } + + return &image, nil +} + +func ImageRemove(ctx context.Context, imageId string, opts types.ImageRemoveOptions) error { + _, err := cli.ImageRemove(ctx, imageId, opts) + if err != nil { + return err + } + + return nil +} + +// generateDockerAuth 创建拉取docker凭据 +func generateDockerAuth(user, password string) string { + if user == "" || password == "" { + return "" + } + + authConfig := types.AuthConfig{ + Username: user, + Password: password, + } + encodedJSON, err := json.Marshal(authConfig) + if err != nil { + panic(err) + } + + return base64.URLEncoding.EncodeToString(encodedJSON) +} diff --git a/src/backend/dispatch-k8s-manager/pkg/docker/type.go b/src/backend/dispatch-k8s-manager/pkg/docker/type.go new file mode 100644 index 00000000000..c89a0d84d55 --- /dev/null +++ b/src/backend/dispatch-k8s-manager/pkg/docker/type.go @@ -0,0 +1,12 @@ +package docker + +type ImagePullPolicyEnum string + +const ( + ImagePullPolicyAlways ImagePullPolicyEnum = "always" + ImagePullPolicyIfNotPresent ImagePullPolicyEnum = "if-not-present" +) + +func (i ImagePullPolicyEnum) String() string { + return string(i) +} diff --git a/src/backend/dispatch-k8s-manager/pkg/logs/logs.go b/src/backend/dispatch-k8s-manager/pkg/logs/logs.go index 21b03f0c10d..78aa7a1ecfe 100644 --- a/src/backend/dispatch-k8s-manager/pkg/logs/logs.go +++ b/src/backend/dispatch-k8s-manager/pkg/logs/logs.go @@ -5,9 +5,6 @@ import ( "disaptch-k8s-manager/pkg/config" "disaptch-k8s-manager/pkg/types" "fmt" - "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" - "gopkg.in/natefinch/lumberjack.v2" "net" "net/http" "net/http/httputil" @@ -15,6 +12,10 @@ import ( "path/filepath" "runtime/debug" "strings" + + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "gopkg.in/natefinch/lumberjack.v2" ) var Logs *logrus.Logger @@ -118,3 +119,11 @@ func Warn(args ...interface{}) { func Error(args ...interface{}) { Logs.Error(args...) } + +func Errorf(format string, args ...interface{}) { + Logs.Errorf(format, args...) +} + +func WithError(err error) *logrus.Entry { + return Logs.WithError(err) +} diff --git a/src/backend/dispatch-k8s-manager/pkg/task/builder_task.go b/src/backend/dispatch-k8s-manager/pkg/task/builder_task.go index e0c8f6ed7bb..469a9d31652 100644 --- a/src/backend/dispatch-k8s-manager/pkg/task/builder_task.go +++ b/src/backend/dispatch-k8s-manager/pkg/task/builder_task.go @@ -9,17 +9,18 @@ import ( "disaptch-k8s-manager/pkg/prometheus" "disaptch-k8s-manager/pkg/types" "fmt" + "time" + "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/watch" - "time" ) func DoCreateBuilder(taskId string, dep *kubeclient.Deployment) { _, err := kubeclient.CreateDockerRegistry(dep.Pod.PullImageSecret) if err != nil { - failTask(taskId, errors.Wrap(err, "create builder pull image secret error").Error()) + FailTask(taskId, errors.Wrap(err, "create builder pull image secret error").Error()) return } @@ -29,14 +30,14 @@ func DoCreateBuilder(taskId string, dep *kubeclient.Deployment) { } // 创建失败后的操作 - failTask(taskId, errors.Wrap(err, "create builder error").Error()) + FailTask(taskId, errors.Wrap(err, "create builder error").Error()) deleteBuilderLinkRes(dep.Name) } func DoStartBuilder(taskId string, builderName string, data []byte) { err := kubeclient.PatchDeployment(builderName, data) if err != nil { - failTask(taskId, errors.Wrap(err, "start builder error").Error()) + FailTask(taskId, errors.Wrap(err, "start builder error").Error()) return } } @@ -55,7 +56,7 @@ func DoStopBuilder(taskId string, builderName string, data []byte) { err = kubeclient.PatchDeployment(builderName, data) if err != nil { - failTask(taskId, errors.Wrap(err, "stop builder error").Error()) + FailTask(taskId, errors.Wrap(err, "stop builder error").Error()) return } @@ -123,14 +124,14 @@ func saveRealResourceUsage(builderName string, pods []*corev1.Pod) error { func DoDeleteBuilder(taskId string, builderName string) { err := kubeclient.DeleteDeployment(builderName) if err != nil { - failTask(taskId, errors.Wrap(err, "delete builder error").Error()) + FailTask(taskId, errors.Wrap(err, "delete builder error").Error()) return } deleteBuilderLinkRes(builderName) deleteBuilderLinkDbData(builderName) - okTask(taskId) + OkTask(taskId) } // deleteBuilderLinkRes 删除构建机相关联的kubernetes资源 @@ -177,7 +178,7 @@ func watchBuilderTaskPodCreateOrStart(event watch.Event, pod *corev1.Pod, taskId { switch podStatus.Phase { case corev1.PodPending: - updateTask(taskId, types.TaskRunning) + UpdateTask(taskId, types.TaskRunning) // 对于task的start/create来说，启动了就算成功，而不关心启动成功还是失败了 case corev1.PodRunning, corev1.PodSucceeded, corev1.PodFailed: { @@ -206,7 +207,7 @@ func watchBuilderTaskPodCreateOrStart(event watch.Event, pod *corev1.Pod, taskId } defer redis.UnLock(key) - okTask(taskId) + OkTask(taskId) // mysql中保存分配至节点成功的构建机最近三次节点信息，用来做下一次调度的依据 if builderName == "" { @@ -222,13 +223,13 @@ func watchBuilderTaskPodCreateOrStart(event watch.Event, pod *corev1.Pod, taskId return } case corev1.PodUnknown: - updateTask(taskId, types.TaskUnknown) + UpdateTask(taskId, types.TaskUnknown) } } case watch.Error: { logs.Error("add job error. ", pod) - failTask(taskId, podStatus.Message+"|"+podStatus.Reason) + FailTask(taskId, podStatus.Message+"|"+podStatus.Reason) } } } @@ -265,14 +266,14 @@ func watchBuilderTaskDeploymentStop(event watch.Event, dep *appsv1.Deployment, t switch event.Type { case watch.Modified: if dep.Spec.Replicas != nil && *dep.Spec.Replicas == 0 { - okTask(taskId) + OkTask(taskId) } case watch.Error: logs.Error("stop builder error. ", dep) if len(dep.Status.Conditions) > 0 { - failTask(taskId, dep.Status.Conditions[0].String()) + FailTask(taskId, dep.Status.Conditions[0].String()) } else { - failTask(taskId, "stop builder error") + FailTask(taskId, "stop builder error") } } } diff --git a/src/backend/dispatch-k8s-manager/pkg/task/job_task.go b/src/backend/dispatch-k8s-manager/pkg/task/job_task.go index 0c8abc352c4..478363cdd98 100644 --- a/src/backend/dispatch-k8s-manager/pkg/task/job_task.go +++ b/src/backend/dispatch-k8s-manager/pkg/task/job_task.go @@ -5,6 +5,7 @@ import ( "disaptch-k8s-manager/pkg/logs" "disaptch-k8s-manager/pkg/types" "fmt" + "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/watch" @@ -18,12 +19,12 @@ func DoCreateBuildAndPushImageJob( // 创建镜像拉取凭据 _, err := kubeclient.CreateDockerRegistry(job.Pod.PullImageSecret) if err != nil { - failTask(taskId, errors.Wrap(err, "create build and push image job pull image secret error").Error()) + FailTask(taskId, errors.Wrap(err, "create build and push image job pull image secret error").Error()) return } if _, err = kubeclient.CreateDockerRegistry(kanikoSecret); err != nil { - failTask(taskId, errors.Wrap(err, "create build and push image push secret error").Error()) + FailTask(taskId, errors.Wrap(err, "create build and push image push secret error").Error()) return } @@ -32,14 +33,14 @@ func DoCreateBuildAndPushImageJob( return } - failTask(taskId, errors.Wrap(err, "create job error").Error()) + FailTask(taskId, errors.Wrap(err, "create job error").Error()) deleteJobLinkRes(job.Name) } func DoCreateJob(taskId string, job *kubeclient.Job) { _, err := kubeclient.CreateDockerRegistry(job.Pod.PullImageSecret) if err != nil { - failTask(taskId, errors.Wrap(err, "create job pull image secret error").Error()) + FailTask(taskId, errors.Wrap(err, "create job pull image secret error").Error()) return } @@ -49,7 +50,7 @@ func DoCreateJob(taskId string, job *kubeclient.Job) { } // 创建失败后的操作 - failTask(taskId, errors.Wrap(err, "create job error").Error()) + FailTask(taskId, errors.Wrap(err, "create job error").Error()) deleteJobLinkRes(job.Name) } @@ -57,13 +58,13 @@ func DoCreateJob(taskId string, job *kubeclient.Job) { func DoDeleteJob(taskId string, jobName string) { err := kubeclient.DeleteJob(jobName) if err != nil { - failTask(taskId, errors.Wrap(err, "delete job error").Error()) + FailTask(taskId, errors.Wrap(err, "delete job error").Error()) return } deleteJobLinkRes(jobName) - okTask(taskId) + OkTask(taskId) } // deleteJobLinkRes 删除JOB相关联的kubernetes资源 @@ -103,18 +104,18 @@ func watchJobTaskPodCreateOrStart(event watch.Event, pod *corev1.Pod, taskId str { switch podStatus.Phase { case corev1.PodPending: - updateTask(taskId, types.TaskRunning) + UpdateTask(taskId, types.TaskRunning) // 对于task的start/create来说，启动了就算成功，而不关系启动成功还是失败了 case corev1.PodRunning, corev1.PodSucceeded, corev1.PodFailed: - okTask(taskId) + OkTask(taskId) case corev1.PodUnknown: - updateTask(taskId, types.TaskUnknown) + UpdateTask(taskId, types.TaskUnknown) } } case watch.Error: { logs.Error("add job error. ", pod) - failTask(taskId, podStatus.Message+"|"+podStatus.Reason) + FailTask(taskId, podStatus.Message+"|"+podStatus.Reason) } } } diff --git a/src/backend/dispatch-k8s-manager/pkg/task/task.go b/src/backend/dispatch-k8s-manager/pkg/task/task.go index dc9fbf4c388..bb9bbf4fbff 100644 --- a/src/backend/dispatch-k8s-manager/pkg/task/task.go +++ b/src/backend/dispatch-k8s-manager/pkg/task/task.go @@ -4,7 +4,6 @@ import ( "disaptch-k8s-manager/pkg/db/mysql" "disaptch-k8s-manager/pkg/logs" "disaptch-k8s-manager/pkg/types" - "github.com/pkg/errors" ) func InitTask() { @@ -12,23 +11,30 @@ func InitTask() { go WatchTaskDeployment() } -func okTask(taskId string) { +func OkTask(taskId string) { err := mysql.UpdateTask(taskId, types.TaskSucceeded, "") if err != nil { - logs.Error(errors.Wrapf(err, "save okTask %s %s error. ", taskId, "")) + logs.Errorf("save OkTask %s error %s", taskId, err.Error()) } } -func updateTask(taskId string, state types.TaskState) { +func OkTaskWithMessage(taskId string, message string) { + err := mysql.UpdateTask(taskId, types.TaskSucceeded, message) + if err != nil { + logs.Errorf("save OkTaskWithMessage %s %s error %s", taskId, message, err.Error()) + } +} + +func UpdateTask(taskId string, state types.TaskState) { err := mysql.UpdateTask(taskId, state, "") if err != nil { - logs.Error(errors.Wrapf(err, "update okTask %s %s error. ", taskId, "")) + logs.Errorf("save UpdateTask %s %s error %s", taskId, state, err.Error()) } } -func failTask(taskId string, message string) { +func FailTask(taskId string, message string) { err := mysql.UpdateTask(taskId, types.TaskFailed, message) if err != nil { - logs.Error(errors.Wrapf(err, "save failTask %s %s error. ", taskId, message)) + logs.Errorf("save FailTask %s %s error %s", taskId, message, err.Error()) } } diff --git a/src/backend/dispatch-k8s-manager/pkg/types/task_type.go b/src/backend/dispatch-k8s-manager/pkg/types/task_type.go index ce8bdb9bdd9..75f5bc54043 100644 --- a/src/backend/dispatch-k8s-manager/pkg/types/task_type.go +++ b/src/backend/dispatch-k8s-manager/pkg/types/task_type.go @@ -23,6 +23,11 @@ const ( TaskActionDelete TaskAction = "delete" ) +// docker 交互操作 +const ( + TaskDockerActionInspect TaskAction = "inspect" +) + type TaskLabelType string const ( @@ -36,6 +41,7 @@ type TaskBelong string const ( TaskBelongBuilder = "builder" TaskBelongJob = "job" + TaskBelongDocker = "docker" ) type Task struct { diff --git a/src/backend/dispatch-k8s-manager/resources/config.yaml b/src/backend/dispatch-k8s-manager/resources/config.yaml index fd6e7c6ad3c..0a923f22ab4 100644 --- a/src/backend/dispatch-k8s-manager/resources/config.yaml +++ b/src/backend/dispatch-k8s-manager/resources/config.yaml @@ -2,7 +2,7 @@ server: port: 8081 mysql: - dataSourceName: root:123456@tcp(localhost:3306)/devops_kubernetes_manager?parseTime=true&loc=Local + dataSourceName: root:123456@tcp(localhost:3306)/devops_ci_kubernetes_manager?parseTime=true&loc=Local connMaxLifetime: 3 maxOpenConns: 10 maxIdleConns: 10 @@ -108,6 +108,9 @@ apiserver: apiToken: key: Devops-Token value: landun - rsaPrivateKey: | - # 在这里保存私钥用来解密apitoken - # 推荐使用rsa-generate生成公私钥，rsa-generate可通过make打包获得 + # 在这里保存私钥用来解密apitoken + # 推荐使用rsa-generate生成公私钥，rsa-generate可通过make打包获得 + rsaPrivateKey: "" + +docker: + enable: true diff --git a/src/backend/dispatch-k8s-manager/swagger/apiserver/docs.go b/src/backend/dispatch-k8s-manager/swagger/apiserver/docs.go index 609c9e87d6b..b1a5352f9bf 100644 --- a/src/backend/dispatch-k8s-manager/swagger/apiserver/docs.go +++ b/src/backend/dispatch-k8s-manager/swagger/apiserver/docs.go @@ -1,5 +1,5 @@ -// Package apiserver GENERATED BY SWAG; DO NOT EDIT -// This file was generated by swaggo/swag +// Code generated by swaggo/swag. DO NOT EDIT. + package apiserver import "github.com/swaggo/swag" @@ -309,6 +309,55 @@ const docTemplate = `{ } } }, + "/docker/inspect": { + "post": { + "consumes": [ + "application/json" + ], + "tags": [ + "docker" + ], + "summary": "docker inspect命令(同时会pull)", + "parameters": [ + { + "type": "string", + "description": "凭证信息", + "name": "Devops-Token", + "in": "header", + "required": true + }, + { + "description": "构建机信息", + "name": "info", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/service.DockerInspectInfo" + } + } + ], + "responses": { + "200": { + "description": "任务ID", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/types.Result" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/service.TaskId" + } + } + } + ] + } + } + } + } + }, "/jobs": { "post": { "consumes": [ @@ -618,7 +667,11 @@ const docTemplate = `{ }, "info": { "description": "构建并推送镜像的具体信息", - "$ref": "#/definitions/service.buildImageInfo" + "allOf": [ + { + "$ref": "#/definitions/service.buildImageInfo" + } + ] }, "name": { "description": "唯一名称", @@ -627,11 +680,19 @@ const docTemplate = `{ }, "podNameSelector": { "description": "Pod名称调度", - "$ref": "#/definitions/service.PodNameSelector" + "allOf": [ + { + "$ref": "#/definitions/service.PodNameSelector" + } + ] }, "resource": { "description": "工作负载资源", - "$ref": "#/definitions/service.CommonWorkLoadResource" + "allOf": [ + { + "$ref": "#/definitions/service.CommonWorkLoadResource" + } + ] } } }, @@ -675,19 +736,35 @@ const docTemplate = `{ }, "privateBuilder": { "description": "私有构建机配置", - "$ref": "#/definitions/service.DedicatedBuilder" + "allOf": [ + { + "$ref": "#/definitions/service.DedicatedBuilder" + } + ] }, "registry": { "description": "镜像凭证", - "$ref": "#/definitions/types.Registry" + "allOf": [ + { + "$ref": "#/definitions/types.Registry" + } + ] }, "resource": { "description": "工作负载资源", - "$ref": "#/definitions/service.CommonWorkLoadResource" + "allOf": [ + { + "$ref": "#/definitions/service.CommonWorkLoadResource" + } + ] }, "specialBuilder": { "description": "特殊构建机配置", - "$ref": "#/definitions/service.DedicatedBuilder" + "allOf": [ + { + "$ref": "#/definitions/service.DedicatedBuilder" + } + ] } } }, @@ -708,6 +785,27 @@ const docTemplate = `{ } } }, + "service.BuilderState": { + "type": "string", + "enum": [ + "readyToRun", + "notExist", + "pending", + "running", + "succeeded", + "failed", + "unknown" + ], + "x-enum-varnames": [ + "BuilderReadyToRun", + "BuilderNotExist", + "BuilderPending", + "BuilderRunning", + "BuilderSucceeded", + "BuilderFailed", + "BuilderUnknown" + ] + }, "service.BuilderStatus": { "type": "object", "properties": { @@ -715,7 +813,7 @@ const docTemplate = `{ "type": "string" }, "status": { - "type": "string" + "$ref": "#/definitions/service.BuilderState" } } }, @@ -766,6 +864,17 @@ const docTemplate = `{ } } }, + "service.Credential": { + "type": "object", + "properties": { + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + } + }, "service.DedicatedBuilder": { "type": "object", "properties": { @@ -774,6 +883,31 @@ const docTemplate = `{ } } }, + "service.DockerInspectInfo": { + "type": "object", + "required": [ + "name", + "ref" + ], + "properties": { + "cred": { + "description": "拉取镜像凭据", + "allOf": [ + { + "$ref": "#/definitions/service.Credential" + } + ] + }, + "name": { + "description": "任务名称，唯一", + "type": "string" + }, + "ref": { + "description": "docker镜像信息 如：docker:latest", + "type": "string" + } + } + }, "service.Job": { "type": "object", "required": [ @@ -818,18 +952,47 @@ const docTemplate = `{ }, "podNameSelector": { "description": "Pod名称调度选项", - "$ref": "#/definitions/service.PodNameSelector" + "allOf": [ + { + "$ref": "#/definitions/service.PodNameSelector" + } + ] }, "registry": { "description": "镜像凭证", - "$ref": "#/definitions/types.Registry" + "allOf": [ + { + "$ref": "#/definitions/types.Registry" + } + ] }, "resource": { "description": "工作负载资源", - "$ref": "#/definitions/service.CommonWorkLoadResource" + "allOf": [ + { + "$ref": "#/definitions/service.CommonWorkLoadResource" + } + ] } } }, + "service.JobState": { + "type": "string", + "enum": [ + "pending", + "running", + "succeeded", + "failed", + "unknown" + ], + "x-enum-varnames": [ + "JobPending", + "JobRunning", + "JobSucceeded", + "JobFailed", + "JobUnknown" + ] + }, "service.JobStatus": { "type": "object", "properties": { @@ -840,7 +1003,7 @@ const docTemplate = `{ "type": "string" }, "state": { - "type": "string" + "$ref": "#/definitions/service.JobState" } } }, @@ -875,7 +1038,7 @@ const docTemplate = `{ "type": "string" }, "status": { - "type": "string" + "$ref": "#/definitions/types.TaskState" } } }, @@ -958,6 +1121,23 @@ const docTemplate = `{ "type": "integer" } } + }, + "types.TaskState": { + "type": "string", + "enum": [ + "waiting", + "running", + "succeeded", + "failed", + "unknown" + ], + "x-enum-varnames": [ + "TaskWaiting", + "TaskRunning", + "TaskSucceeded", + "TaskFailed", + "TaskUnknown" + ] } } }` @@ -972,6 +1152,8 @@ var SwaggerInfo = &swag.Spec{ Description: "", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, + LeftDelim: "{{", + RightDelim: "}}", } func init() { diff --git a/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.json b/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.json index d53e59cc2a0..66563b9aa23 100644 --- a/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.json +++ b/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.json @@ -300,6 +300,55 @@ } } }, + "/docker/inspect": { + "post": { + "consumes": [ + "application/json" + ], + "tags": [ + "docker" + ], + "summary": "docker inspect命令(同时会pull)", + "parameters": [ + { + "type": "string", + "description": "凭证信息", + "name": "Devops-Token", + "in": "header", + "required": true + }, + { + "description": "构建机信息", + "name": "info", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/service.DockerInspectInfo" + } + } + ], + "responses": { + "200": { + "description": "任务ID", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/types.Result" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/service.TaskId" + } + } + } + ] + } + } + } + } + }, "/jobs": { "post": { "consumes": [ @@ -609,7 +658,11 @@ }, "info": { "description": "构建并推送镜像的具体信息", - "$ref": "#/definitions/service.buildImageInfo" + "allOf": [ + { + "$ref": "#/definitions/service.buildImageInfo" + } + ] }, "name": { "description": "唯一名称", @@ -618,11 +671,19 @@ }, "podNameSelector": { "description": "Pod名称调度", - "$ref": "#/definitions/service.PodNameSelector" + "allOf": [ + { + "$ref": "#/definitions/service.PodNameSelector" + } + ] }, "resource": { "description": "工作负载资源", - "$ref": "#/definitions/service.CommonWorkLoadResource" + "allOf": [ + { + "$ref": "#/definitions/service.CommonWorkLoadResource" + } + ] } } }, @@ -666,19 +727,35 @@ }, "privateBuilder": { "description": "私有构建机配置", - "$ref": "#/definitions/service.DedicatedBuilder" + "allOf": [ + { + "$ref": "#/definitions/service.DedicatedBuilder" + } + ] }, "registry": { "description": "镜像凭证", - "$ref": "#/definitions/types.Registry" + "allOf": [ + { + "$ref": "#/definitions/types.Registry" + } + ] }, "resource": { "description": "工作负载资源", - "$ref": "#/definitions/service.CommonWorkLoadResource" + "allOf": [ + { + "$ref": "#/definitions/service.CommonWorkLoadResource" + } + ] }, "specialBuilder": { "description": "特殊构建机配置", - "$ref": "#/definitions/service.DedicatedBuilder" + "allOf": [ + { + "$ref": "#/definitions/service.DedicatedBuilder" + } + ] } } }, @@ -699,6 +776,27 @@ } } }, + "service.BuilderState": { + "type": "string", + "enum": [ + "readyToRun", + "notExist", + "pending", + "running", + "succeeded", + "failed", + "unknown" + ], + "x-enum-varnames": [ + "BuilderReadyToRun", + "BuilderNotExist", + "BuilderPending", + "BuilderRunning", + "BuilderSucceeded", + "BuilderFailed", + "BuilderUnknown" + ] + }, "service.BuilderStatus": { "type": "object", "properties": { @@ -706,7 +804,7 @@ "type": "string" }, "status": { - "type": "string" + "$ref": "#/definitions/service.BuilderState" } } }, @@ -757,6 +855,17 @@ } } }, + "service.Credential": { + "type": "object", + "properties": { + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + } + }, "service.DedicatedBuilder": { "type": "object", "properties": { @@ -765,6 +874,31 @@ } } }, + "service.DockerInspectInfo": { + "type": "object", + "required": [ + "name", + "ref" + ], + "properties": { + "cred": { + "description": "拉取镜像凭据", + "allOf": [ + { + "$ref": "#/definitions/service.Credential" + } + ] + }, + "name": { + "description": "任务名称，唯一", + "type": "string" + }, + "ref": { + "description": "docker镜像信息 如：docker:latest", + "type": "string" + } + } + }, "service.Job": { "type": "object", "required": [ @@ -809,18 +943,47 @@ }, "podNameSelector": { "description": "Pod名称调度选项", - "$ref": "#/definitions/service.PodNameSelector" + "allOf": [ + { + "$ref": "#/definitions/service.PodNameSelector" + } + ] }, "registry": { "description": "镜像凭证", - "$ref": "#/definitions/types.Registry" + "allOf": [ + { + "$ref": "#/definitions/types.Registry" + } + ] }, "resource": { "description": "工作负载资源", - "$ref": "#/definitions/service.CommonWorkLoadResource" + "allOf": [ + { + "$ref": "#/definitions/service.CommonWorkLoadResource" + } + ] } } }, + "service.JobState": { + "type": "string", + "enum": [ + "pending", + "running", + "succeeded", + "failed", + "unknown" + ], + "x-enum-varnames": [ + "JobPending", + "JobRunning", + "JobSucceeded", + "JobFailed", + "JobUnknown" + ] + }, "service.JobStatus": { "type": "object", "properties": { @@ -831,7 +994,7 @@ "type": "string" }, "state": { - "type": "string" + "$ref": "#/definitions/service.JobState" } } }, @@ -866,7 +1029,7 @@ "type": "string" }, "status": { - "type": "string" + "$ref": "#/definitions/types.TaskState" } } }, @@ -949,6 +1112,23 @@ "type": "integer" } } + }, + "types.TaskState": { + "type": "string", + "enum": [ + "waiting", + "running", + "succeeded", + "failed", + "unknown" + ], + "x-enum-varnames": [ + "TaskWaiting", + "TaskRunning", + "TaskSucceeded", + "TaskFailed", + "TaskUnknown" + ] } } } \ No newline at end of file diff --git a/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.yaml b/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.yaml index 03fecc91edb..96ebce4efc4 100644 --- a/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.yaml +++ b/src/backend/dispatch-k8s-manager/swagger/apiserver/swagger.yaml @@ -6,17 +6,20 @@ definitions: description: Job存活时间 type: integer info: - $ref: '#/definitions/service.buildImageInfo' + allOf: + - $ref: '#/definitions/service.buildImageInfo' description: 构建并推送镜像的具体信息 name: description: 唯一名称 maxLength: 32 type: string podNameSelector: - $ref: '#/definitions/service.PodNameSelector' + allOf: + - $ref: '#/definitions/service.PodNameSelector' description: Pod名称调度 resource: - $ref: '#/definitions/service.CommonWorkLoadResource' + allOf: + - $ref: '#/definitions/service.CommonWorkLoadResource' description: 工作负载资源 required: - info @@ -49,16 +52,20 @@ definitions: $ref: '#/definitions/types.NFS' type: array privateBuilder: - $ref: '#/definitions/service.DedicatedBuilder' + allOf: + - $ref: '#/definitions/service.DedicatedBuilder' description: 私有构建机配置 registry: - $ref: '#/definitions/types.Registry' + allOf: + - $ref: '#/definitions/types.Registry' description: 镜像凭证 resource: - $ref: '#/definitions/service.CommonWorkLoadResource' + allOf: + - $ref: '#/definitions/service.CommonWorkLoadResource' description: 工作负载资源 specialBuilder: - $ref: '#/definitions/service.DedicatedBuilder' + allOf: + - $ref: '#/definitions/service.DedicatedBuilder' description: 特殊构建机配置 required: - image @@ -76,12 +83,30 @@ definitions: type: string type: object type: object + service.BuilderState: + enum: + - readyToRun + - notExist + - pending + - running + - succeeded + - failed + - unknown + type: string + x-enum-varnames: + - BuilderReadyToRun + - BuilderNotExist + - BuilderPending + - BuilderRunning + - BuilderSucceeded + - BuilderFailed + - BuilderUnknown service.BuilderStatus: properties: message: type: string status: - type: string + $ref: '#/definitions/service.BuilderState' type: object service.CommonWorkLoadResource: properties: @@ -119,11 +144,34 @@ definitions: - requestDiskIO - requestMem type: object + service.Credential: + properties: + password: + type: string + username: + type: string + type: object service.DedicatedBuilder: properties: name: type: string type: object + service.DockerInspectInfo: + properties: + cred: + allOf: + - $ref: '#/definitions/service.Credential' + description: 拉取镜像凭据 + name: + description: 任务名称，唯一 + type: string + ref: + description: docker镜像信息 如：docker:latest + type: string + required: + - name + - ref + type: object service.Job: properties: activeDeadlineSeconds: @@ -152,19 +200,36 @@ definitions: $ref: '#/definitions/types.NFS' type: array podNameSelector: - $ref: '#/definitions/service.PodNameSelector' + allOf: + - $ref: '#/definitions/service.PodNameSelector' description: Pod名称调度选项 registry: - $ref: '#/definitions/types.Registry' + allOf: + - $ref: '#/definitions/types.Registry' description: 镜像凭证 resource: - $ref: '#/definitions/service.CommonWorkLoadResource' + allOf: + - $ref: '#/definitions/service.CommonWorkLoadResource' description: 工作负载资源 required: - image - name - resource type: object + service.JobState: + enum: + - pending + - running + - succeeded + - failed + - unknown + type: string + x-enum-varnames: + - JobPending + - JobRunning + - JobSucceeded + - JobFailed + - JobUnknown service.JobStatus: properties: message: @@ -172,7 +237,7 @@ definitions: podIp: type: string state: - type: string + $ref: '#/definitions/service.JobState' type: object service.PodNameSelector: properties: @@ -195,7 +260,7 @@ definitions: detail: type: string status: - type: string + $ref: '#/definitions/types.TaskState' type: object service.buildImageInfo: properties: @@ -252,6 +317,20 @@ definitions: status: type: integer type: object + types.TaskState: + enum: + - waiting + - running + - succeeded + - failed + - unknown + type: string + x-enum-varnames: + - TaskWaiting + - TaskRunning + - TaskSucceeded + - TaskFailed + - TaskUnknown info: contact: {} title: kubernetes-manager api文档 @@ -432,6 +511,35 @@ paths: summary: 获取远程登录链接 tags: - builder + /docker/inspect: + post: + consumes: + - application/json + parameters: + - description: 凭证信息 + in: header + name: Devops-Token + required: true + type: string + - description: 构建机信息 + in: body + name: info + required: true + schema: + $ref: '#/definitions/service.DockerInspectInfo' + responses: + "200": + description: 任务ID + schema: + allOf: + - $ref: '#/definitions/types.Result' + - properties: + data: + $ref: '#/definitions/service.TaskId' + type: object + summary: docker inspect命令(同时会pull) + tags: + - docker /jobs: post: consumes: diff --git a/src/backend/dispatch-k8s-manager/swagger/init-swager.sh b/src/backend/dispatch-k8s-manager/swagger/init-swager.sh old mode 100644 new mode 100755 diff --git a/src/frontend/bk-permission/dist/main.css b/src/frontend/bk-permission/dist/main.css index 3feedc17fcd..152cfcbaca0 100644 --- a/src/frontend/bk-permission/dist/main.css +++ b/src/frontend/bk-permission/dist/main.css @@ -1 +1 @@ -.no-enable-permission[data-v-34d87135]{height:100%}.content-wrapper[data-v-34d87135]{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;align-items:center;background-color:#fff;-webkit-box-shadow:0 2px 2px 0 rgba(0,0,0,.15);box-shadow:0 2px 2px 0 rgba(0,0,0,.15);display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;font-size:14px;height:100%;padding-top:10%;text-align:center;width:100%}[data-v-34d87135] .bk-exception-img{height:240px}.mt10[data-v-34d87135]{margin-top:10px}.apply-form[data-v-cf69882c]{width:98%}[data-v-cf69882c] .bk-dialog-header{text-align:left!important}.deadline-wrapper[data-v-cf69882c]{display:-webkit-box;display:-ms-flexbox;display:flex}.deadline-btn[data-v-cf69882c]{min-width:100px}.custom-time-select[data-v-cf69882c]{width:110px}.expired[data-v-cf69882c]{padding-right:10px}.new-expired[data-v-cf69882c]{padding-left:10px}.arrows-icon[data-v-cf69882c]{height:12px;width:12px}.btn[data-v-a13c2f58]{margin-right:5px}.group-name[data-v-a13c2f58]{color:#979ba5;font-size:12px;margin-left:10px}.status-content[data-v-a13c2f58]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex}.status-icon[data-v-a13c2f58]{height:16px;margin-right:5px;width:16px}.detail-content[data-v-a13c2f58]{padding:20px}.detail-content .title[data-v-a13c2f58]{color:#313238;font-size:14px;margin-left:14px}.detail-content .title[data-v-a13c2f58]:before{background:#699df4;border-radius:1px;content:"";height:16px;left:20px;position:absolute;top:22px;width:4px}.detail-content .content[data-v-a13c2f58]{margin-top:15px}.detail-content .permission-item[data-v-a13c2f58]{cursor:default!important;margin-bottom:10px;min-width:150px}.detail-content .is-disabled .bk-checkbox-text[data-v-a13c2f58]{color:#d6d7d7!important}.detail-content .is-checked .bk-checkbox[data-v-a13c2f58]{background-color:#c2daff!important;border-color:#c2daff!important}.detail-content .is-checked .bk-checkbox-text[data-v-a13c2f58]{color:#63656e!important}.group-manage[data-v-0ce31da9]{-webkit-box-flex:1;-ms-flex:1;flex:1}.content-wrapper[data-v-0ce31da9]{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;align-items:center;background-color:#fff;-webkit-box-shadow:0 2px 2px 0 rgba(0,0,0,.15);box-shadow:0 2px 2px 0 rgba(0,0,0,.15);display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;font-size:14px;height:100%;padding-top:10%;text-align:center;width:100%}.btn[data-v-0ce31da9]{margin-top:32px}[data-v-0ce31da9] .bk-exception-img{height:240px}[data-v-0ce31da9] .bk-exception-title{color:#313238;font-size:24px;margin-top:18px}.bk-scroll-load-list[data-v-fce37e0c]{height:100%;overflow:auto}.group-aside[data-v-46795eef]{background-color:#fff;border-right:1px solid #dde0e6;height:100%;min-width:240px;width:240px}.group-list[data-v-46795eef]{height:auto;max-height:calc(100% - 130px);overflow-y:auto}.group-list[data-v-46795eef]::-webkit-scrollbar-thumb{background-color:#c4c6cc!important;border-radius:5px!important}.group-list[data-v-46795eef]::-webkit-scrollbar-thumb:hover{background-color:#979ba5!important}.group-list[data-v-46795eef]::-webkit-scrollbar{height:4px!important;width:4px!important}.group-title[data-v-46795eef]{display:inline-block;font-size:14px;font-weight:700;line-height:50px;margin-bottom:8px;padding-left:24px;width:100%}.group-item[data-v-46795eef]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#63656e;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:14px;height:40px;line-height:40px;padding:0 12px;width:100%}.group-item[data-v-46795eef]:hover{background-color:#eaebf0}.group-active[data-v-46795eef]{background-color:#e1ecff!important;color:#3a84ff!important}.group-active .group-num[data-v-46795eef],.group-active .user-num[data-v-46795eef]{background-color:#a3c5fd;color:#fff}.group-active .group-icon[data-v-46795eef]{-webkit-filter:invert(100%) sepia(0) saturate(1%) hue-rotate(151deg) brightness(104%) contrast(101%);filter:invert(100%) sepia(0) saturate(1%) hue-rotate(151deg) brightness(104%) contrast(101%)}.group-num[data-v-46795eef],.user-num[data-v-46795eef]{background-color:#a3c5fd;color:#fff}.group-name[data-v-46795eef]{-webkit-box-flex:1;display:inline-block;-ms-flex:1;flex:1;max-width:130px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.group-num[data-v-46795eef],.user-num[data-v-46795eef]{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;align-items:center;background:#f0f1f5;border-radius:2px;color:#c4c6cc;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px;height:16px;justify-content:space-evenly;line-height:16px;margin-right:3px;text-align:center;width:40px}.more-icon[data-v-46795eef]{border-radius:50%;color:#63656e;padding:1px}.more-icon[data-v-46795eef]:hover{background-color:#dcdee5;color:#3a84ff!important}.group-icon[data-v-46795eef]{-webkit-filter:invert(89%) sepia(8%) saturate(136%) hue-rotate(187deg) brightness(91%) contrast(86%);filter:invert(89%) sepia(8%) saturate(136%) hue-rotate(187deg) brightness(91%) contrast(86%);height:12px;width:12px}.line-split[data-v-46795eef]{background:#ccc;height:1px;margin:10px auto;width:80%}.add-group-btn[data-v-46795eef]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex}.add-icon[data-v-46795eef]{margin-right:10px}.group-more-option[data-v-46795eef]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;height:18px}.close-btn[data-v-46795eef]{margin-bottom:20px;text-align:center}.small-size[data-v-46795eef]{scale:.9}.close-manage-dialog .title-icon[data-v-46795eef]{color:#ff9c01;font-size:42px;margin-bottom:15px}.close-manage-dialog .close-title[data-v-46795eef]{margin-top:10px;white-space:normal!important}.close-manage-dialog .bk-dialog-header[data-v-46795eef]{padding:15px 0}.close-manage-dialog .bk-dialog-title[data-v-46795eef]{height:26px!important;overflow:visible!important;overflow:initial!important}.close-manage-dialog .confirm-close[data-v-46795eef]{margin:15px 0 30px}.close-manage-dialog .close-tips[data-v-46795eef]{background:#f5f6fa;padding:20px}.close-manage-dialog .option-btns[data-v-46795eef]{margin-top:20px;text-align:center}.close-manage-dialog .option-btns .close-btn[data-v-46795eef]{margin-bottom:0!important;margin-right:10px}.close-manage-dialog .option-btns .btn[data-v-46795eef]{width:88px}.group-more-option .bk-tooltip-ref{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;height:18px}.permission-manage[data-v-8efa30a2]{-webkit-box-shadow:0 2px 2px 0 rgba(0,0,0,.149);box-shadow:0 2px 2px 0 rgba(0,0,0,.149);display:-webkit-box;display:-ms-flexbox;display:flex;height:100%}.permission-wrapper[data-v-05c80676]{height:100%;overflow:auto;width:100%}.bk-permission-cursor-element{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0iIzYzNjU2RSIgZD0iTTEwLjg3NSA4aC41OGMuMzAxIDAgLjU0NS4yNS41NDUuNTZ2Ni44OGMwIC4zMS0uMjQ0LjU2LS41NDUuNTZILjU0NUEuNTUyLjU1MiAwIDAgMSAwIDE1LjQ0VjguNTZDMCA4LjI1LjI0NCA4IC41NDUgOCIvPjxwYXRoIGZpbGw9IiM2MzY1NkUiIGQ9Ik0xLjcwNSA4VjIuMjRDMS43MDUgMS4wMDMgMi42OCAwIDMuODg2IDBoNC4yMjhjMS4yMDUgMCAyLjE4MSAxLjAwMyAyLjE4MSAyLjI0VjZIOS4wNjhWMi4yNGMwLS41NC0uNDI4LS45OC0uOTU0LS45OEgzLjg4NmEuOTY4Ljk2OCAwIDAgMC0uOTU0Ljk4VjhoNy45NDNaIj48YW5pbWF0ZVRyYW5zZm9ybSBhdHRyaWJ1dGVOYW1lPSJ0cmFuc2Zvcm0iIGF0dHJpYnV0ZVR5cGU9IlhNTCIgdHlwZT0idHJhbnNsYXRlIiB2YWx1ZXM9IjAgMjsgMCAwOyAwIDAiIGtleVRpbWVzPSIwOyAuNTsgMSIgZHVyPSIxcyIgcmVwZWF0Q291bnQ9ImluZGVmaW5pdGUiLz48L3BhdGg+PC9zdmc+);height:16px;width:12px}.bk-permission-disable .bk-button,.bk-permission-disable .bk-button:hover,.bk-permission-disable.bk-button,.bk-permission-disable.bk-button:hover{background:#fff!important;border-color:#dcdee5!important;color:#c4c6cc!important}.bk-permission-disable .bk-button.bk-button-primary,.bk-permission-disable .bk-button.bk-button-primary:hover,.bk-permission-disable .bk-button.bk-primary,.bk-permission-disable .bk-button.bk-primary:hover,.bk-permission-disable.bk-button.bk-button-primary,.bk-permission-disable.bk-button.bk-button-primary:hover,.bk-permission-disable.bk-button.bk-primary,.bk-permission-disable.bk-button.bk-primary:hover{background:#dcdee5!important;border-color:#dcdee5!important;color:#fff!important}.bk-permission-disable .bk-button.bk-button-text,.bk-permission-disable .bk-button.bk-button-text:hover,.bk-permission-disable.bk-button.bk-button-text,.bk-permission-disable.bk-button.bk-button-text:hover{background:transparent!important;border-color:transparent!important;color:#dcdee5!important}.bk-permission-disable,.bk-permission-disable:hover{color:#dcdee5!important}.bk-permission-tooltips{position:relative;white-space:nowrap}.bk-permission-tooltips[tooltips]:before{border-color:#000 transparent transparent;border-style:solid;border-width:4px 6px 0;content:"";left:50%;opacity:0;position:absolute;top:-5px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:99}.bk-permission-tooltips[tooltips]:after{background-color:rgba(0,0,0,.8);border-radius:5px;color:#fff;content:attr(tooltips);font-size:12px;left:50%;line-height:18px;opacity:0;padding:7px 14px;pointer-events:none;position:absolute;text-align:center;top:-5px;-webkit-transform:translateX(-50%) translateY(-100%);transform:translateX(-50%) translateY(-100%);z-index:9999}.bk-permission-tooltips[tooltips]:hover:after,.bk-permission-tooltips[tooltips]:hover:before{opacity:1}.permission-dialog .bk-dialog-sub-header{padding:0!important;text-align:center}.permission-exception .bk-exception-text{margin:-5px 0 25px}.permission-table{margin-bottom:20px;margin-left:25px;width:590px!important}.permission-table.bk-table:before{background:#dfe0e5}.permission-table .bk-table-empty-block{width:auto}.permission-table .cell{width:90%}.permission-footer{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-pack:end;-ms-flex-pack:end;align-items:center;background:#fafbfd;-webkit-box-shadow:0 -1px 0 0 #dcdee5;box-shadow:0 -1px 0 0 #dcdee5;display:-webkit-box;display:-ms-flexbox;display:flex;height:48px;justify-content:flex-end}.permission-confirm{margin-right:5px}.permission-cancel{margin-right:25px}.permission-list{background:#3a84ff;border-radius:2px;height:32px;margin-right:5px;width:94px}.permission-list .bk-dropdown-trigger{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-pack:center;-ms-flex-pack:center;align-items:center;color:#fff;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:14px!important;height:100%;justify-content:center;line-height:30px;padding:0 14px}.permission-list .bk-dropdown-list{width:auto}.permission-list .bk-dropdown-list>li{cursor:pointer;font-size:14px!important;font-weight:400;line-height:32px;padding:0 14px}.permission-list .bk-dropdown-list>li:hover{background:#f5f7fa}.permission-list .icon-angle-down{font-size:20px}.permission-refresh-dialog{-webkit-box-pack:center;-ms-flex-pack:center;display:-webkit-box;display:-ms-flexbox;display:flex;justify-content:center;margin:25px}.permission-dialog-v3 .bk-modal-header{height:30px}.permission-dialog-v3 .bk-modal-content{padding:0!important}.permission-dialog-v3 .bk-exception-part{margin-bottom:20px}.permission-dialog-v3.bk-modal-wrapper.bk-info-wrapper .bk-modal-content .bk-info-sub-title{margin-bottom:0}.permission-dialog-v3 .permission-table-wrapper{margin-bottom:20px;margin-left:25px;width:590px!important}.mr10{margin-right:10px}.mr20{margin-right:20px}.mr25{margin-right:25px}.icon-angle-down-v3{font-size:20px;margin:0 -7px 0 2px} \ No newline at end of file +.no-enable-permission[data-v-34d87135]{height:100%}.content-wrapper[data-v-34d87135]{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;align-items:center;background-color:#fff;-webkit-box-shadow:0 2px 2px 0 #00000026;box-shadow:0 2px 2px 0 #00000026;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;font-size:14px;height:100%;padding-top:10%;text-align:center;width:100%}[data-v-34d87135] .bk-exception-img{height:240px}.mt10[data-v-34d87135]{margin-top:10px}.apply-form[data-v-cf69882c]{width:98%}[data-v-cf69882c] .bk-dialog-header{text-align:left!important}.deadline-wrapper[data-v-cf69882c]{display:-webkit-box;display:-ms-flexbox;display:flex}.deadline-btn[data-v-cf69882c]{min-width:100px}.custom-time-select[data-v-cf69882c]{width:110px}.expired[data-v-cf69882c]{padding-right:10px}.new-expired[data-v-cf69882c]{padding-left:10px}.arrows-icon[data-v-cf69882c]{height:12px;width:12px}.btn[data-v-a13c2f58]{margin-right:5px}.group-name[data-v-a13c2f58]{color:#979ba5;font-size:12px;margin-left:10px}.status-content[data-v-a13c2f58]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex}.status-icon[data-v-a13c2f58]{height:16px;margin-right:5px;width:16px}.detail-content[data-v-a13c2f58]{padding:20px}.detail-content .title[data-v-a13c2f58]{color:#313238;font-size:14px;margin-left:14px}.detail-content .title[data-v-a13c2f58]:before{background:#699df4;border-radius:1px;content:"";height:16px;left:20px;position:absolute;top:22px;width:4px}.detail-content .content[data-v-a13c2f58]{margin-top:15px}.detail-content .permission-item[data-v-a13c2f58]{cursor:default!important;margin-bottom:10px;min-width:150px}.detail-content .is-disabled .bk-checkbox-text[data-v-a13c2f58]{color:#d6d7d7!important}.detail-content .is-checked .bk-checkbox[data-v-a13c2f58]{background-color:#c2daff!important;border-color:#c2daff!important}.detail-content .is-checked .bk-checkbox-text[data-v-a13c2f58]{color:#63656e!important}.group-manage[data-v-0ce31da9]{-webkit-box-flex:1;-ms-flex:1;flex:1}.content-wrapper[data-v-0ce31da9]{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;align-items:center;background-color:#fff;-webkit-box-shadow:0 2px 2px 0 #00000026;box-shadow:0 2px 2px 0 #00000026;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;font-size:14px;height:100%;padding-top:10%;text-align:center;width:100%}.btn[data-v-0ce31da9]{margin-top:32px}[data-v-0ce31da9] .bk-exception-img{height:240px}[data-v-0ce31da9] .bk-exception-title{color:#313238;font-size:24px;margin-top:18px}.bk-scroll-load-list[data-v-fce37e0c]{height:100%;overflow:auto}.group-aside[data-v-26870bee]{background-color:#fff;border-right:1px solid #dde0e6;height:100%;min-width:240px;width:240px}.group-list[data-v-26870bee]{height:auto;max-height:calc(100% - 70px);overflow-y:auto}.group-list[data-v-26870bee]::-webkit-scrollbar-thumb{background-color:#c4c6cc!important;border-radius:5px!important}.group-list[data-v-26870bee]::-webkit-scrollbar-thumb:hover{background-color:#979ba5!important}.group-list[data-v-26870bee]::-webkit-scrollbar{height:4px!important;width:4px!important}.group-title[data-v-26870bee]{display:inline-block;font-size:14px;font-weight:700;line-height:50px;margin-bottom:8px;padding-left:24px;width:100%}.group-item[data-v-26870bee]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:#63656e;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:14px;height:40px;line-height:40px;padding:0 12px;width:100%}.group-item[data-v-26870bee]:hover{background-color:#eaebf0}.group-active[data-v-26870bee]{background-color:#e1ecff!important;color:#3a84ff!important}.group-active .group-num[data-v-26870bee],.group-active .user-num[data-v-26870bee]{background-color:#a3c5fd;color:#fff}.group-active .group-icon[data-v-26870bee]{color:#a3c5fd}.num-box[data-v-26870bee]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-right:10px;text-align:center}.group-num[data-v-26870bee],.user-num[data-v-26870bee]{background-color:#a3c5fd;color:#fff}.group-name[data-v-26870bee]{-webkit-box-flex:1;display:inline-block;-ms-flex:1;flex:1;max-width:130px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.group-num[data-v-26870bee],.user-num[data-v-26870bee]{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;align-items:center;background:#f0f1f5;border-radius:2px;color:#c4c6cc;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px;height:16px;justify-content:space-evenly;line-height:16px;margin-right:3px;text-align:center;width:40px}.more-icon[data-v-26870bee]{border-radius:50%;color:#63656e;padding:1px}.more-icon[data-v-26870bee]:hover{background-color:#dcdee5;color:#3a84ff!important}.group-icon[data-v-26870bee]{color:#c4c6cc;font-size:12px;margin-bottom:4px}.line-split[data-v-26870bee]{background:#ccc;height:1px;margin:10px auto;width:80%}.add-group-btn[data-v-26870bee]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex}.add-icon[data-v-26870bee]{margin-right:10px}.group-more-option[data-v-26870bee]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;height:18px}.close-btn[data-v-26870bee]{margin-bottom:20px;text-align:center}.close-manage-dialog .title-icon[data-v-26870bee]{color:#ff9c01;font-size:42px;margin-bottom:15px}.close-manage-dialog .close-title[data-v-26870bee]{margin-top:10px;white-space:normal!important}.close-manage-dialog .bk-dialog-header[data-v-26870bee]{padding:15px 0}.close-manage-dialog .bk-dialog-title[data-v-26870bee]{height:26px!important;overflow:visible!important;overflow:initial!important}.close-manage-dialog .confirm-close[data-v-26870bee]{margin:15px 0 30px}.close-manage-dialog .close-tips[data-v-26870bee]{background:#f5f6fa;padding:20px}.close-manage-dialog .option-btns[data-v-26870bee]{margin-top:20px;text-align:center}.close-manage-dialog .option-btns .close-btn[data-v-26870bee]{margin-bottom:0!important;margin-right:10px}.close-manage-dialog .option-btns .btn[data-v-26870bee]{width:88px}.group-more-option .bk-tooltip-ref{-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;height:18px}.permission-manage[data-v-8efa30a2]{-webkit-box-shadow:0 2px 2px 0 rgba(0,0,0,.149);box-shadow:0 2px 2px 0 rgba(0,0,0,.149);display:-webkit-box;display:-ms-flexbox;display:flex;height:100%}.permission-wrapper[data-v-05c80676]{height:100%;overflow:auto;width:100%}.bk-permission-cursor-element{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0iIzYzNjU2RSIgZD0iTTEwLjg3NSA4aC41OGMuMzAxIDAgLjU0NS4yNS41NDUuNTZ2Ni44OGMwIC4zMS0uMjQ0LjU2LS41NDUuNTZILjU0NUEuNTUyLjU1MiAwIDAgMSAwIDE1LjQ0VjguNTZDMCA4LjI1LjI0NCA4IC41NDUgOCIvPjxwYXRoIGZpbGw9IiM2MzY1NkUiIGQ9Ik0xLjcwNSA4VjIuMjRDMS43MDUgMS4wMDMgMi42OCAwIDMuODg2IDBoNC4yMjhjMS4yMDUgMCAyLjE4MSAxLjAwMyAyLjE4MSAyLjI0VjZIOS4wNjhWMi4yNGMwLS41NC0uNDI4LS45OC0uOTU0LS45OEgzLjg4NmEuOTY4Ljk2OCAwIDAgMC0uOTU0Ljk4VjhoNy45NDNaIj48YW5pbWF0ZVRyYW5zZm9ybSBhdHRyaWJ1dGVOYW1lPSJ0cmFuc2Zvcm0iIGF0dHJpYnV0ZVR5cGU9IlhNTCIgdHlwZT0idHJhbnNsYXRlIiB2YWx1ZXM9IjAgMjsgMCAwOyAwIDAiIGtleVRpbWVzPSIwOyAuNTsgMSIgZHVyPSIxcyIgcmVwZWF0Q291bnQ9ImluZGVmaW5pdGUiLz48L3BhdGg+PC9zdmc+);height:16px;width:12px}.bk-permission-disable .bk-button,.bk-permission-disable .bk-button:hover,.bk-permission-disable.bk-button,.bk-permission-disable.bk-button:hover{background:#fff!important;border-color:#dcdee5!important;color:#c4c6cc!important}.bk-permission-disable .bk-button.bk-button-primary,.bk-permission-disable .bk-button.bk-button-primary:hover,.bk-permission-disable .bk-button.bk-primary,.bk-permission-disable .bk-button.bk-primary:hover,.bk-permission-disable.bk-button.bk-button-primary,.bk-permission-disable.bk-button.bk-button-primary:hover,.bk-permission-disable.bk-button.bk-primary,.bk-permission-disable.bk-button.bk-primary:hover{background:#dcdee5!important;border-color:#dcdee5!important;color:#fff!important}.bk-permission-disable .bk-button.bk-button-text,.bk-permission-disable .bk-button.bk-button-text:hover,.bk-permission-disable.bk-button.bk-button-text,.bk-permission-disable.bk-button.bk-button-text:hover{background:#0000!important;border-color:#0000!important;color:#dcdee5!important}.bk-permission-disable,.bk-permission-disable:hover{color:#dcdee5!important}.bk-permission-tooltips{position:relative;white-space:nowrap}.bk-permission-tooltips[tooltips]:before{border-color:#000 #0000 #0000;border-style:solid;border-width:4px 6px 0;content:"";left:50%;opacity:0;position:absolute;top:-5px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:99}.bk-permission-tooltips[tooltips]:after{background-color:#000c;border-radius:5px;color:#fff;content:attr(tooltips);font-size:12px;left:50%;line-height:18px;opacity:0;padding:7px 14px;pointer-events:none;position:absolute;text-align:center;top:-5px;-webkit-transform:translateX(-50%) translateY(-100%);transform:translateX(-50%) translateY(-100%);z-index:9999}.bk-permission-tooltips[tooltips]:hover:after,.bk-permission-tooltips[tooltips]:hover:before{opacity:1}.permission-dialog .bk-dialog-sub-header{padding:0!important;text-align:center}.permission-exception .bk-exception-text{margin:-5px 0 25px}.permission-table{margin-bottom:20px;margin-left:25px;width:590px!important}.permission-table.bk-table:before{background:#dfe0e5}.permission-table .bk-table-empty-block{width:auto}.permission-table .cell{width:90%}.permission-footer{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-pack:end;-ms-flex-pack:end;align-items:center;background:#fafbfd;-webkit-box-shadow:0 -1px 0 0 #dcdee5;box-shadow:0 -1px 0 0 #dcdee5;display:-webkit-box;display:-ms-flexbox;display:flex;height:48px;justify-content:flex-end}.permission-confirm{margin-right:5px}.permission-cancel{margin-right:25px}.permission-list{background:#3a84ff;border-radius:2px;height:32px;margin-right:5px;width:94px}.permission-list .bk-dropdown-trigger{-webkit-box-align:center;-ms-flex-align:center;-webkit-box-pack:center;-ms-flex-pack:center;align-items:center;color:#fff;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:14px!important;height:100%;justify-content:center;line-height:30px;padding:0 14px}.permission-list .bk-dropdown-list{width:auto}.permission-list .bk-dropdown-list>li{cursor:pointer;font-size:14px!important;font-weight:400;line-height:32px;padding:0 14px}.permission-list .bk-dropdown-list>li:hover{background:#f5f7fa}.permission-list .icon-angle-down{font-size:20px}.permission-refresh-dialog{-webkit-box-pack:center;-ms-flex-pack:center;display:-webkit-box;display:-ms-flexbox;display:flex;justify-content:center;margin:25px}.permission-dialog-v3 .bk-modal-header{height:30px}.permission-dialog-v3 .bk-modal-content{padding:0!important}.permission-dialog-v3 .bk-exception-part{margin-bottom:20px}.permission-dialog-v3.bk-modal-wrapper.bk-info-wrapper .bk-modal-content .bk-info-sub-title{margin-bottom:0}.permission-dialog-v3 .permission-table-wrapper{margin-bottom:20px;margin-left:25px;width:590px!important}.mr10{margin-right:10px}.mr20{margin-right:20px}.mr25{margin-right:25px}.icon-angle-down-v3{font-size:20px;margin:0 -7px 0 2px}@font-face{font-family:manage;font-style:normal;font-weight:400;src:url(data:image/svg+xml;base64,<svg><defs><font id="iconfont" horiz-adv-x="1024" vert-adv-y="1024"><font-face font-family="iconfont" font-weight="400" units-per-em="1024" ascent="812" descent="-212"/><glyph glyph-name="x" unicode="x" horiz-adv-x="100" d="M20 20h30v-40Z"/><glyph glyph-name="uniE111" unicode="" d="M768 300A256 256 0 0 0 512 44a256 256 0 0 0-256 256 256 256 0 0 0 512 0ZM512 492c108.8 0 192-83.2 192-192s-83.2-192-192-192-192 83.2-192 192 83.2 192 192 192m0 64c-140.8 0-256-115.2-256-256S371.2 44 512 44s256 115.2 256 256-115.2 256-256 256Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE112" unicode="" d="M768 300A256 256 0 0 0 512 44a256 256 0 0 0-256 256 256 256 0 0 0 512 0ZM512 492c108.8 0 192-83.2 192-192s-83.2-192-192-192-192 83.2-192 192 83.2 192 192 192m0 64c-140.8 0-256-115.2-256-256S371.2 44 512 44s256 115.2 256 256-115.2 256-256 256Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE113" unicode="" d="M768 300c0-141.4-114.6-256-256-256S256 158.6 256 300s114.6 256 256 256 256-114.6 256-256ZM512 492c108.8 0 192-83.2 192-192s-83.2-192-192-192-192 83.2-192 192 83.2 192 192 192m0 64c-140.8 0-256-115.2-256-256S371.2 44 512 44s256 115.2 256 256-115.2 256-256 256Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE115" unicode="" d="M1024 300a512 512 0 0 0-512-512A512 512 0 0 0 0 300a512 512 0 0 0 1024 0Zm-236.308 0A275.692 275.692 0 0 0 512 24.308 275.692 275.692 0 0 0 236.308 300a275.692 275.692 0 0 0 551.384 0Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE114" unicode="" d="M704 300a192 192 0 0 0-192-192 192 192 0 0 0-192 192 192 192 0 0 0 384 0ZM512 44c-141.2 0-256 114.8-256 256s114.8 256 256 256 256-114.8 256-256S653.2 44 512 44Zm0 448c-105.9 0-192-86.1-192-192s86.1-192 192-192 192 86.1 192 192-86.1 192-192 192Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE116" unicode="" d="M1024 300c0-282.8-229.2-512-512-512S0 17.2 0 300s229.2 512 512 512 512-229.2 512-512Zm-236.3 0c0-152.3-123.4-275.7-275.7-275.7S236.3 147.7 236.3 300c0 152.3 123.5 275.7 275.8 275.6 152.2 0 275.6-123.4 275.6-275.6Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE101" unicode="" d="M592 300a80 80 0 0 0-80-80 80 80 0 0 0-80 80 80 80 0 0 0 160 0Zm0 256a80 80 0 0 0-80-80 80 80 0 0 0-80 80 80 80 0 0 0 160 0Zm0-512a80 80 0 0 0-80-80 80 80 0 0 0-80 80 80 80 0 0 0 160 0Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE102" unicode="" d="M610.766 261.351c90.005 51.76 149.654 147.437 149.654 256.97 0 163.17-132.301 295.47-295.47 295.47s-295.47-132.3-295.47-295.47c0-109.576 59.648-205.21 148.203-256.202C132.173 198.548-.17 25.146-.639-179.211v-.042c0-17.651 14.325-31.977 31.977-31.977h865.944c17.652 0 31.977 14.326 31.977 31.977-.298 204.143-132.087 377.417-315.21 439.666Z" horiz-adv-x="938" vert-adv-y="1024"/><glyph glyph-name="uniE103" unicode="" d="M512 748C264 748 64 548 64 300s200-448 448-448S960 52 960 300 760 748 512 748Zm224-480H544V76h-64v192H288v64h192v192h64V332h192v-64Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE104" unicode="" d="M158.425-51.119C267.501-27.539 432.275-19.68 539.03-24.92c106.755-5.24 222.792-20.959 222.792-20.959s30.17 13.1 27.85 7.86c-2.321-5.24-16.246-13.1-6.963-15.72 9.283-2.62 104.434-13.099 143.887-20.959 39.453-7.86 58.019-15.719 58.019-15.719s25.915 44.538 83.016 39.298c0-4.367-21.071-9.518-27.992-20.949-6.92-11.43-22.534-18.349-22.534-18.349s12.18 6.541 33.217-3.274c21.037-9.816 41.047-13.582 41.047-15.065 0-1.483-9.283-23.579-85.867-7.86-31.245 7.86-46.416-34.058-197.265-44.537-150.849-10.48-406.132-18.34-406.132-18.34s11.604-15.719 34.812-20.958c0 0-16.245-15.72-48.736-10.48-32.49 5.24-67.302 31.439-67.302 31.439s-85.868 5.24-118.358 10.48c-32.49 5.239-69.623 18.338-95.151 20.958-25.528 2.62-141.566 15.72-97.472 44.538 0 0 39.453 28.819 148.528 52.397ZM148.21-90.737v-67.368h67.369v-13.474l-65.132.014-15.71-.014v80.842h13.474Zm741.053 0v-80.842l-15.71.014-65.132-.014v13.474h67.368v67.368h13.474Zm-660.21 444.632h565.894a40.421 40.421 0 0 0 40.421-40.421V-77.263a40.421 40.421 0 0 0-40.42-40.421H229.052a40.421 40.421 0 0 0-40.421 40.42v390.738a40.421 40.421 0 0 0 40.42 40.42ZM539.21 77.022l8.509-42.532c2.189-10.945-4.91-21.593-15.855-23.782a20.212 20.212 0 0 0-3.963-.392h-31.804c-11.162 0-20.21 9.048-20.21 20.21 0 1.331.131 2.659.392 3.964l8.509 42.532c-20.156 9.559-33.42 29.162-33.42 51.188 0 31.727 27.239 57.264 60.631 57.264 33.392 0 60.632-25.537 60.632-57.263 0-22.027-13.265-41.63-33.42-51.19ZM222.316 353.895h579.368a33.684 33.684 0 0 0 33.684-33.684 33.684 33.684 0 0 0-33.684-33.685H222.316a33.684 33.684 0 0 0-33.684 33.685 33.684 33.684 0 0 0 33.684 33.684ZM704 497.833c0 107.808-85.961 195.204-192 195.204s-192-87.396-192-195.204V324.318c0-5.989-14.327-10.844-32-10.844-16.79 0-30.559 4.382-31.894 9.955l-.106.89v173.514c0 143.744 114.615 260.272 256 260.272s256-116.528 256-260.272V324.318c0-5.989-14.327-10.844-32-10.844-17.673 0-32 4.855-32 10.844v173.515ZM303.158 333.684h8.084V494.62c0 107.942 89.924 195.368 200.758 195.368s200.758-87.426 200.758-195.368V333.684h8.084V494.62c0 111.99-93.46 202.854-208.842 202.854-115.382 0-208.842-90.864-208.842-202.854V333.684Zm-13.474 6.737c17.718 0 32.24 5.472 33.583 12.42l.101 1.054v-26.948c0-7.44-15.08-13.473-33.684-13.473-17.717 0-32.24 5.471-33.583 12.42l-.101 1.053v26.948c0-7.442 15.08-13.474 33.684-13.474Zm444.632 0c17.717 0 32.24 5.472 33.583 12.42l.101 1.054v-26.948c0-7.44-15.08-13.473-33.684-13.473-17.718 0-32.24 5.471-33.583 12.42l-.101 1.053v26.948c0-7.442 15.08-13.474 33.684-13.474ZM653.474 791.79A13.474 13.474 0 0 0 640 778.317a13.474 13.474 0 0 0-13.474 13.473 13.474 13.474 0 0 0 26.948 0Zm276.21-559.157a13.474 13.474 0 0 0-13.473-13.474 13.474 13.474 0 0 0-13.474 13.474 13.474 13.474 0 0 0 26.947 0Zm-768 188.631a13.474 13.474 0 0 0-13.474-13.474 13.474 13.474 0 0 0-13.473 13.474 13.474 13.474 0 0 0 26.947 0Z" horiz-adv-x="1091" vert-adv-y="1024"/><glyph glyph-name="uniE106" unicode="" d="M1024 300a512 512 0 0 0-512-512A512 512 0 0 0 0 300a512 512 0 0 0 1024 0Zm-236.308 0A275.692 275.692 0 0 0 512 24.308 275.692 275.692 0 0 0 236.308 300a275.692 275.692 0 0 0 551.384 0Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE117" unicode="" d="M426.667 428a85.333 85.333 0 0 0-85.334 85.333V684a85.333 85.333 0 0 0 85.334 85.333h170.666A85.333 85.333 0 0 0 682.667 684V513.333A85.333 85.333 0 0 0 597.333 428h-42.666v-85.333h170.666c57.108-.004 104.082-44.984 106.56-102.038L832 236v-64h42.667A85.333 85.333 0 0 0 960 86.667V-84a85.333 85.333 0 0 0-85.333-85.333H704A85.333 85.333 0 0 0 618.667-84V86.667C618.667 133.795 656.872 172 704 172h42.667v64c-.002 10.815-8.096 19.919-18.838 21.184l-2.496.15H298.667c-10.816-.002-19.919-8.097-21.184-18.838l-.15-2.496v-64H320c47.128 0 85.333-38.205 85.333-85.333V-84c0-47.128-38.205-85.333-85.333-85.333H149.333A85.333 85.333 0 0 0 64-84V86.667C64 133.795 102.205 172 149.333 172H192v64c.003 57.108 44.984 104.082 102.037 106.56l4.63.107h170.666V428h-42.666Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE118" unicode="" d="M512 748C264.6 748 64 547.4 64 300s200.6-448 448-448S960 52.6 960 300 759.4 748 512 748Zm32-640h-64v64h64v-64Zm0 128h-64v256h64V236Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE121" unicode="" d="M0 812h1024V-212H0V812Zm512-96c229.75 0 416-186.25 416-416S741.75-116 512-116 96 70.25 96 300s186.25 416 416 416Zm0-192c-123.712 0-224-100.288-224-224S388.288 76 512 76s224 100.288 224 224-100.288 224-224 224Zm224-224A224 224 0 0 0 512 76a224 224 0 0 0-224 224 224 224 0 0 0 448 0Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE122" unicode="" d="M320-148c-7.68 0-15.36 2.56-21.76 8.32-12.8 12.16-14.08 32-1.92 45.44L660.48 300 296.32 694.24c-12.16 12.8-10.88 33.28 1.92 45.44s33.28 10.88 45.44-1.92l384-416c11.52-12.16 11.52-31.36 0-43.52l-384-416C337.28-144.8 328.32-148 320-148Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE123" unicode="" d="M512 748C264.6 748 64 547.4 64 300s200.6-448 448-448S960 52.6 960 300 759.4 748 512 748Zm158.4-561.1-45.3-45.3L512 254.7 398.9 141.6l-45.3 45.3L466.7 300 353.6 413.1l45.3 45.3L512 345.3l113.1 113.1 45.3-45.3L557.3 300l113.1-113.1Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE129" unicode="" d="m764.8 453.6-32-56 145.6-84.8 84.8 145.6-56 32-28.8-49.6c-20.8 57.6-54.4 108.8-97.6 153.6-40 40-86.4 70.4-139.2 92.8-51.2 19.2-104 28.8-158.4 28.8-48 0-99.2-8-142.4-24-57.6-20.8-108.8-54.4-153.6-97.6-40-40-70.4-86.4-92.8-139.2-8-19.2-14.4-38.4-19.2-59.2 0-1.6 0-3.2-1.6-3.2-1.6-9.6-4.8-19.2-4.8-28.8v-3.2c-3.2-20.8-4.8-41.6-4.8-64 0-48 8-99.2 25.6-144C110.4 95.2 144 44 187.2-.8c40-40 86.4-70.4 139.2-92.8 49.6-20.8 104-30.4 158.4-30.4s107.2 9.6 158.4 30.4C696-72.8 742.4-40.8 782.4-.8c64 64 104 144 118.4 232l-64 9.6C825.6 165.6 790.4 98.4 737.6 44 670.4-23.2 580.8-60 486.4-60c-19.2 0-36.8 1.6-54.4 4.8C356.8-44 289.6-8.8 235.2 45.6c-67.2 67.2-104 156.8-104 251.2 0 19.2 1.6 36.8 4.8 56 11.2 73.6 46.4 140.8 99.2 195.2 67.2 67.2 156.8 104 251.2 104s184-36.8 251.2-104c35.2-35.2 62.4-78.4 80-124.8l-52.8 30.4Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE12A" unicode="" d="M512 44c-6.4 0-13.44 2.56-18.56 8.32l-356.48 384c-8.32 8.96-10.88 23.04-7.04 35.2S144 492 155.52 492h712.96c11.52 0 21.12-8.32 25.6-20.48s1.28-26.24-7.04-35.2l-356.48-384C525.44 46.56 518.4 44 512 44Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE12B" unicode="" d="M865.882 733.264h-78.736V655.71h78.736c86.804-.645 156.935-71.207 156.935-158.118s-70.131-157.472-156.935-158.117h-80.026v-77.553h80.026c129.614.645 234.488 105.95 234.488 235.67S995.496 732.62 865.882 733.263ZM234.487-131.973h80.027v77.553h-80.027c-86.803.645-156.934 71.207-156.934 158.118s70.131 157.472 156.934 158.117h80.027v77.553h-80.027C104.874 338.723 0 233.418 0 103.698c0-129.83 104.874-235.026 234.487-235.671Zm104.552 37.54a65.829 65.829 0 0 0-65.829-65.83 65.829 65.829 0 0 0-65.828 65.83 65.829 65.829 0 0 0 131.657 0ZM888.04 298.17a65.829 65.829 0 0 0-65.828-65.828 65.829 65.829 0 0 0-65.829 65.828 65.829 65.829 0 0 0 131.657 0Zm-77.122-116.383H286.763c-7.1 0-12.907 5.809-12.907 12.908v210.608c0 7.1 5.808 12.908 12.907 12.908h524.155c7.099 0 12.907-5.809 12.907-12.908v-210.5c0-7.207-5.808-13.016-12.907-13.016Zm1.398 393.896H288.161c-7.099 0-12.907 5.808-12.907 12.908v210.5c0 7.1 5.808 12.908 12.907 12.908h524.155c7.1 0 12.907-5.808 12.907-12.908v-210.5c0-7.1-5.808-12.908-12.907-12.908Zm0-787.684H288.161c-7.099 0-12.907 5.808-12.907 12.908v210.5c0 7.1 5.808 12.908 12.907 12.908h524.155c7.1 0 12.907-5.808 12.907-12.908v-210.5c0-7.1-5.808-12.908-12.907-12.908Z" horiz-adv-x="1100" vert-adv-y="1024"/><glyph glyph-name="uniE12D" unicode="" d="M945.23-212H78.77C35.322-212 0-176.677 0-133.23v866.46C0 776.678 35.323 812 78.77 812h866.46c43.447 0 78.77-35.323 78.77-78.77v-866.46c0-43.447-35.323-78.77-78.77-78.77ZM827.078 556H270.769c-10.83 0-19.692 8.861-19.692 19.692s8.861 19.693 19.692 19.693h556.308c10.83 0 19.692-8.862 19.692-19.693S837.908 556 827.077 556Zm0-39.385H718.769V20.123L550.154 126.708 381.539 20.123v496.492H275.692c-32.615 0-59.077 26.462-59.077 59.077s26.462 59.077 59.077 59.077h551.385c10.83 0 19.692 8.862 19.692 19.692s-8.861 19.693-19.692 19.693H275.692c-54.277 0-98.461-44.185-98.461-98.462V24.308c0-54.277 44.184-98.462 98.461-98.462h551.385c10.83 0 19.692 8.862 19.692 19.692v551.385c0 10.83-8.861 19.692-19.692 19.692ZM608 360.308c0 31.261-25.354 56.615-56.615 56.615s-56.616-25.354-56.616-56.615c0-22.893 13.539-42.585 33.108-51.447l-8.492-75.322h64l-8.493 75.322c19.57 8.862 33.108 28.554 33.108 51.447Zm-56.615 17.23c9.476 0 17.23-7.753 17.23-17.23s-7.754-17.231-17.23-17.231-17.231 7.754-17.231 17.23 7.754 17.231 17.23 17.231Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE131" unicode="" d="M148.092 389.397h122.807V-51.266H148.092v440.663Zm0-317.856h729.622V-51.266H148.092V71.54Zm606.815 317.856h122.807V-51.266H754.906v440.663Zm-606.815-162.54v162.54l363.366 321.467L602.12 631.4Zm729.622-.722v163.262L699.643 544.712l-92.828-81.63Zm-364.811-10.836v164.707l187.462 165.429 92.467-81.631Zm-242.004 120.28L148.092 226.856V158.23L270.899 266.95Zm521.933 128.225-92.828-82.354 38.287-33.23 92.467 82.353Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE12E" unicode="" d="M255.5 716.5h64v-832h-64v832Zm149 0h64v-832h-64v832Zm149 0h64v-832h-64v832Zm149 0h64v-832h-64v832ZM95 556h832v-64H95v64Zm0-149h832v-64H95v64Zm0-149h832v-64H95v64Zm0-149h832V45H95v64ZM801-20H225c-17.7 0-32 14.3-32 32v576c0 17.7 14.3 32 32 32h576c17.7 0 32-14.3 32-32V12c0-17.7-14.3-32-32-32ZM652.7 136.1H387.9c-17.6 0-32 14.4-32 32v266.1c0 17.6 14.4 32 32 32h264.8c17.6 0 32-14.4 32-32V168.1c0-17.6-14.4-32-32-32Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE130" unicode="" d="M384.5 38.3 237.2 142.6c-8.4 6-10.4 17.7-4.5 26.1l10.7 15.1c6 8.4 17.7 10.4 26.1 4.5L416.9 84c8.4-6 10.4-17.7 4.5-26.1l-10.7-15.1c-6-8.5-17.8-10.5-26.2-4.5Zm-60.6-72L163.3 80c-8.4 6-10.4 17.7-4.5 26.1l10.7 15.1c6 8.4 17.7 10.4 26.1 4.5L356.2 12c8.4-6 10.4-17.7 4.5-26.1L350-29.2c-6-8.5-17.7-10.5-26.1-4.5Zm-83-44-115 81.5c-8.4 6-10.4 17.7-4.5 26.1L132.1 45c6 8.4 17.7 10.4 26.1 4.5l115-81.5c8.4-6 10.4-17.7 4.5-26.1L267-73.3c-5.9-8.4-17.7-10.4-26.1-4.4Zm126 512.7-112.2-14.5L96.4 209.3l170.2-3.9ZM648 153.9 633.4 41.8 422.3-116.6l-3.9 170.2Zm203.2 466.9 30.7 30.7c11.8-5.2 26.1-3 35.7 6.7 12.6 12.6 12.6 33 0 45.5-12.6 12.6-33 12.6-45.5 0-9.7-9.7-11.9-23.9-6.7-35.7l-30.7-30.7C759.8 651.1 397 691 262.4 206.9c33.9-32.8 60.1-58.3 80.2-78.1 19.8-20.1 45.3-46.3 78.1-80.2C904.9 183.2 864.9 546 851.2 620.8Zm-376.8-362c-51.3 51.3-51.3 134.8 0 186s134.8 51.3 186 0 51.3-134.8 0-186-134.7-51.3-186 0Zm165 165c-39.7 39.7-104.2 39.7-143.8 0-24.3-24.3-33.7-57.9-28.2-89.4 20.3-4.3 40.7-8.6 56.6-23.4 19.8-18.5 21.8-31 25.9-59.2 31.6-5.5 65.3 3.9 89.6 28.2 39.5 39.6 39.5 104.1-.1 143.8ZM516.6 283.4l-3.3 9.6c-1.8 5.4 1.1 11.2 6.4 13.1l68.8 23.4c5.4 1.8 11.2-1.1 13.1-6.4l3.3-9.6c1.8-5.4-1.1-11.2-6.4-13.1L529.7 277c-5.4-1.9-11.3 1-13.1 6.4Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE12F" unicode="" d="M0 155.362v292.449l359.392 207.455V362.818Zm950 293.134V156.048L590.609-51.408V241.04Zm0-.685L590.38 655.495V812L359.62 240.812 0 448.496V156.048L359.62-51.636V-211.57l230.76 574.615L950 155.362Z" horiz-adv-x="950" vert-adv-y="1024"/><glyph glyph-name="uniE138" unicode="" d="M822.4 318.56 383.36 675.04c-10.24 8.32-26.24 10.88-40.32 7.04S320 668 320 656.48V-56.48c0-11.52 8.96-21.12 23.04-25.6C347.52-83.36 352-84 356.48-84c10.24 0 19.84 3.2 26.88 8.96L822.4 281.44c12.8 10.24 12.8 26.88 0 37.12Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE139" unicode="" d="M893.44 287.84c1.28 3.84 2.56 7.68 2.56 11.52v1.28c0 3.84-.64 7.68-1.92 10.88-.64 1.92-1.92 3.2-2.56 4.48-1.28 1.92-1.92 3.84-3.2 5.12L616.96 619.36c-12.16 12.8-32 14.08-45.44 1.92-12.8-12.16-14.08-32-1.92-45.44l222.08-244.48H160c-17.92.64-32-13.44-32-31.36s14.08-32 32-32h631.68L569.6 23.52c-12.16-12.8-10.88-33.28 1.92-45.44 6.4-5.76 14.08-8.32 21.76-8.32 8.96 0 17.28 3.2 23.68 10.24l270.72 297.6c1.28 1.28 1.92 3.2 3.2 5.12.64 2.56 1.92 3.84 2.56 5.12Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE13A" unicode="" d="M938.636 172v-298.636H85.364v853.272H384A42.729 42.729 0 0 1 384 812H85.364A85.271 85.271 0 0 1 0 726.636v-853.272C0-173.833 38.167-212 85.364-212h853.272c47.197 0 85.364 38.167 85.364 85.364V172a42.729 42.729 0 0 1-85.364 0Zm72.983 628.736a38.54 38.54 0 0 1-28.207 11.17H657.594a40.774 40.774 0 0 1 0-81.454h229.097L383.72 226.458a38.633 38.633 0 1 1 54.644-54.737l504.18 505.204V444.943a40.774 40.774 0 1 1 81.455 0v326.283a40.867 40.867 0 0 1-11.916 28.858c-.186.187-.186.466-.465.652Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE13B" unicode="" d="M512 748C264 748 64 548 64 300s200-448 448-448S960 52 960 300 760 748 512 748Zm0-832C299.2-84 128 87.2 128 300s171.2 384 384 384 384-171.2 384-384S724.8-84 512-84Zm-17.6 492.8c-28.8-6.4-56-20.8-76.8-41.6-24-22.4 1.6-44.8 16-27.2 9.6 12.8 24 22.4 40 28.8 11.2 1.6 17.6-1.6 19.2-9.6 1.6-14.4 0-27.2-4.8-41.6-4.8-19.2-14.4-51.2-25.6-94.4C440 146.4 428.8 98.4 432 82.4c3.2-17.6 12.8-32 28.8-41.6 17.6-8 38.4-9.6 57.6-4.8 30.4 6.4 57.6 22.4 80 44.8 25.6 25.6-3.2 43.2-17.6 28.8-9.6-12.8-24-22.4-40-25.6-14.4-3.2-22.4 3.2-25.6 16-1.6 14.4 1.6 28.8 6.4 41.6 40 136 57.6 212.8 52.8 232-3.2 14.4-12.8 27.2-25.6 33.6-16 6.4-36.8 6.4-54.4 1.6ZM608 508a48 48 0 0 0-48-48 48 48 0 0 0-48 48 48 48 0 0 0 96 0Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE13C" unicode="" d="M512 812C229.257 812 0 582.743 0 300s229.257-512 512-512 512 229.257 512 512-229.257 512-512 512Zm4.571-649.143c22.723 0 41.143-18.42 41.143-41.143 0-22.722-18.42-41.143-41.143-41.143-22.722 0-41.142 18.42-41.142 41.143s18.42 41.143 41.142 41.143Zm.267 356.572c22.575 0 40.876-16.146 40.876-36.062 0-1.915-.169-3.795-.495-5.63l-11.465-234.513c0-14.088-12.946-25.51-28.916-25.51s-28.917 11.422-28.917 25.51L475.43 485.571l.609.03c1.307 18.875 19.074 33.828 40.8 33.828Z" horiz-adv-x="1024" vert-adv-y="1024"/><glyph glyph-name="uniE13D" unicode="" d="M455.214 288.338c89.786-.628 100.095-8.474 246.292-106.556C743.33 154.495 768.096 21.815 768-14.906c0-90.99-152.84-65.934-341.333-65.934-188.495 0-341.334-25.055-341.334 65.934 0 34.793 22.261 165.85 60.23 192.427 158.339 102.343 170.765 110.215 260.193 110.821Zm230.235 1.344c100.09 0 98.656 0 237.702-94.765 36.596-24.255 58.266-142.193 58.182-174.833 0-54.5-60.723-62.163-150.797-61.364 3.807 7.42 5.73 16.167 5.73 26.374.096 36.72-24.67 169.401-66.493 196.688-97.533 65.433-134.587 90.706-175.108 100.468 25.218 7.432 49.264 7.432 90.784 7.432Zm65.096 331.043c44.509-27.479 71.926-78.26 71.926-133.217 0-54.957-27.417-105.738-71.926-133.217-44.508-27.478-99.344-27.478-143.852 0a144.241 144.241 0 0 0-20.96 15.754c43.026 32.261 68.977 84.637 68.977 140.901 0 42.537-14.832 82.85-40.652 113.932l3.965 2.144c42.245 20.99 91.723 18.891 132.522-6.297Zm-410.706 40.09c50.867 30.913 113.537 30.913 164.403 0 50.867-30.913 82.201-88.043 82.201-149.869 0-61.826-31.334-118.955-82.2-149.868-50.867-30.913-113.537-30.913-164.404 0-50.866 30.913-82.2 88.043-82.2 149.868 0 61.826 31.334 118.956 82.2 149.87Z" horiz-adv-x="1024" vert-adv-y="1024"/></font></defs></svg>#iconcool) format("svg"),url(data:font/ttf;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJW8EJqAAABfAAAAFZjbWFwDNAWbAAAAkwAAANMZ2x5Zk6tydAAAAXYAAASaGhlYWQpIGHTAAAA4AAAADZoaGVhB8gDlAAAALwAAAAkaG10eHRU/+8AAAHUAAAAeGxvY2FB/D3yAAAFmAAAAD5tYXhwATUA7AAAARgAAAAgbmFtZZAIaAsAABhAAAAChXBvc3RFi0lqAAAayAAAAUMAAQAAAyz/LABcBEz/8P/9BE0AAQAAAAAAAAAAAAAAAAAAAB4AAQAAAAEAABtlM6VfDzz1AAsEAAAAAADi4g8/AAAAAOLiDz//8P8qBE0DLgAAAAgAAgAAAAAAAAABAAAAHgDgAA0AAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQPhAZAABQAIAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABAAHjhPQMs/ywAXAMuANYAAAABAAAAAAAABAAAAABkAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAADqv//BAAAAARD//AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABEwAAAQAAAAEAAAABAAAAAQAAAADtgAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAABQAAAAMAAAAsAAAABAAAAcgAAQAAAAAAwgADAAEAAAAsAAMACgAAAcgABACWAAAAEgAQAAMAAgB44QThBuEY4SPhK+Ex4T3//wAAAHjhAeEG4RHhIeEp4S3hOP//AAAAAAAAAAAAAAAAAAAAAAABABIAEgAYABgAJgAqAC4ANgAAAAEABwAIAAkACgAEAAIAAgADAAUABAAGAAsADAANAA4ADwAQABEAEgATABUAFwAWABQAGAAZABoAGwAcAB0AAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAYQAAAAAAAAAHwAAAHgAAAB4AAAAAQAA4QEAAOEBAAAABwAA4QIAAOECAAAACAAA4QMAAOEDAAAACQAA4QQAAOEEAAAACgAA4QYAAOEGAAAABAAA4REAAOERAAAAAgAA4RIAAOESAAAAAgAA4RMAAOETAAAAAwAA4RQAAOEUAAAABQAA4RUAAOEVAAAABAAA4RYAAOEWAAAABgAA4RcAAOEXAAAACwAA4RgAAOEYAAAADAAA4SEAAOEhAAAADQAA4SIAAOEiAAAADgAA4SMAAOEjAAAADwAA4SkAAOEpAAAAEAAA4SoAAOEqAAAAEQAA4SsAAOErAAAAEgAA4S0AAOEtAAAAEwAA4S4AAOEuAAAAFQAA4S8AAOEvAAAAFwAA4TAAAOEwAAAAFgAA4TEAAOExAAAAFAAA4TgAAOE4AAAAGAAA4TkAAOE5AAAAGQAA4ToAAOE6AAAAGgAA4TsAAOE7AAAAGwAA4TwAAOE8AAAAHAAA4T0AAOE9AAAAHQAAAAAADABOAJAAxAEGATgBaAGWAb4DBANoA44D1gP8BCoEmAS6BU4FzgYOBnYHOgdiB4QHuAgQCIAIwgk0AAAAAQAA/+wAMgAUAAIAADczFRQeFCgAAAAAAwAAAAADAAIsAAsAFwAkAAABDgEHLgEnPgE3HgEnHgEXDgEHLgEnPgE3DgEHHgEXPgE3LgEnAwADkG1tkAMDkG1tkP1TawICa1NTawICa1NskQMDkWxskQMDkWwBLG2QAwOQbW2QAwOQUwJrU1NrAgJrU1NrQgORbGyRAwORbGyRAwAAAwAAAAADAAIsAAsAFwAkAAABDgEHLgEnPgE3HgEnHgEXDgEHLgEnPgE3DgEHHgEXPgE3LgEnAwADkG1tkAMDkG1tkP1TawICa1NTawICa1NskQMDkWxskQMDkWwBLG2QAwOQbW2QAwOQUwJrU1NrAgJrU1NrQgORbGyRAwORbGyRAwAAAgAA/ywEAAMsAAsAGQAAAQYAByYAJzYANxYABw4DBy4BJz4BNx4BBAAF/t/a2v7fBQUBIdraASHnASlOZTd1nAMDnHV1nAEs2v7fBQUBIdraASEFBf7f2jdlTikBA5x1dZwDA5wAAAADAAAAAAMAAiwACwAXACMAAAEOAQcuASc+ATceAQMuASc+ATceARcOAQMOAQceARc+ATcuAQLAAmxSUmwCAmxSUmy+bZADA5BtbZADA5BtUW0CAm1RUW0CAm0BLFJsAgJsUlJsAgJs/q4DkG1tkAMDkG1tkAG9Am1RUW0CAm1RUW0AAAACAAD/LAQAAywACwAXAAABBgAHJgAnNgA3FgAHDgEHLgEnPgE3HgEEAAX+39ra/t8FBQEh2toBIecDnHV1nAMDnHV1nAEs2v7fBQUBIdraASEFBf7f2nWcAwOcdXWcAwOcAAAAAwAA/9wCUAJ8AAgAEQAaAAABDgEiJjQ2MhY3DgEiJjQ2MhYTDgEiJjQ2MhYCUAEtRC0tRC0BAS1ELS1ELQEBLUQtLUQtASwiLS1ELS3eIi0tRC0t/d4iLS1ELS0AAAAAAf///ywDogMuABoAAAE+ATUuAScOAQceARcOAQcxHgEzITI2NS4BJwJjRFEDp31+pgQBUESOrgMBEg0DYg4SAq2MAQUohlN+pwMDp35Thicy65wOEhIOm+sxAAACAAD/bAPAAuwACwAXAAABDgEHHgEXPgE3LgETIxUjNSM1MzUzFTMCAL/8BQX8v7/8BQX8IcBAwMBAwALsBfy/v/wFBfy/v/z+JcDAQMDAAA3/8P8qBEYDJgA6AEAARgBWAGwAfACWAKgAtgDEAM0A1gDfAAAXPgEeARc3NhcOARceARcWHwEmNhcOAyI2HgEVFgYnJgYHBg8BFBYXFAYnLgEvASYnLgEnLgE3JjYXFTMVIzUhFSM1MzUBIR4BFREUBgchLgE1ETQ2ARcWBg8BIy4BPQE3LgEnPgEyFhcOAQEhMhYVMRQGIyEiJjUxNDYlLgEnDgEHFRQGIiYnNT4BNx4BFxUUBiImNSUzNT4BNx4BFxUzNS4BJw4BDwE+ATc1FRQGIiYnNRQWBT4BNzUVFAYiJic1FBYDFAYiJjQ2MhYBFAYiJjQ2MhYlFAYiJjQ2MhaeVtOohwQPDAEDCgYLYyIdDg8BKSsBFQwQAREhGAIgNxNGbXyHkxIRGBkZKQEvKxwZMxQbXxkBRUZEUQLyUUT9eQI2ERcXEf3KERcXAUcJAQkIBCAIDAkQEQEBIjQiAQER/rMCRA4TEw79vA4TEwHwAmxSUmwCEhsSAQOQbW2QAxIcEv5vCAJyVVVyAggCdllZdgINDRMBExwTARMByw4TARMcEwETQwcMBwcMBwEVCAwHBwwI/QAICwgHDAgzEQ0JDwEGBQMECgICDAcGBQQDJQEDChEJAw4HAQMPCgQmCggFBQEQBAIMAwUZAgMDBAQOAwIVFQIgFUMOUVEOQwG9ARYS/noRFwEBFxEBhhIW/uwrCA0CAQELCQMrBxsRGSAgGREbAQ4TDw4TEw4PE5BTbgICblOuBAYFBK9ukwMDk26uBAYGBAqhU24CAm5ToaFWcgICclabAQcFARsGBwcFHAYHAQEHBQEbBgcHBRwGBwHDBggIDAcH/csGCAgLCAi3BQgICwgIAAABAAD/VgPAAwIARwAAASImJzU+ATsBMhYXFQ4BKwEVMx4BFxUzMhYdARQGKwEiJj0BPgE3MzUuASchIgYHFTMeARcVDgEHIyImPQE+ATczNT4BNzM1AasjMgEBMiOqIzIBATIjKqosPAMrIzIyI6sjMgEwJCsBCgj+UwkLAiskMAEBMCSrIzIBMCQrATksrwGsMiOrIzIyI6sjMlUBOitFMiOrIzIyI6skMAFACAwBCglCATAkqyQwATIjqyQwAUAsPANVAAAAAAMAAP9sA8AC7AALAA8AEwAAAQ4BBx4BFz4BNy4BAyM1MzUjETMCAL79BQX9vr79BQX9nkBAQEAC7AX9vr79BQX9vr79/YVAQAEAAAAEAAD/LAQAAywAAwAPABsAJwAAESERIQEeARcOAQcuASc+ARcOAQceARc+ATcuARcOAQcuASc+ATceAQQA/AACALHrBATrsbHrBATrsV9/AgJ/X19/AgJ/gQJ/X19/AgJ/X19/Ayz8AAOgBOuxsesEBOuxseu8An9fX38CAn9fX3/eX38CAn9fX38CAn8AAAABAAD/awLhAu0AEQAABSIuATcJASY+ARYXARYUBwEGAUAMEwIJAWz+lAkCExoKAYAICP6AC5QSGQsBigGKChoTAgn+YAoYCv5gCgAAAgAA/2wDwALsAAsAFwAAAQ4BBx4BFz4BNy4BAwcnByc3JzcXNxcHAgC+/QUF/b6+/QUF/SAtcXEtcXEtcXEtcQLsBf2+vv0FBf2+vv391C1xcS1xcS1xcS1xAAABAAD/gwPEAswASAAAAQcXNycHJicmJyYjIgYHMQYHBgcGBxYjBgcVBhUUFhcxFhcWFxYyNzY3PgE3Jw4BBw4BIyInMS4BJy4BNTQ3PgE3PgEyFhcWFwL9IJFVOB0gQTxPTVIkSSFXQzsiDAcBAgQBBQwOIEE8T0ykTU88MDwLQAkzJzOBSBwaOWMpMjYFCTIoM4GPgTM1GwHGOFWRIDFWQzwhHQwMIEI8TxwfAw8OAx8hJEoiV0M7Ih4eID0wdkIKOWMpMzUFCDQpM4BIHBw3YykzNTUzNkcAAAAAAQAAAAADggHsABAAACUiJwEuAT4BMyEWFxYGBwEGAgAKCf6cBgQGDgkCyBMHAwQG/pwJLAgBgAcTEwsBEwoTB/6ACAAHAAD/LARNAywAEQAjACwANQBFAFUAZQAAASMVMx4BFw4BByMVMz4BNy4BATM1Iy4BJz4BNzM1Iw4BBx4BNxQGIiY0NjIWAQ4BIiY0NjIWByEiJj0BNDYzITIWHQEUBgMhIiY9ATQ2MyEyFh0BFAYDISImPQE0NjMhMhYdARQGA2JPT0NYAgJYQ1BQZIQCAoT9JFFRQlkBAVlCUVFjhAMDhMwnNiYlOCUCJgElOCUlOCVM/fQGBwcGAgwFCAgE/fQFCAgFAgwGBwcG/fQFCAgFAgwGBwcC3U0CWkJDWQNNA4VkY4X8ok4CWUNDWQJNA4VjZIUjHCYmOCUlAWwcJSU4JSWQBwbSBgcHBtIGBwGKBwbSBgcHBtIGB/zsBwbSBgcHBtIGBwAAAAUAAP8sBAADLAAPABsAPABKAFMAAAUhLgEnET4BNyEeARcRDgEDISImNDYzITIWFAYHIxEnBxEjIiY0NjchMjY0JiMhDgEHER4BFyEyNjURNCYHLgEiBhUUFhcHMyc+ASceARQGIiY0NgOx/J4iLAEBLCIDYiIsAQEsmP3UCQsLCQIsCAwMCGypqGoZIiIZAicIDAwI/dkqOAEBOCoCJwgMDOMBIDAgEg8JQAgPEjkICQkPCgrUASwiA2IiLAEBLCL8niIsAv8LEQsLEQsn/g9rawHxIjIhAQsRCwE4Kf3YKTgBCwkCJwgLnBggIBgRGwdLSwcbIwEJDwoKDwkAAAAIAAD/zANuAscAAwAHAAsADwATABcAGwAfAAATMxEjNSEVIQEzESMBNQEXATUnDwE1NxcFBxU3JQcXN5R7ewLa/SYCX3t7/aEBa1sBFLJdXrtd/fZ7ewIKXSZdAYX+SHt7Abj+SAEWogFCUP5ro5xS+KWlUYBtRW3FUyFTAAAAAAoAAP+MA58CzQADAAcACwAPABMAFwAbAB8ALwA/AAABMxEjEzMRIxMzESMTMxEjASEVIRUhFSEVIRUhFSEVIQUhIiY1ETQ2MyEyFhURFAYnISImNRE0NjMhMhYXEQ4BAQBAQJVAQJVAQJVAQP2gA0D8wANA/MADQPzAA0D8wALC/cAOEhIOAkAOEhKi/vcOEhIOAQkNEgEBEgLN/MADQPzAA0D8wANA/MACn0BVQFVAVUBBEg4CQA4SEg79wA4SnBMNAQoOEhIO/vYNEwAAAAAJAAD/iwOgAsoADwAfAC8AMwA3AEwAWABqAHYAACUnLgE/AT4BHwEeAQ8BDgEHJy4BPwE+AR8BHgEPAQ4BBycuAT8BPgEfAR4BDwEOARMPARcFDwEnATcWNjc2NCYiBw4BFwcmBAMfASQSASY0NzYyFxYUBwYiNyYiBw4BFx4BFx4BFxY2NzY0BycmPwE2HwEWDwEGAYGUBgMFCgUPB5MGAwUKBQ9DoQYDBQsEDwegBwIECwUPWXMGAwQLBQ8GcwcCBAsFD3hwn6sBfQ/TBAGxHwkTCAkTGgoHBAQeSf6BdVFOAVpw/msmJilpKCcnKGl8H1EfEw4EEB0MDgkDGC8THZgEAglFCQQDAghFCiZpBA8HDwYDBWgFDwYPBwJEcgUPBg8HAgRyBQ8GDwcCKFIFDgcPBgMEUgUPBg8HAgIFDtQEM3CfqwI3HwQDBwoaEwkIEwkfHHD+pk5QdQF//t4oaSkmJilpKCfMHh4TLxgCCgsNGhQEDhIfUW0KCQQYAgkJCgQXAgAAAAMAAP8sA7YDLAADAAcAEQAANRElESURBREtATUDJREFFRMFAWcCT/6ZAWf+mOb+mAFo5gFomwElz/7cVf7czwEkz8+d/cXP/tzQoAI/0AAAAQAA/6wDQAKtABAAAAkBLgEOARURFhcWMzI3ATY0Azb+SQgVFgwBFgcGEAsBtwoBPwFkBgQGDgn9OBMHAgkBZAkUAAABAAD/4QOAAncAHQAAATY9ATQvAQEuAQ4BHwEhJgYUFjMhBwYeATI3ATc2A30DAgb+8QoZFAEJ3v2IDhISDgJ43gkBExoKAQ8DAQEgBgUCBgUJASoKARIaCvUBEhwS9AsZEgoBKgUDAAIAAP8sBAEDLQAaADYAACURIREhPgE0JichIgYVER4BFyE+ATcRLgEiBhMmIyEOARQWFzMBBhQWMjcBFQYeATI+ATURNCcDq/yqASsSFhYS/tUjMgEwJANWJDABARgjGEgMEf67ERYWEeX+CQwYHgwB+QELExYUCgys/tUDVgEYIxgBMiP8qiQwAQEwJAErEhYWAmMLARciFgL+CAsfGAwB+egLFAwMFAsBRhEMAAAABAAA/2wDwALsAAsAFwA6AEMAAAEOAQceARc+ATcuAQMuASc+ATceARcOAQMGBwYWNzY3NhcWDwEGFhcWNzY3NiYHBgcGJyY3NicmJyYiNw4BIiY0NjIWAgC//AUF/L+//AUF/L+k2AQE2KSk2AQE2LYsIBATDQ8ZEAMCBxoiCRgbHi4iERUNDxkVBQEIPAgFFAwdZAEbKBsbKBsC7AX8v7/8BQX8v7/8/MUE2KSk2AQE2KSk2AHpCiASFQwTCgIMFRRfdDMPDAcKIxQTChQGBBQWFMsdFgsFYBQbGygbGwADAAD/LAQAAywADAAVACMAAAEGAAcWABc2ADcmACcTHgEUBiImNDYTMhYXBw4BIiY1JzM+AQIA2v7fBQUBIdraASEFBf7f2gURFxcjFxcSERcBDAEQGBENAQEXAywF/t/a2v7fBQUBIdraASEF/XcBFyMXFyMXAWUUEPALDg4L8w4TAAAEAAD/qgPWAq0AEgAmADkARgAAATYWFx4BFQ4BJwYmJz4BNz4BFyU2FhceARUOASc2NTQmJy4BJz4BEx4BFA4BIicmJz4BNzQmJzc2FiU2Mh4BFA4BIi4BNDYBxz1TZx8jBMCRkcEEAR8db1k8ARdESWEcHgFRRAUjH0dMHBIqYCEmJkNMIgwJICQBFRQEIEX+hSdWTisrTlZOKysBIAIlRxuIIkAGBAQGQCCGG0onAwIDHkQYeR4oFwILDyKIGzAuBgYCAUsVR1NHKRQHCRlJKyA6GAIQAxUXL09eTy8vT15PAAAAABIA3gABAAAAAAAAAB0AAAABAAAAAAABAAgAHQABAAAAAAACAAcAJQABAAAAAAADAAgALAABAAAAAAAEAAgANAABAAAAAAAFAAsAPAABAAAAAAAGAAgARwABAAAAAAAKACsATwABAAAAAAALABMAegADAAEECQAAADoAjQADAAEECQABABAAxwADAAEECQACAA4A1wADAAEECQADABAA5QADAAEECQAEABAA9QADAAEECQAFABYBBQADAAEECQAGABABGwADAAEECQAKAFYBKwADAAEECQALACYBgQogIENyZWF0ZWQgYnkgZm9udC1jYXJyaWVyCiAgaWNvbmZvbnRSZWd1bGFyaWNvbmZvbnRpY29uZm9udFZlcnNpb24gMS4waWNvbmZvbnRHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuaHR0cDovL2ZvbnRlbGxvLmNvbQAKACAAIABDAHIAZQBhAHQAZQBkACAAYgB5ACAAZgBvAG4AdAAtAGMAYQByAHIAaQBlAHIACgAgACAAaQBjAG8AbgBmAG8AbgB0AFIAZQBnAHUAbABhAHIAaQBjAG8AbgBmAG8AbgB0AGkAYwBvAG4AZgBvAG4AdABWAGUAcgBzAGkAbwBuACAAMQAuADAAaQBjAG8AbgBmAG8AbgB0AEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4BAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8AAXgHdW5pRTExMQd1bmlFMTEzB3VuaUUxMTUHdW5pRTExNAd1bmlFMTE2B3VuaUUxMDEHdW5pRTEwMgd1bmlFMTAzB3VuaUUxMDQHdW5pRTExNwd1bmlFMTE4B3VuaUUxMjEHdW5pRTEyMgd1bmlFMTIzB3VuaUUxMjkHdW5pRTEyQQd1bmlFMTJCB3VuaUUxMkQHdW5pRTEzMQd1bmlFMTJFB3VuaUUxMzAHdW5pRTEyRgd1bmlFMTM4B3VuaUUxMzkHdW5pRTEzQQd1bmlFMTNCB3VuaUUxM0MHdW5pRTEzRAAAAA==) format("truetype"),url(data:font/woff;base64,d09GRgABAAAAABEQAAsAAAAAHAwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW8EJqY21hcAAAAYAAAAEnAAADTAzQFmxnbHlmAAACqAAAC6gAABJoTq3J0GhlYWQAAA5QAAAAMQAAADYpIGHTaGhlYQAADoQAAAAgAAAAJAfIA5RobXR4AAAOpAAAACYAAAB4dFT/72xvY2EAAA7MAAAAPgAAAD5B/D3ybWF4cAAADwwAAAAfAAAAIAE1AOxuYW1lAAAPLAAAAVcAAAKFkAhoC3Bvc3QAABCEAAAAjAAAAUNFi0lqeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bkfsg4gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDy0Zdb5r8MQw6zHcA0ozAiSAwAVCgvpeJzF0llOAlEQBdD7oGknHJqxHYhBEhNAUH4MDuyLBbgGF+SX27grwVt9+4f4r48c0l2delV5rwC0ADTlQTIgfSMh1peiqYo3cVzFM3zqvYMLRRrYMmPOkhPOueJmt9O3LZNiBceccsF1FdtfSfkdlPrdY4YlnqvYAQ5xpCqZ9m1o95aecpygjVOc4VwVC2V10ccQA/SUfYkrXOMGI6Xnv6r82Ur/V3p/teMvfdRvt7KtqUXWdM5gw3TiYNN09mBmcdfMLeaBhSHyOlY9dy1mhz2LWWLfqtyBIfYbmm4VLC265th00+Cd6c7Bien2walpDsCZIfqaG6KvhSH6Whqil0dD1H8yRF8rQ/S+NkRfL6YJA19Nswa+maYOfDfNH7gxjH4AnadZDgB4nM0XbWwcxXXezH7c7p3vvLd3u3Zs36e9a8cXO7nz3SXBJEfsfEESx7HsYqoQShJBsB0gNAGaAEmbBERRmyhplQoXkpSvhi+llaASX24LpYKgoBIQjWgQqkpbJZWgpbSVfOu+2fU5dqjgb2/33sybeftm3pv3NQQImbhAsiRCKCHFXDQSizQT/DEP0AzxE5M0EgJBkNvAXgTFGNgxMKdQ7CCKHUQZYQdGRg4wF5b7higd6vPg8EHGDg57EDIVEoR9UyR9Q0umSBD+f+wBtTKREQjje6jFHUhEtohdIEWDyEE2tRuBiM6HZ886H4oiJM+eheSfoWXN5uL2UcZGt28fhcy0KZGTFjevaQF3Dim+oO/0TFlZpYMSs2my0jE6vG7dMHXhy9MEGukdoXSk14WQqVAgdJ6Zphx4qUKDkMyU1bxUVvgSWSty/E9JKzNTck58QNfSXcRHNDLLlTNldRSyRrHS0SsduhbmdM/BFy5tMynezDnnNeXJlqsQJiYmMuw4a3N5L4I87trTGMJ5McglswU+Rjd297LH77r7MQHWdn/vGQbhKnZ9MEyffgDE5v19dz/O2ON39+23s+dHg+Fw8MHz8zz9DLMxemFSP9NOQk9H0/l0PpfPRXOUvDIuiuOvuDA5VhrDl16oDCB0mvjQGKma+GRitrCMWWQhKZFlZIAMk13kh+QJ8hx5lbxF3iMfEoL8cZFiAfdvYseIg4V9lirEIGpItiXJUggihhmR7DZoBwshvkUkiuZwT8ko3xUkkVqLSHKyDfJaRwH54FfpNrjcdZlFkDWQPySzRnReREonU1Z+XkehydNdNCKlLDvvGaCL5JtyFTTnKTiEqi7mJykjhjgDY7zDDxQqnaZK56GBd564VwgFgKmSf2OqIRiCllaIBqpBS9bQRFFfNrLr3kNhraa2tgXaW+trc5G6DbWwdFl3L/17b3f5TlrQTFMrv4EQliug+ISEL6BUawCpjhSA5vycdgd1PVh+ESF84vlBuC4Mnh+E68POzT66rb9/G/XRHYODO2hVlQ56Pf7hzeBkr0sOyPhC1MdbX5n4/D5sc1qVEgJJZIJKaUCWRIE1oSCawoIysJAqWKoPXaFaoAEm1lLGBCHIaDRKE9GuYG9vsAteAiPsfEszAUwN9ocN50Krr4oC+BXWKtdptYlErVYHQT3ERQjpB/q2Urq17xkBl3p26yHGDm3FviSox7yJY8cGtlG6beBBkEWok2RZrJdkmIH8WvJxIcpvYuv3+Z4X3QaNGW17gI0xSpYj4p33ZdwsokHAA8m5Z501GvAIW3H6cn7e7tknU5LsTaOppKdmXABPprMA2fQJr5l9ItPJWtPZbJqPz21sBdXn9Cl+2to4FxCvjC7IPAtPuUQu6IeFrUsrKFKWfAFQlSX8A8Qmx5Bz/2TemvLRENFneinjvpDW0ENfLoti+WUXPlTCH/rnJIqwvK9UQn0QYSoeMuRVR2xCtKSWhGmZx5zG3ZwRI8cxXJw8LwjnT3pwwz2U3rPBhXsqHYQsM07Y0Smqk+dfnDZ5btpHxDujIfoR/RtGTiKm0MsVsBaBYYIRkUGCUkCnCgw7hxWqz1Jht8/n7PYfDtf64X64X52Fk851ao2K4EtjGZNt2S7aRbNoyjM0lZhz662Vd6bCzkyb8fb5HfYqPUVWICKbRVu2bHzSaCrzMF7hY6TRaqQoxq15holPtlgo4uI83AQhnbLnuVEs38EH3ehkmLScONg/vyFxRWfP6nWNK5Nf67oshT5JBRADQT666pHVPZ1zO/0lJWfn9qyon7VgY0u2ICrZ5tye7+/J5evgN/P7DybmDXR1JhsCgcSSzp76OAsFWTzZeGWKs4vFEpfP3bFExQ9zedHX0ZLbvaK+vsixfK6wnHhngEb2bbhAqglpStnQhvaeS+IG0bkkSlTFGZUEKajQ3+oyEyRnVMn4YLes637QVV12dvuI7NrVarQrDTN9huTJUtJPNiPztOtJ3JGiOfcsAO3VsynsuGdUnAqmlTQpJ7nXdRQwtbn+yb4Kv76np+tqSq/uWrt2015K95Ybe3uXDAIMLunt3biXsb2n7ILVNL+JWoAQ31XlzzB+SDSA0UIof4ZQpAE+Mq1P/7CaXrOka5CtZvs2bdw3fnwNHezqGqSIbty0L11vWcgKhus5v6YDsvQ7/j0CuP9if/zCxT6qWZzyP+59neRK0oeDmMJsDRWCKc3UsB5Kci1w2TC9pTVb1tJ8oIh5vsNKJ1FnGhLyrK91WOifKdfq5BzqFEtIT5ns5PhDqQxgWcGud9sj5TOK36/QjC8Q8A3/9ImbalOpWmpzrPz72fMB5s92sT9CYm4iHFJKvlB4gU9RQqp65iKXFOdKJ/yaH1/bCQ0NwaepbBIQg/kt5fdb5mOgRz7+0ZpEokark6+6Sq5LA+cSUlB+DMsTp9hW+jrGH3kynpmoiTghek7juT0J2EIeTMjbIcgXTVGOFpvQ4w7v3EnPli26YefO8jEY+jpEfrb+2hfWlz/HcXW9tR72OSt27oRfOCvAOA5L1jpDPxld9+9HH+3dPbJ05LW+ZB83cwwTEw+wh+lbX1i/nSxGa8W19Wl/wP1Mf0ReRmje2fDiw56G85MDUir9oPKWj7LS+Nj0P/1VeYyXXrSE8LjzL94HpSoMEKZvXUL6cKnffa6YJA/yT0f1KlA54nxepXN5UKcT32VH6RsoCZchR4pkFbma3ER2oC9jvFmMvhzH8B7i4fArcD0EphgCG4pGoYimlsLAZcqWwOLQGAaro1jImhiWpVTRm4p55RunlW1rMRTiYGDxAHsOS0xUxZB8yGu7jmHrF0LyUZkKfjE0eJvEeCvd5uF33PLwk3BX6B0BTsYV3adgpJcFIbbS2bO9dw1cc4szZFktW5ptu3nLrnhvXA8K1Q2BoMJq2vWGIwJVlioCo76lqrUF1wjhWjci75BMu7d5rTDZNq8Tg3xeWOfhVAyeEXK4OC3GBSZjOlF8uhKvv8V5bM3a7XCPc655S4u39KlYTG+voaq/alZECIbjvSOqItRQRVEFk07m6Ax7zs2rMs9lea0JH1GbA3mGbVQX4Qba4/wIbnCOfOwcgRs/hhsfhKbTzgf9zgenofH06R+XX0Ps7aN08dtevnmKlejTPCYrGJGDWOxiRM5li1DoYAVnpS9qBMCQpWo/PK/iMW5yQ3R5vi5jwtykRDweH7Hd9HbSgEgB42U7uJzikLSkiJFLylIMkGGxwO5iVHI+VWsjoJwr3+fa6B3nFOA5N8QAEpJIJVGB2SqEZ6n/BKwxP/PXhlWYLbLJOxawOXg/KaDV8YJiEXRYvI6KupEKQ5vGw5TuRi+MVTnA9XHlKN/AIl6/2+zJ8RPQGjawenzXLZrYAC+hatI1KwKa84JmGNqfHCVQEwvAf8CvGxE18JTzLhvgFFgxjZ/wCi6XBd3oBzNlUMfnj9cg/V/8kUAg4odlWmCyBrpYJywkXZfUCtNvppjYDczjBZMbNuqf9y2e7m2rWOAFQGrqjjfjjvTKI+8LwvuPuPC5TKJarwrVVjMqz0opNXWxtpQWxYGoCL5OnxgJNGyCuuY6fGfcqcZfq3BACH9VE+FoQFdpIBrZ8M1cKCCr6YiuRiQhYkTebDD84nURzqLOs0U3xwRI1L13463XICbeevHuq1cyhI4hS+abz9uYmCm59JIr4v0jbZphLOUDUF2jVWFFzzKX3JPF8u3AqdImbI5Uf+IPBv3/COqejk+w99B+w8QiC/AmiBZoYLjAktqWLNutgcymqaFCvsO95i0Cvj/cle3S4GCxYDQVst5gG6Z8eP3yvhviaWHs4MFfChBvuHmwE8zuld+oj0Fvt5iOL19VH559XdKyulalAkqiEaIRIbHU2WcPrGltXcMBJGjT8rr7UiVJEKRSYn/dlTajLNZdc2es2aT+UOq+urltkkThqujyvuUtEVmpXdmaWFhDq1nUbO+5tqedA/Jf/nycDXicY2BkYGAAYulU46Xx/DZfGbhZGEDg0SN+exj9/8N/LRZfZj0gl4OBCSQKACGLCtEAAAB4nGNgZGBg1vmvwxDD4vP/w/+/LL4MQBEUIAcAmLoGY3icY2EAghQGBhYG7Jh51f//YLbz/w+41ICxDxa923CrBwD4DwazAAAAAAAAAAwATgCQAMQBBgE4AWgBlgG+AwQDaAOOA9YD/AQqBJgEugVOBc4GDgZ2BzoHYgeEB7gIEAiACMIJNAAAeJxjYGRgYJBjeMDAywACTEDMBYQMDP/BfAYAIn8CIgB4nGWRu27CQBRExzzyAClCiZQmirRN0hDMQ6lQOiQoI1HQG7MGI7+0XpBIlw/Id+UT0qXLJ6TPYK4bxyvvnjszd30lA7jGNxycnnu+J3ZwwerENZzjQbhO/Um4QX4WbqKNF+Ez6jPhFrp4FW7jBm+8wWlcshrjQ9hBB5/CNVzhS7hO/Ue4Qf4VbuLWaQqfoePcCbewcLrCbTw67y2lJkZ7Vq/U8qCCNLE93zMm1IZO6KfJUZrr9S7yTFmW50KbPEwTNXQHpTTTiTblbfl+PbI2UIFJYzWlq6MoVZlJt9q37sbabNzvB6K7fhpzPMU1gYGGB8t9xXqJA/cAKRJqPfj0DFdI30hPSPXol6k5vTV2iIps1a3Wi+KmnPqxVhjCxeBfasZUUiSrs+XY82sjqpbp46yGPTFpKr2ak0RkhazwtlR86i42RVfGn93nCip5t5gh/gPYnXLBAHicbcw3DsJAFITh/U0wmJyzucIGYgnY3IWGDonjU+y44zWfRpo3JjHxMvP/chJq1GnQJKVFm4wOXXr0GTBkxJgJU2bMWbBkxZoNW3bk7A3f9PN+lc45GeRRHuQpatWzXqpvq95ZXqJefa++V99f5U3eZREN1V+pbJWfytoP2gnaCdoJD1kY8wMVDkBX) format("woff"),url(data:application/vnd.ms-fontobject;base64,tBwAAAwcAAABAAIAAAAAAAIABQMAAAAAAAABAJABAAAAAExQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAApTNlGwAAAAAAAAAAAAAAAAAAAAAAABAAaQBjAG8AbgBmAG8AbgB0AAAADgBSAGUAZwB1AGwAYQByAAAAFgBWAGUAcgBzAGkAbwBuACAAMQAuADAAAAAQAGkAYwBvAG4AZgBvAG4AdAAAAAAAAAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJW8EJqAAABfAAAAFZjbWFwDNAWbAAAAkwAAANMZ2x5Zk6tydAAAAXYAAASaGhlYWQpIGHTAAAA4AAAADZoaGVhB8gDlAAAALwAAAAkaG10eHRU/+8AAAHUAAAAeGxvY2FB/D3yAAAFmAAAAD5tYXhwATUA7AAAARgAAAAgbmFtZZAIaAsAABhAAAAChXBvc3RFi0lqAAAayAAAAUMAAQAAAyz/LABcBEz/8P/9BE0AAQAAAAAAAAAAAAAAAAAAAB4AAQAAAAEAABtlM6VfDzz1AAsEAAAAAADi4g8/AAAAAOLiDz//8P8qBE0DLgAAAAgAAgAAAAAAAAABAAAAHgDgAA0AAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQPhAZAABQAIAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABAAHjhPQMs/ywAXAMuANYAAAABAAAAAAAABAAAAABkAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAADqv//BAAAAARD//AEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABEwAAAQAAAAEAAAABAAAAAQAAAADtgAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAABQAAAAMAAAAsAAAABAAAAcgAAQAAAAAAwgADAAEAAAAsAAMACgAAAcgABACWAAAAEgAQAAMAAgB44QThBuEY4SPhK+Ex4T3//wAAAHjhAeEG4RHhIeEp4S3hOP//AAAAAAAAAAAAAAAAAAAAAAABABIAEgAYABgAJgAqAC4ANgAAAAEABwAIAAkACgAEAAIAAgADAAUABAAGAAsADAANAA4ADwAQABEAEgATABUAFwAWABQAGAAZABoAGwAcAB0AAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAYQAAAAAAAAAHwAAAHgAAAB4AAAAAQAA4QEAAOEBAAAABwAA4QIAAOECAAAACAAA4QMAAOEDAAAACQAA4QQAAOEEAAAACgAA4QYAAOEGAAAABAAA4REAAOERAAAAAgAA4RIAAOESAAAAAgAA4RMAAOETAAAAAwAA4RQAAOEUAAAABQAA4RUAAOEVAAAABAAA4RYAAOEWAAAABgAA4RcAAOEXAAAACwAA4RgAAOEYAAAADAAA4SEAAOEhAAAADQAA4SIAAOEiAAAADgAA4SMAAOEjAAAADwAA4SkAAOEpAAAAEAAA4SoAAOEqAAAAEQAA4SsAAOErAAAAEgAA4S0AAOEtAAAAEwAA4S4AAOEuAAAAFQAA4S8AAOEvAAAAFwAA4TAAAOEwAAAAFgAA4TEAAOExAAAAFAAA4TgAAOE4AAAAGAAA4TkAAOE5AAAAGQAA4ToAAOE6AAAAGgAA4TsAAOE7AAAAGwAA4TwAAOE8AAAAHAAA4T0AAOE9AAAAHQAAAAAADABOAJAAxAEGATgBaAGWAb4DBANoA44D1gP8BCoEmAS6BU4FzgYOBnYHOgdiB4QHuAgQCIAIwgk0AAAAAQAA/+wAMgAUAAIAADczFRQeFCgAAAAAAwAAAAADAAIsAAsAFwAkAAABDgEHLgEnPgE3HgEnHgEXDgEHLgEnPgE3DgEHHgEXPgE3LgEnAwADkG1tkAMDkG1tkP1TawICa1NTawICa1NskQMDkWxskQMDkWwBLG2QAwOQbW2QAwOQUwJrU1NrAgJrU1NrQgORbGyRAwORbGyRAwAAAwAAAAADAAIsAAsAFwAkAAABDgEHLgEnPgE3HgEnHgEXDgEHLgEnPgE3DgEHHgEXPgE3LgEnAwADkG1tkAMDkG1tkP1TawICa1NTawICa1NskQMDkWxskQMDkWwBLG2QAwOQbW2QAwOQUwJrU1NrAgJrU1NrQgORbGyRAwORbGyRAwAAAgAA/ywEAAMsAAsAGQAAAQYAByYAJzYANxYABw4DBy4BJz4BNx4BBAAF/t/a2v7fBQUBIdraASHnASlOZTd1nAMDnHV1nAEs2v7fBQUBIdraASEFBf7f2jdlTikBA5x1dZwDA5wAAAADAAAAAAMAAiwACwAXACMAAAEOAQcuASc+ATceAQMuASc+ATceARcOAQMOAQceARc+ATcuAQLAAmxSUmwCAmxSUmy+bZADA5BtbZADA5BtUW0CAm1RUW0CAm0BLFJsAgJsUlJsAgJs/q4DkG1tkAMDkG1tkAG9Am1RUW0CAm1RUW0AAAACAAD/LAQAAywACwAXAAABBgAHJgAnNgA3FgAHDgEHLgEnPgE3HgEEAAX+39ra/t8FBQEh2toBIecDnHV1nAMDnHV1nAEs2v7fBQUBIdraASEFBf7f2nWcAwOcdXWcAwOcAAAAAwAA/9wCUAJ8AAgAEQAaAAABDgEiJjQ2MhY3DgEiJjQ2MhYTDgEiJjQ2MhYCUAEtRC0tRC0BAS1ELS1ELQEBLUQtLUQtASwiLS1ELS3eIi0tRC0t/d4iLS1ELS0AAAAAAf///ywDogMuABoAAAE+ATUuAScOAQceARcOAQcxHgEzITI2NS4BJwJjRFEDp31+pgQBUESOrgMBEg0DYg4SAq2MAQUohlN+pwMDp35Thicy65wOEhIOm+sxAAACAAD/bAPAAuwACwAXAAABDgEHHgEXPgE3LgETIxUjNSM1MzUzFTMCAL/8BQX8v7/8BQX8IcBAwMBAwALsBfy/v/wFBfy/v/z+JcDAQMDAAA3/8P8qBEYDJgA6AEAARgBWAGwAfACWAKgAtgDEAM0A1gDfAAAXPgEeARc3NhcOARceARcWHwEmNhcOAyI2HgEVFgYnJgYHBg8BFBYXFAYnLgEvASYnLgEnLgE3JjYXFTMVIzUhFSM1MzUBIR4BFREUBgchLgE1ETQ2ARcWBg8BIy4BPQE3LgEnPgEyFhcOAQEhMhYVMRQGIyEiJjUxNDYlLgEnDgEHFRQGIiYnNT4BNx4BFxUUBiImNSUzNT4BNx4BFxUzNS4BJw4BDwE+ATc1FRQGIiYnNRQWBT4BNzUVFAYiJic1FBYDFAYiJjQ2MhYBFAYiJjQ2MhYlFAYiJjQ2MhaeVtOohwQPDAEDCgYLYyIdDg8BKSsBFQwQAREhGAIgNxNGbXyHkxIRGBkZKQEvKxwZMxQbXxkBRUZEUQLyUUT9eQI2ERcXEf3KERcXAUcJAQkIBCAIDAkQEQEBIjQiAQER/rMCRA4TEw79vA4TEwHwAmxSUmwCEhsSAQOQbW2QAxIcEv5vCAJyVVVyAggCdllZdgINDRMBExwTARMByw4TARMcEwETQwcMBwcMBwEVCAwHBwwI/QAICwgHDAgzEQ0JDwEGBQMECgICDAcGBQQDJQEDChEJAw4HAQMPCgQmCggFBQEQBAIMAwUZAgMDBAQOAwIVFQIgFUMOUVEOQwG9ARYS/noRFwEBFxEBhhIW/uwrCA0CAQELCQMrBxsRGSAgGREbAQ4TDw4TEw4PE5BTbgICblOuBAYFBK9ukwMDk26uBAYGBAqhU24CAm5ToaFWcgICclabAQcFARsGBwcFHAYHAQEHBQEbBgcHBRwGBwHDBggIDAcH/csGCAgLCAi3BQgICwgIAAABAAD/VgPAAwIARwAAASImJzU+ATsBMhYXFQ4BKwEVMx4BFxUzMhYdARQGKwEiJj0BPgE3MzUuASchIgYHFTMeARcVDgEHIyImPQE+ATczNT4BNzM1AasjMgEBMiOqIzIBATIjKqosPAMrIzIyI6sjMgEwJCsBCgj+UwkLAiskMAEBMCSrIzIBMCQrATksrwGsMiOrIzIyI6sjMlUBOitFMiOrIzIyI6skMAFACAwBCglCATAkqyQwATIjqyQwAUAsPANVAAAAAAMAAP9sA8AC7AALAA8AEwAAAQ4BBx4BFz4BNy4BAyM1MzUjETMCAL79BQX9vr79BQX9nkBAQEAC7AX9vr79BQX9vr79/YVAQAEAAAAEAAD/LAQAAywAAwAPABsAJwAAESERIQEeARcOAQcuASc+ARcOAQceARc+ATcuARcOAQcuASc+ATceAQQA/AACALHrBATrsbHrBATrsV9/AgJ/X19/AgJ/gQJ/X19/AgJ/X19/Ayz8AAOgBOuxsesEBOuxseu8An9fX38CAn9fX3/eX38CAn9fX38CAn8AAAABAAD/awLhAu0AEQAABSIuATcJASY+ARYXARYUBwEGAUAMEwIJAWz+lAkCExoKAYAICP6AC5QSGQsBigGKChoTAgn+YAoYCv5gCgAAAgAA/2wDwALsAAsAFwAAAQ4BBx4BFz4BNy4BAwcnByc3JzcXNxcHAgC+/QUF/b6+/QUF/SAtcXEtcXEtcXEtcQLsBf2+vv0FBf2+vv391C1xcS1xcS1xcS1xAAABAAD/gwPEAswASAAAAQcXNycHJicmJyYjIgYHMQYHBgcGBxYjBgcVBhUUFhcxFhcWFxYyNzY3PgE3Jw4BBw4BIyInMS4BJy4BNTQ3PgE3PgEyFhcWFwL9IJFVOB0gQTxPTVIkSSFXQzsiDAcBAgQBBQwOIEE8T0ykTU88MDwLQAkzJzOBSBwaOWMpMjYFCTIoM4GPgTM1GwHGOFWRIDFWQzwhHQwMIEI8TxwfAw8OAx8hJEoiV0M7Ih4eID0wdkIKOWMpMzUFCDQpM4BIHBw3YykzNTUzNkcAAAAAAQAAAAADggHsABAAACUiJwEuAT4BMyEWFxYGBwEGAgAKCf6cBgQGDgkCyBMHAwQG/pwJLAgBgAcTEwsBEwoTB/6ACAAHAAD/LARNAywAEQAjACwANQBFAFUAZQAAASMVMx4BFw4BByMVMz4BNy4BATM1Iy4BJz4BNzM1Iw4BBx4BNxQGIiY0NjIWAQ4BIiY0NjIWByEiJj0BNDYzITIWHQEUBgMhIiY9ATQ2MyEyFh0BFAYDISImPQE0NjMhMhYdARQGA2JPT0NYAgJYQ1BQZIQCAoT9JFFRQlkBAVlCUVFjhAMDhMwnNiYlOCUCJgElOCUlOCVM/fQGBwcGAgwFCAgE/fQFCAgFAgwGBwcG/fQFCAgFAgwGBwcC3U0CWkJDWQNNA4VkY4X8ok4CWUNDWQJNA4VjZIUjHCYmOCUlAWwcJSU4JSWQBwbSBgcHBtIGBwGKBwbSBgcHBtIGB/zsBwbSBgcHBtIGBwAAAAUAAP8sBAADLAAPABsAPABKAFMAAAUhLgEnET4BNyEeARcRDgEDISImNDYzITIWFAYHIxEnBxEjIiY0NjchMjY0JiMhDgEHER4BFyEyNjURNCYHLgEiBhUUFhcHMyc+ASceARQGIiY0NgOx/J4iLAEBLCIDYiIsAQEsmP3UCQsLCQIsCAwMCGypqGoZIiIZAicIDAwI/dkqOAEBOCoCJwgMDOMBIDAgEg8JQAgPEjkICQkPCgrUASwiA2IiLAEBLCL8niIsAv8LEQsLEQsn/g9rawHxIjIhAQsRCwE4Kf3YKTgBCwkCJwgLnBggIBgRGwdLSwcbIwEJDwoKDwkAAAAIAAD/zANuAscAAwAHAAsADwATABcAGwAfAAATMxEjNSEVIQEzESMBNQEXATUnDwE1NxcFBxU3JQcXN5R7ewLa/SYCX3t7/aEBa1sBFLJdXrtd/fZ7ewIKXSZdAYX+SHt7Abj+SAEWogFCUP5ro5xS+KWlUYBtRW3FUyFTAAAAAAoAAP+MA58CzQADAAcACwAPABMAFwAbAB8ALwA/AAABMxEjEzMRIxMzESMTMxEjASEVIRUhFSEVIRUhFSEVIQUhIiY1ETQ2MyEyFhURFAYnISImNRE0NjMhMhYXEQ4BAQBAQJVAQJVAQJVAQP2gA0D8wANA/MADQPzAA0D8wALC/cAOEhIOAkAOEhKi/vcOEhIOAQkNEgEBEgLN/MADQPzAA0D8wANA/MACn0BVQFVAVUBBEg4CQA4SEg79wA4SnBMNAQoOEhIO/vYNEwAAAAAJAAD/iwOgAsoADwAfAC8AMwA3AEwAWABqAHYAACUnLgE/AT4BHwEeAQ8BDgEHJy4BPwE+AR8BHgEPAQ4BBycuAT8BPgEfAR4BDwEOARMPARcFDwEnATcWNjc2NCYiBw4BFwcmBAMfASQSASY0NzYyFxYUBwYiNyYiBw4BFx4BFx4BFxY2NzY0BycmPwE2HwEWDwEGAYGUBgMFCgUPB5MGAwUKBQ9DoQYDBQsEDwegBwIECwUPWXMGAwQLBQ8GcwcCBAsFD3hwn6sBfQ/TBAGxHwkTCAkTGgoHBAQeSf6BdVFOAVpw/msmJilpKCcnKGl8H1EfEw4EEB0MDgkDGC8THZgEAglFCQQDAghFCiZpBA8HDwYDBWgFDwYPBwJEcgUPBg8HAgRyBQ8GDwcCKFIFDgcPBgMEUgUPBg8HAgIFDtQEM3CfqwI3HwQDBwoaEwkIEwkfHHD+pk5QdQF//t4oaSkmJilpKCfMHh4TLxgCCgsNGhQEDhIfUW0KCQQYAgkJCgQXAgAAAAMAAP8sA7YDLAADAAcAEQAANRElESURBREtATUDJREFFRMFAWcCT/6ZAWf+mOb+mAFo5gFomwElz/7cVf7czwEkz8+d/cXP/tzQoAI/0AAAAQAA/6wDQAKtABAAAAkBLgEOARURFhcWMzI3ATY0Azb+SQgVFgwBFgcGEAsBtwoBPwFkBgQGDgn9OBMHAgkBZAkUAAABAAD/4QOAAncAHQAAATY9ATQvAQEuAQ4BHwEhJgYUFjMhBwYeATI3ATc2A30DAgb+8QoZFAEJ3v2IDhISDgJ43gkBExoKAQ8DAQEgBgUCBgUJASoKARIaCvUBEhwS9AsZEgoBKgUDAAIAAP8sBAEDLQAaADYAACURIREhPgE0JichIgYVER4BFyE+ATcRLgEiBhMmIyEOARQWFzMBBhQWMjcBFQYeATI+ATURNCcDq/yqASsSFhYS/tUjMgEwJANWJDABARgjGEgMEf67ERYWEeX+CQwYHgwB+QELExYUCgys/tUDVgEYIxgBMiP8qiQwAQEwJAErEhYWAmMLARciFgL+CAsfGAwB+egLFAwMFAsBRhEMAAAABAAA/2wDwALsAAsAFwA6AEMAAAEOAQceARc+ATcuAQMuASc+ATceARcOAQMGBwYWNzY3NhcWDwEGFhcWNzY3NiYHBgcGJyY3NicmJyYiNw4BIiY0NjIWAgC//AUF/L+//AUF/L+k2AQE2KSk2AQE2LYsIBATDQ8ZEAMCBxoiCRgbHi4iERUNDxkVBQEIPAgFFAwdZAEbKBsbKBsC7AX8v7/8BQX8v7/8/MUE2KSk2AQE2KSk2AHpCiASFQwTCgIMFRRfdDMPDAcKIxQTChQGBBQWFMsdFgsFYBQbGygbGwADAAD/LAQAAywADAAVACMAAAEGAAcWABc2ADcmACcTHgEUBiImNDYTMhYXBw4BIiY1JzM+AQIA2v7fBQUBIdraASEFBf7f2gURFxcjFxcSERcBDAEQGBENAQEXAywF/t/a2v7fBQUBIdraASEF/XcBFyMXFyMXAWUUEPALDg4L8w4TAAAEAAD/qgPWAq0AEgAmADkARgAAATYWFx4BFQ4BJwYmJz4BNz4BFyU2FhceARUOASc2NTQmJy4BJz4BEx4BFA4BIicmJz4BNzQmJzc2FiU2Mh4BFA4BIi4BNDYBxz1TZx8jBMCRkcEEAR8db1k8ARdESWEcHgFRRAUjH0dMHBIqYCEmJkNMIgwJICQBFRQEIEX+hSdWTisrTlZOKysBIAIlRxuIIkAGBAQGQCCGG0onAwIDHkQYeR4oFwILDyKIGzAuBgYCAUsVR1NHKRQHCRlJKyA6GAIQAxUXL09eTy8vT15PAAAAABIA3gABAAAAAAAAAB0AAAABAAAAAAABAAgAHQABAAAAAAACAAcAJQABAAAAAAADAAgALAABAAAAAAAEAAgANAABAAAAAAAFAAsAPAABAAAAAAAGAAgARwABAAAAAAAKACsATwABAAAAAAALABMAegADAAEECQAAADoAjQADAAEECQABABAAxwADAAEECQACAA4A1wADAAEECQADABAA5QADAAEECQAEABAA9QADAAEECQAFABYBBQADAAEECQAGABABGwADAAEECQAKAFYBKwADAAEECQALACYBgQogIENyZWF0ZWQgYnkgZm9udC1jYXJyaWVyCiAgaWNvbmZvbnRSZWd1bGFyaWNvbmZvbnRpY29uZm9udFZlcnNpb24gMS4waWNvbmZvbnRHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuaHR0cDovL2ZvbnRlbGxvLmNvbQAKACAAIABDAHIAZQBhAHQAZQBkACAAYgB5ACAAZgBvAG4AdAAtAGMAYQByAHIAaQBlAHIACgAgACAAaQBjAG8AbgBmAG8AbgB0AFIAZQBnAHUAbABhAHIAaQBjAG8AbgBmAG8AbgB0AGkAYwBvAG4AZgBvAG4AdABWAGUAcgBzAGkAbwBuACAAMQAuADAAaQBjAG8AbgBmAG8AbgB0AEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4BAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8AAXgHdW5pRTExMQd1bmlFMTEzB3VuaUUxMTUHdW5pRTExNAd1bmlFMTE2B3VuaUUxMDEHdW5pRTEwMgd1bmlFMTAzB3VuaUUxMDQHdW5pRTExNwd1bmlFMTE4B3VuaUUxMjEHdW5pRTEyMgd1bmlFMTIzB3VuaUUxMjkHdW5pRTEyQQd1bmlFMTJCB3VuaUUxMkQHdW5pRTEzMQd1bmlFMTJFB3VuaUUxMzAHdW5pRTEyRgd1bmlFMTM4B3VuaUUxMzkHdW5pRTEzQQd1bmlFMTNCB3VuaUUxM0MHdW5pRTEzRAAAAA==?#iefix) format("embedded-opentype")}.manage-icon{speak:none;-webkit-font-feature-settings:normal;font-feature-settings:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:manage!important;font-style:normal;font-variant:normal;font-weight:400;line-height:1;text-align:center;text-transform:none}.manage-icon-sync-failed:before{content:"\e111"}.manage-icon-sync-success:before{content:"\e112"}.manage-icon-sync-default:before{content:"\e113"}.manage-icon-abnormal:before{content:"\e115"}.manage-icon-sync-waiting-01:before{content:"\e114"}.manage-icon-warning-2:before{content:"\e116"}.manage-icon-more-fill:before{content:"\e101"}.manage-icon-user-shape:before{content:"\e102"}.manage-icon-add-fill:before{content:"\e103"}.manage-icon-lock-radius:before{content:"\e104"}.manage-icon-normal:before{content:"\e106"}.manage-icon-organization:before{content:"\e117"}.manage-icon-warning-circle-fill:before{content:"\e118"}.manage-icon-unknown:before{content:"\e121"}.manage-icon-angle-right:before{content:"\e122"}.manage-icon-close:before{content:"\e123"}.manage-icon-refresh:before{content:"\e129"}.manage-icon-down-shape:before{content:"\e12a"}.manage-icon-color-logo-pipeline:before{content:"\e12b"}.manage-icon-color-logo-ticket:before{content:"\e12d"}.manage-icon-color-logo-quality:before{content:"\e131"}.manage-icon-color-logo-environment:before{content:"\e12e"}.manage-icon-color-logo-experience:before{content:"\e130"}.manage-icon-color-logo-codelib:before{content:"\e12f"}.manage-icon-right-shape:before{content:"\e138"}.manage-icon-arrows-right:before{content:"\e139"}.manage-icon-jump:before{content:"\e13a"}.manage-icon-info-line:before{content:"\e13b"}.manage-icon-tishi:before{content:"\e13c"}.manage-icon-user-template:before{content:"\e13d"} \ No newline at end of file diff --git a/src/frontend/bk-permission/dist/main.js b/src/frontend/bk-permission/dist/main.js index 4e2b3fcee94..acb55886f2a 100644 --- a/src/frontend/bk-permission/dist/main.js +++ b/src/frontend/bk-permission/dist/main.js @@ -1,15 +1,16 @@ -(function(qt,Qt){typeof exports=="object"&&typeof module=="object"?module.exports=Qt(require("vue")):typeof define=="function"&&define.amd?define(["vue"],Qt):typeof exports=="object"?exports.MyLibrary=Qt(require("vue")):qt.MyLibrary=Qt(qt.vue)})(typeof self<"u"?self:this,function(lr){return function(){var qt={21383:function(s,c,t){"use strict";t(18091),t(41568),t(92995),t(43477),t(94216),Object.defineProperty(c,"__esModule",{value:!0});var r={};c.default=void 0,t(91438),t(65286);var o=n(t(11946));Object.keys(o).forEach(function(l){l==="default"||l==="__esModule"||Object.prototype.hasOwnProperty.call(r,l)||l in c&&c[l]===o[l]||Object.defineProperty(c,l,{enumerable:!0,get:function(){return o[l]}})});function a(l){if(typeof WeakMap!="function")return null;var f=new WeakMap,d=new WeakMap;return(a=function(p){return p?d:f})(l)}function n(l,f){if(!f&&l&&l.__esModule)return l;if(l===null||typeof l!="object"&&typeof l!="function")return{default:l};var d=a(f);if(d&&d.has(l))return d.get(l);var v={__proto__:null},p=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var h in l)if(h!=="default"&&{}.hasOwnProperty.call(l,h)){var y=p?Object.getOwnPropertyDescriptor(l,h):null;y&&(y.get||y.set)?Object.defineProperty(v,h,y):v[h]=l[h]}return v.default=l,d&&d.set(l,v),v}var e=c.default=o.default;if(typeof window<"u"){var i=window.document.currentScript,u=i&&i.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);u&&(t.p=u[1])}},81993:function(s,c,t){t(74780),t(48932),t(23701),t(70258),t(18091),t(26407),t(80555),t(5672),t(46884),t(41568),t(68147),t(99333),t(43477),t(94216);var r=function(o){"use strict";var a=Object.prototype,n=a.hasOwnProperty,e=Object.defineProperty||function(C,j,U){C[j]=U.value},i,u=typeof Symbol=="function"?Symbol:{},l=u.iterator||"@@iterator",f=u.asyncIterator||"@@asyncIterator",d=u.toStringTag||"@@toStringTag";function v(C,j,U){return Object.defineProperty(C,j,{value:U,enumerable:!0,configurable:!0,writable:!0}),C[j]}try{v({},"")}catch{v=function(U,w,X){return U[w]=X}}function p(C,j,U,w){var X=j&&j.prototype instanceof O?j:O,K=Object.create(X.prototype),ut=new b(w||[]);return e(K,"_invoke",{value:H(C,U,ut)}),K}o.wrap=p;function h(C,j,U){try{return{type:"normal",arg:C.call(j,U)}}catch(w){return{type:"throw",arg:w}}}var y="suspendedStart",g="suspendedYield",m="executing",M="completed",E={};function O(){}function I(){}function S(){}var x={};v(x,l,function(){return this});var T=Object.getPrototypeOf,N=T&&T(T(R([])));N&&N!==a&&n.call(N,l)&&(x=N);var A=S.prototype=O.prototype=Object.create(x);I.prototype=S,e(A,"constructor",{value:S,configurable:!0}),e(S,"constructor",{value:I,configurable:!0}),I.displayName=v(S,d,"GeneratorFunction");function D(C){["next","throw","return"].forEach(function(j){v(C,j,function(U){return this._invoke(j,U)})})}o.isGeneratorFunction=function(C){var j=typeof C=="function"&&C.constructor;return j?j===I||(j.displayName||j.name)==="GeneratorFunction":!1},o.mark=function(C){return Object.setPrototypeOf?Object.setPrototypeOf(C,S):(C.__proto__=S,v(C,d,"GeneratorFunction")),C.prototype=Object.create(A),C},o.awrap=function(C){return{__await:C}};function B(C,j){function U(K,ut,it,ct){var at=h(C[K],C,ut);if(at.type==="throw")ct(at.arg);else{var _=at.arg,vt=_.value;return vt&&typeof vt=="object"&&n.call(vt,"__await")?j.resolve(vt.__await).then(function(dt){U("next",dt,it,ct)},function(dt){U("throw",dt,it,ct)}):j.resolve(vt).then(function(dt){_.value=dt,it(_)},function(dt){return U("throw",dt,it,ct)})}}var w;function X(K,ut){function it(){return new j(function(ct,at){U(K,ut,ct,at)})}return w=w?w.then(it,it):it()}e(this,"_invoke",{value:X})}D(B.prototype),v(B.prototype,f,function(){return this}),o.AsyncIterator=B,o.async=function(C,j,U,w,X){X===void 0&&(X=Promise);var K=new B(p(C,j,U,w),X);return o.isGeneratorFunction(j)?K:K.next().then(function(ut){return ut.done?ut.value:K.next()})};function H(C,j,U){var w=y;return function(K,ut){if(w===m)throw new Error("Generator is already running");if(w===M){if(K==="throw")throw ut;return L()}for(U.method=K,U.arg=ut;;){var it=U.delegate;if(it){var ct=Y(it,U);if(ct){if(ct===E)continue;return ct}}if(U.method==="next")U.sent=U._sent=U.arg;else if(U.method==="throw"){if(w===y)throw w=M,U.arg;U.dispatchException(U.arg)}else U.method==="return"&&U.abrupt("return",U.arg);w=m;var at=h(C,j,U);if(at.type==="normal"){if(w=U.done?M:g,at.arg===E)continue;return{value:at.arg,done:U.done}}else at.type==="throw"&&(w=M,U.method="throw",U.arg=at.arg)}}}function Y(C,j){var U=j.method,w=C.iterator[U];if(w===i)return j.delegate=null,U==="throw"&&C.iterator.return&&(j.method="return",j.arg=i,Y(C,j),j.method==="throw")||U!=="return"&&(j.method="throw",j.arg=new TypeError("The iterator does not provide a '"+U+"' method")),E;var X=h(w,C.iterator,j.arg);if(X.type==="throw")return j.method="throw",j.arg=X.arg,j.delegate=null,E;var K=X.arg;if(!K)return j.method="throw",j.arg=new TypeError("iterator result is not an object"),j.delegate=null,E;if(K.done)j[C.resultName]=K.value,j.next=C.nextLoc,j.method!=="return"&&(j.method="next",j.arg=i);else return K;return j.delegate=null,E}D(A),v(A,d,"Generator"),v(A,l,function(){return this}),v(A,"toString",function(){return"[object Generator]"});function z(C){var j={tryLoc:C[0]};1 in C&&(j.catchLoc=C[1]),2 in C&&(j.finallyLoc=C[2],j.afterLoc=C[3]),this.tryEntries.push(j)}function P(C){var j=C.completion||{};j.type="normal",delete j.arg,C.completion=j}function b(C){this.tryEntries=[{tryLoc:"root"}],C.forEach(z,this),this.reset(!0)}o.keys=function(C){var j=Object(C),U=[];for(var w in j)U.push(w);return U.reverse(),function X(){for(;U.length;){var K=U.pop();if(K in j)return X.value=K,X.done=!1,X}return X.done=!0,X}};function R(C){if(C!=null){var j=C[l];if(j)return j.call(C);if(typeof C.next=="function")return C;if(!isNaN(C.length)){var U=-1,w=function X(){for(;++U=0;--X){var K=this.tryEntries[X],ut=K.completion;if(K.tryLoc==="root")return w("end");if(K.tryLoc<=this.prev){var it=n.call(K,"catchLoc"),ct=n.call(K,"finallyLoc");if(it&&ct){if(this.prev=0;--w){var X=this.tryEntries[w];if(X.tryLoc<=this.prev&&n.call(X,"finallyLoc")&&this.prev=0;--U){var w=this.tryEntries[U];if(w.finallyLoc===j)return this.complete(w.completion,w.afterLoc),P(w),E}},catch:function(j){for(var U=this.tryEntries.length-1;U>=0;--U){var w=this.tryEntries[U];if(w.tryLoc===j){var X=w.completion;if(X.type==="throw"){var K=X.arg;P(w)}return K}}throw new Error("illegal catch attempt")},delegateYield:function(j,U,w){return this.delegate={iterator:R(j),resultName:U,nextLoc:w},this.method==="next"&&(this.arg=i),E}},o}(s.exports);try{regeneratorRuntime=r}catch{typeof globalThis=="object"?globalThis.regeneratorRuntime=r:Function("r","regeneratorRuntime = r")(r)}},57976:function(s,c){"use strict";var t;t={value:!0},c.Yp=c.XX=void 0;var r=c.XX=function(){var n=this,e=n._self._c;return e("article",{staticClass:"no-enable-permission"},[e("div",{staticClass:"content-wrapper"},[e("bk-exception",{staticClass:"exception-wrap-item exception-part",class:{"exception-gray":n.isGray},attrs:{type:"403",scene:"part",title:n.title}},[e("p",[n._v(n._s(n.title))]),e("bk-button",{staticClass:"mt10",attrs:{theme:"primary",disabled:!n.hasPermission,loading:n.isOpenManageLoading},on:{click:n.openManage}},[n._v(n._s(n.t("\u5F00\u542F\u6743\u9650\u7BA1\u7406")))])],1)],1)])},o=c.Yp=[]},97304:function(s,c,t){"use strict";var r;r={value:!0},c.Yp=c.XX=void 0,t(67875);var o=c.XX=function(){var e=this,i=e._self._c;return i("bk-dialog",{attrs:{value:e.isShow,width:700,title:e.title},on:{cancel:e.handleCancel},scopedSlots:e._u([{key:"footer",fn:function(){return[i("bk-button",{staticClass:"mr10",attrs:{theme:"primary",loading:e.isLoading},on:{click:e.handleConfirm}},[e._v(" "+e._s(e.t("\u786E\u5B9A"))+" ")]),i("bk-button",{attrs:{loading:e.isLoading},on:{click:e.handleCancel}},[e._v(" "+e._s(e.t("\u53D6\u6D88"))+" ")])]},proxy:!0}])},[i("bk-form",{ref:"applyFrom",staticClass:"apply-form",attrs:{model:e.formData,rules:e.rules,"label-width":"100"}},[i("bk-form-item",{attrs:{label:e.t("\u7528\u6237\u7EC4\u540D")}},[i("span",[e._v(e._s(e.groupName))])]),i("bk-form-item",{attrs:{label:e.t("\u6388\u6743\u671F\u9650"),property:"expireTime",required:"","error-display-type":"normal"}},[i("div",{staticClass:"bk-button-group deadline-wrapper"},[e._l(e.timeFilters,function(u,l,f){return i("bk-button",{key:f,class:{"is-selected":e.currentActive===Number(l),"deadline-btn":!0},on:{click:function(v){return e.handleChangeTime(l)}}},[e._v(" "+e._s(u)+" ")])}),i("bk-button",{directives:[{name:"show",rawName:"v-show",value:e.currentActive!=="custom",expression:"currentActive !== 'custom'"}],staticClass:"deadline-btn",on:{click:e.handleChangCustom}},[e._v(" "+e._s(e.t("\u81EA\u5B9A\u4E49"))+" ")]),i("bk-input",{directives:[{name:"show",rawName:"v-show",value:e.currentActive==="custom",expression:"currentActive === 'custom'"}],staticClass:"custom-time-select",attrs:{type:"number","show-controls":!1,placeholder:"1-365",min:1,max:365},on:{change:e.handleChangeCustomTime},scopedSlots:e._u([{key:"append",fn:function(){return[i("div",{staticClass:"group-text"},[e._v(" "+e._s(e.t("\u5929"))+" ")])]},proxy:!0}]),model:{value:e.customTime,callback:function(l){e.customTime=l},expression:"customTime"}})],2)]),e.type==="renewal"?i("bk-form-item",{attrs:{label:e.t("\u5230\u671F\u65F6\u95F4")}},[i("span",{staticClass:"expired"},[e._v(e._s(e.expiredDisplay)+e._s(e.t("\u5929")))]),i("img",{staticClass:"arrows-icon",attrs:{src:t(1233)}}),i("span",{staticClass:"new-expired"},[e._v(e._s(e.newExpiredDisplay)+e._s(e.t("\u5929")))])]):i("bk-form-item",{attrs:{label:e.t("\u7406\u7531"),property:"reason",required:"","error-display-type":"normal"}},[i("bk-input",{attrs:{type:"textarea",rows:3,maxlength:100},model:{value:e.formData.reason,callback:function(l){e.$set(e.formData,"reason",l)},expression:"formData.reason"}})],1)],1)],1)},a=c.Yp=[]},18059:function(s,c,t){"use strict";var r;r={value:!0},c.Yp=c.XX=void 0,t(72028);var o=c.XX=function(){var e=this,i=e._self._c;return i("article",{staticClass:"group-table"},[i("bk-table",{directives:[{name:"bkloading",rawName:"v-bkloading",value:{isLoading:e.isLoading},expression:"{ isLoading }"}],attrs:{data:e.memberList}},[i("bk-table-column",{attrs:{label:e.t("\u7528\u6237\u7EC4"),prop:"groupName"}}),i("bk-table-column",{attrs:{label:e.t("\u6DFB\u52A0\u65F6\u95F4"),prop:"createdTime"},scopedSlots:e._u([{key:"default",fn:function(l){var f=l.row;return[i("span",[e._v(e._s(f.createdTime?f.createdTime:"--")+" ")])]}}])}),i("bk-table-column",{attrs:{label:e.t("\u6709\u6548\u671F"),prop:"expiredDisplay"},scopedSlots:e._u([{key:"default",fn:function(l){var f=l.row;return[i("span",[e._v(e._s(f.expiredDisplay?f.expiredDisplay+e.t("\u5929"):"--")+" ")])]}}])}),i("bk-table-column",{attrs:{label:e.t("\u72B6\u6001"),prop:"status"},scopedSlots:e._u([{key:"default",fn:function(l){var f=l.row;return[i("div",{staticClass:"status-content"},[i("img",{staticClass:"status-icon",attrs:{src:e.statusIcon(f.status)}}),e._v(" "+e._s(e.statusFormatter(f.status))+" ")])]}}])}),i("bk-table-column",{attrs:{label:e.t("\u64CD\u4F5C")},scopedSlots:e._u([{key:"default",fn:function(l){var f=l.row;return[i("bk-button",{staticClass:"btn",attrs:{theme:"primary",text:""},on:{click:function(v){return e.handleViewDetail(f)}}},[e._v(e._s(e.t("\u6743\u9650\u8BE6\u60C5")))]),f.status==="NOT_JOINED"?i("bk-button",{staticClass:"btn",attrs:{theme:"primary",text:""},on:{click:function(v){return e.handleApply(f)}}},[e._v(e._s(e.t("\u7533\u8BF7\u52A0\u5165")))]):e._e(),i("span",{directives:[{name:"bk-tooltips",rawName:"v-bk-tooltips",value:{content:e.t("\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4"),disabled:f.directAdded},expression:`{ +(function(Le,Se){typeof exports=="object"&&typeof module=="object"?module.exports=Se(require("vue")):typeof define=="function"&&define.amd?define(["vue"],Se):typeof exports=="object"?exports.MyLibrary=Se(require("vue")):Le.MyLibrary=Se(Le.vue)})(typeof self<"u"?self:this,function(qe){return function(){var Le={9309:function(s,d,t){"use strict";t.r(d)},7727:function(s,d,t){"use strict";t.r(d)},8767:function(s,d,t){"use strict";t.r(d)},792:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"__esModule",{value:!0}),d.default=void 0,t(314),t(2501);var o=r(t(3139)),n=o.default.create({validateStatus:function(c){return c>400&&console.warn("HTTP \u8BF7\u6C42\u51FA\u9519 status: ".concat(c)),c>=200&&c<=503},withCredentials:!0});function a(u){return Promise.reject(u)}n.interceptors.response.use(function(u){var c=u.data,e=c.status,v=c.message,l=c.code,h=c.result,m=u.status;if(m===503){var y={status:m,message:v||"service is in deployment"};return Promise.reject(y)}if(m===403){var x={httpStatus:m,code:m,message:v||"Permission Deny"};return Promise.reject(x)}if(typeof e<"u"&&e!==0||typeof h<"u"&&!h){var O={httpStatus:m,message:v,code:l||e};return Promise.reject(O)}if(m===400){var R={httpStatus:m,message:v||"service is abnormal"};return Promise.reject(R)}return u.data},a);var i=d.default=n},795:function(s,d,t){"use strict";t(5794),t(3525),t(3569),t(5095);var r=t(3268);Object.defineProperty(d,"__esModule",{value:!0}),d.AuthorityDirectiveV2=B,d.AuthorityDirectiveV3=w,d.default=void 0;var o=r(t(7825));t(4984);var n=r(t(5135)),a=r(t(4839));t(9848),t(2238),t(3949),t(1345),t(5072),t(314),t(2501),t(1563),t(4504),t(982),t(8767);var i=r(t(792)),u=t(3990),c=["projectId"];function e(C,T){var P=Object.keys(C);if(Object.getOwnPropertySymbols){var I=Object.getOwnPropertySymbols(C);T&&(I=I.filter(function(A){return Object.getOwnPropertyDescriptor(C,A).enumerable})),P.push.apply(P,I)}return P}function v(C){for(var T=1;T1&&arguments[1]!==void 0?arguments[1]:"";return l=C,class{static install(P){P.directive("perm",{bind(I,A,U){U.key||(U.key=new Date().getTime())},inserted(I,A,U){var H=A.value.disablePermissionApi;H?m(I,A.value,U):O(I,A.value,U,T)},update(I,A,U){var H=A.value,Y=A.oldValue;H.hasPermission!==Y.hasPermission&&m(I,A.value,U)},unbind(I,A,U){y(I,U)}})}}}function w(C){var T=arguments.length>1&&arguments[1]!==void 0?arguments[1]:"";return l=C,class{static install(P){P.directive("perm",{created(I,A,U){U.key||(U.key=new Date().getTime())},mounted(I,A,U){var H=A.value.disablePermissionApi;H?m(I,A.value,U):O(I,A.value,U,T)},updated(I,A,U){var H=A.value,Y=A.oldValue;H.hasPermission!==Y.hasPermission&&m(I,A.value,U)},beforeUnmount(I,A,U){y(I,U)}})}}}var N=d.default=u.version===2?B:w},6786:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"__esModule",{value:!0}),d.handleNoPermissionV3=d.handleNoPermissionV2=d.default=void 0,t(3525),t(1345),t(314),t(7727);var o=r(t(792)),n=t(3990),a=t(1522),i=d.handleNoPermissionV2=function(v,l,h){var m=arguments.length>3&&arguments[3]!==void 0?arguments[3]:void 0,y=arguments.length>4&&arguments[4]!==void 0?arguments[4]:"",x={},O={},R=[{label:(0,a.t)("\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650"),prop:"actionName"},{label:(0,a.t)("\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B"),prop:"resourceTypeName"},{label:(0,a.t)("\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B"),prop:"resourceName"}],B=function(){return h(v.bkException,{class:"permission-exception",props:{type:"403",scene:"part"}},(0,a.t)("\u6CA1\u6709\u64CD\u4F5C\u6743\u9650"))},w=function(I){return h(v.bkTable,{class:"permission-table",props:{outerBorder:!1,data:[I]}},R.filter(function(A){return I[A.prop]}).map(function(A){return h(v.bkTableColumn,{props:{showOverflowTooltip:!0,label:A.label,prop:A.prop}})}))},N=function(I){return h("section",{class:"permission-footer"},[I.auth?h(v.bkDropdownMenu,{class:"permission-list",scopedSlots:{"dropdown-content"(){return h("ui",{class:"bk-dropdown-list"},I.groupInfoList.map(function(A){return h("li",{on:{click(){window.open(encodeURI(A.url),"_blank"),C()}}},[A.groupName])}))},"dropdown-trigger"(){return[h("span",{class:"bk-dropdown-list permission-confirm"},[(0,a.t)("\u53BB\u7533\u8BF7")]),h("i",{class:"bk-icon icon-angle-down"})]}}}):h(v.bkButton,{class:"permission-confirm",props:{theme:"primary"},on:{click(){window.open(encodeURI(I.groupInfoList[0].url),"_blank"),C()}}},[(0,a.t)("\u53BB\u7533\u8BF7")]),h(v.bkButton,{class:"permission-cancel",on:{click(){var A,U;(A=x)===null||A===void 0||(U=A.close)===null||U===void 0||U.call(A)}}},[(0,a.t)("\u53D6\u6D88")])])},C=function(){var I,A;(I=x)===null||I===void 0||(A=I.close)===null||A===void 0||A.call(I),O=v.bkInfoBox({title:(0,a.t)("\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4"),subHeader:h("section",[(0,a.t)("\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762"),h("section",{class:"permission-refresh-dialog"},[h(v.bkButton,{class:"mr20",props:{theme:"primary"},on:{click(){location.reload()}}},[(0,a.t)("\u5237\u65B0\u9875\u9762")]),h(v.bkButton,{on:{click(){var U,H;(U=(H=O).close)===null||U===void 0||U.call(H)}}},[(0,a.t)("\u5173\u95ED")])])]),extCls:"permission-dialog",width:500,showFooter:!1})},T=function(I){x=v.bkInfoBox({subHeader:h("section",[B(),w(I),N(I)]),extCls:"permission-dialog",width:640,showFooter:!1})};m?T(m):o.default.get("".concat(y,"/ms/auth/api/user/auth/apply/getRedirectInformation"),{params:l}).then(function(){var P=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},I=P.data?P.data:P;T(I)})},u=d.handleNoPermissionV3=function(v,l,h,m){var y=arguments.length>4&&arguments[4]!==void 0?arguments[4]:"",x={},O={},R=[{label:(0,a.t)("\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650"),prop:"actionName"},{label:(0,a.t)("\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B"),prop:"resourceTypeName"},{label:(0,a.t)("\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B"),prop:"resourceName"}],B=function(){return h(v.Exception,{type:"403",scene:"part"},(0,a.t)("\u6CA1\u6709\u64CD\u4F5C\u6743\u9650"))},w=function(I){return h("section",{class:"permission-table-wrapper"},h(v.Table,{border:"none",data:[I]},R.filter(function(A){return I[A.prop]}).map(function(A){return h(v.TableColumn,{showOverflowTooltip:!0,label:A.label,prop:A.prop})})))},N=function(I){return h("section",{class:"permission-footer"},[I.auth?h(v.Dropdown,{},{content(){return h(v.Dropdown.DropdownMenu,{},I.groupInfoList.map(function(A){return h(v.Dropdown.DropdownItem,{onClick(){window.open(encodeURI(A.url),"_blank"),C()}},[A.groupName])}))},default(){return[h(v.Button,{theme:"primary",class:"mr10"},[(0,a.t)("\u53BB\u7533\u8BF7"),h(v.AngleDown,{class:"icon-angle-down-v3"})])]}}):h(v.Button,{class:"mr10",theme:"primary",onClick(){window.open(encodeURI(I.groupInfoList[0].url),"_blank"),C()}},[(0,a.t)("\u53BB\u7533\u8BF7")]),h(v.Button,{class:"mr25",onClick(){var A,U;(A=x)===null||A===void 0||(U=A.hide)===null||U===void 0||U.call(A)}},[(0,a.t)("\u53D6\u6D88")])])},C=function(){var I,A;(I=x)===null||I===void 0||(A=I.hide)===null||A===void 0||A.call(I),O=v.InfoBox({title:(0,a.t)("\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4"),subTitle:h("section",[(0,a.t)("\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762"),h("section",{class:"permission-refresh-dialog"},[h(v.Button,{class:"mr20",theme:"primary",onClick(){location.reload()}},[(0,a.t)("\u5237\u65B0\u9875\u9762")]),h(v.Button,{onClick(){var U,H;(U=(H=O).hide)===null||U===void 0||U.call(H)}},[(0,a.t)("\u5173\u95ED")])])]),extCls:"permission-dialog",width:500,dialogType:"show"})},T=function(I){x=v.InfoBox({title:"",subTitle:h("section",[B(),w(I),N(I)]),extCls:"permission-dialog-v3",width:640,dialogType:"show"})};m?T(m):o.default.get("".concat(y,"/ms/auth/api/user/auth/apply/getRedirectInformation"),{params:l}).then(function(){var P=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},I=P.data?P.data:P;T(I)})},c=d.default=n.version===2?i:u},7747:function(s,d,t){"use strict";t(3949),t(314),t(517),t(982);var r=t(3268);Object.defineProperty(d,"__esModule",{value:!0}),Object.defineProperty(d,"AuthorityDirectiveV3",{enumerable:!0,get:function(){return n.AuthorityDirectiveV3}}),Object.defineProperty(d,"BkPermission",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(d,"PermissionDirective",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(d,"handleNoPermission",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(d,"handleNoPermissionV3",{enumerable:!0,get:function(){return a.handleNoPermissionV3}});var o=r(t(1780)),n=c(t(795)),a=c(t(6786)),i=t(1522);t(9309);function u(v){if(typeof WeakMap!="function")return null;var l=new WeakMap,h=new WeakMap;return(u=function(y){return y?h:l})(v)}function c(v,l){if(!l&&v&&v.__esModule)return v;if(v===null||typeof v!="object"&&typeof v!="function")return{default:v};var h=u(l);if(h&&h.has(v))return h.get(v);var m={__proto__:null},y=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var x in v)if(x!=="default"&&{}.hasOwnProperty.call(v,x)){var O=y?Object.getOwnPropertyDescriptor(v,x):null;O&&(O.get||O.set)?Object.defineProperty(m,x,O):m[x]=v[x]}return m.default=v,h&&h.set(v,m),m}function e(v){var l=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{};(0,i.loadI18nMessages)(l.i18n),v.component("bk-permission",o.default)}o.default.install=e},1522:function(s,d,t){"use strict";t(5794),t(3525),t(3569),t(5095);var r=t(3268);Object.defineProperty(d,"__esModule",{value:!0}),d.loadI18nMessages=l,d.localeMixins=void 0,d.t=h,t(5151),t(3949),t(825),t(314),t(982);var o=r(t(5135)),n=r(t(3079)),a=r(t(2380));function i(y,x){var O=Object.keys(y);if(Object.getOwnPropertySymbols){var R=Object.getOwnPropertySymbols(y);x&&(R=R.filter(function(B){return Object.getOwnPropertyDescriptor(y,B).enumerable})),O.push.apply(O,R)}return O}function u(y){for(var x=1;x1?O-1:0),B=1;B1?arguments[1]:void 0)}},1039:function(s,d,t){"use strict";var r=t(5025),o=t(5724),n=t(6680),a=t(5848),i=t(5974),u=t(414),c=t(4273),e=t(6133),v=t(7106),l=t(3726),h=Array;s.exports=function(y){var x=n(y),O=u(this),R=arguments.length,B=R>1?arguments[1]:void 0,w=B!==void 0;w&&(B=r(B,R>2?arguments[2]:void 0));var N=l(x),C=0,T,P,I,A,U,H;if(N&&!(this===h&&i(N)))for(A=v(x,N),U=A.next,P=O?new this:[];!(I=o(U,A)).done;C++)H=w?a(A,B,[I.value,C],!0):I.value,e(P,C,H);else for(T=c(x),P=O?new this(T):h(T);T>C;C++)H=w?B(x[C],C):x[C],e(P,C,H);return P.length=C,P}},2102:function(s,d,t){var r=t(4712),o=t(4863),n=t(4273),a=function(i){return function(u,c,e){var v=r(u),l=n(v),h=o(e,l),m;if(i&&c!=c){for(;l>h;)if(m=v[h++],m!=m)return!0}else for(;l>h;h++)if((i||h in v)&&v[h]===c)return i||h||0;return!i&&-1}};s.exports={includes:a(!0),indexOf:a(!1)}},2580:function(s,d,t){var r=t(5025),o=t(5789),n=t(7180),a=t(6680),i=t(4273),u=t(1802),c=o([].push),e=function(v){var l=v==1,h=v==2,m=v==3,y=v==4,x=v==6,O=v==7,R=v==5||x;return function(B,w,N,C){for(var T=a(B),P=n(T),I=r(w,N),A=i(P),U=0,H=C||u,Y=l?H(B,A):h||O?H(B,0):void 0,rt,W;A>U;U++)if((R||U in P)&&(rt=P[U],W=I(rt,U,T),v))if(l)Y[U]=W;else if(W)switch(v){case 3:return!0;case 5:return rt;case 6:return U;case 2:c(Y,rt)}else switch(v){case 4:return!1;case 7:c(Y,rt)}return x?-1:m||y?y:Y}};s.exports={forEach:e(0),map:e(1),filter:e(2),some:e(3),every:e(4),find:e(5),findIndex:e(6),filterReject:e(7)}},4574:function(s,d,t){var r=t(7438),o=t(2414),n=t(7985),a=o("species");s.exports=function(i){return n>=51||!r(function(){var u=[],c=u.constructor={};return c[a]=function(){return{foo:1}},u[i](Boolean).foo!==1})}},2905:function(s,d,t){"use strict";var r=t(7438);s.exports=function(o,n){var a=[][o];return!!a&&r(function(){a.call(null,n||function(){return 1},1)})}},5729:function(s,d,t){var r=t(9117),o=t(6680),n=t(7180),a=t(4273),i=TypeError,u=function(c){return function(e,v,l,h){r(v);var m=o(e),y=n(m),x=a(m),O=c?x-1:0,R=c?-1:1;if(l<2)for(;;){if(O in y){h=y[O],O+=R;break}if(O+=R,c?O<0:x<=O)throw i("Reduce of empty array with no initial value")}for(;c?O>=0:x>O;O+=R)O in y&&(h=v(h,y[O],O,m));return h}};s.exports={left:u(!1),right:u(!0)}},9052:function(s,d,t){"use strict";var r=t(2553),o=t(4747),n=TypeError,a=Object.getOwnPropertyDescriptor,i=r&&!function(){if(this!==void 0)return!0;try{Object.defineProperty([],"length",{writable:!1}).length=1}catch(u){return u instanceof TypeError}}();s.exports=i?function(u,c){if(o(u)&&!a(u,"length").writable)throw n("Cannot set read only .length");return u.length=c}:function(u,c){return u.length=c}},8236:function(s,d,t){var r=t(4863),o=t(4273),n=t(6133),a=Array,i=Math.max;s.exports=function(u,c,e){for(var v=o(u),l=r(c,v),h=r(e===void 0?v:e,v),m=a(i(h-l,0)),y=0;l0;)u[h]=u[--h];h!==v++&&(u[h]=l)}return u},i=function(u,c,e,v){for(var l=c.length,h=e.length,m=0,y=0;m"u"&&d!==void 0;s.exports={all:d,IS_HTMLDDA:t}},1226:function(s,d,t){var r=t(7636),o=t(1451),n=r.document,a=o(n)&&o(n.createElement);s.exports=function(i){return a?n.createElement(i):{}}},8862:function(s){var d=TypeError,t=9007199254740991;s.exports=function(r){if(r>t)throw d("Maximum allowed index exceeded");return r}},625:function(s){s.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},3427:function(s,d,t){var r=t(1226),o=r("span").classList,n=o&&o.constructor&&o.constructor.prototype;s.exports=n===Object.prototype?void 0:n},9871:function(s,d,t){var r=t(2343),o=t(5963);s.exports=!r&&!o&&typeof window=="object"&&typeof document=="object"},2343:function(s){s.exports=typeof Deno=="object"&&Deno&&typeof Deno.version=="object"},1387:function(s,d,t){var r=t(9297),o=t(7636);s.exports=/ipad|iphone|ipod/i.test(r)&&o.Pebble!==void 0},2998:function(s,d,t){var r=t(9297);s.exports=/(?:ipad|iphone|ipod).*applewebkit/i.test(r)},5963:function(s,d,t){var r=t(4661),o=t(7636);s.exports=r(o.process)=="process"},3770:function(s,d,t){var r=t(9297);s.exports=/web0s(?!.*chrome)/i.test(r)},9297:function(s,d,t){var r=t(3360);s.exports=r("navigator","userAgent")||""},7985:function(s,d,t){var r=t(7636),o=t(9297),n=r.process,a=r.Deno,i=n&&n.versions||a&&a.version,u=i&&i.v8,c,e;u&&(c=u.split("."),e=c[0]>0&&c[0]<4?1:+(c[0]+c[1])),!e&&o&&(c=o.match(/Edge\/(\d+)/),(!c||c[1]>=74)&&(c=o.match(/Chrome\/(\d+)/),c&&(e=+c[1]))),s.exports=e},7678:function(s){s.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},6809:function(s,d,t){var r=t(7636),o=t(9100).f,n=t(9316),a=t(8905),i=t(3586),u=t(1413),c=t(4237);s.exports=function(e,v){var l=e.target,h=e.global,m=e.stat,y,x,O,R,B,w;if(h?x=r:m?x=r[l]||i(l,{}):x=(r[l]||{}).prototype,x)for(O in v){if(B=v[O],e.dontCallGetSet?(w=o(x,O),R=w&&w.value):R=x[O],y=c(h?O:l+(m?".":"#")+O,e.forced),!y&&R!==void 0){if(typeof B==typeof R)continue;u(B,R)}(e.sham||R&&R.sham)&&n(B,"sham",!0),a(x,O,B,e)}}},7438:function(s){s.exports=function(d){try{return!!d()}catch{return!0}}},2367:function(s,d,t){"use strict";t(7364);var r=t(5789),o=t(8905),n=t(2458),a=t(7438),i=t(2414),u=t(9316),c=i("species"),e=RegExp.prototype;s.exports=function(v,l,h,m){var y=i(v),x=!a(function(){var w={};return w[y]=function(){return 7},""[v](w)!=7}),O=x&&!a(function(){var w=!1,N=/a/;return v==="split"&&(N={},N.constructor={},N.constructor[c]=function(){return N},N.flags="",N[y]=/./[y]),N.exec=function(){return w=!0,null},N[y](""),!w});if(!x||!O||h){var R=r(/./[y]),B=l(y,""[v],function(w,N,C,T,P){var I=r(w),A=N.exec;return A===n||A===e.exec?x&&!P?{done:!0,value:R(N,C,T)}:{done:!0,value:I(C,N,T)}:{done:!1}});o(String.prototype,v,B[0]),o(e,y,B[1])}m&&u(e[y],"sham",!0)}},7963:function(s,d,t){var r=t(7438);s.exports=!r(function(){return Object.isExtensible(Object.preventExtensions({}))})},1434:function(s,d,t){var r=t(1619),o=Function.prototype,n=o.apply,a=o.call;s.exports=typeof Reflect=="object"&&Reflect.apply||(r?a.bind(n):function(){return a.apply(n,arguments)})},5025:function(s,d,t){var r=t(5789),o=t(9117),n=t(1619),a=r(r.bind);s.exports=function(i,u){return o(i),u===void 0?i:n?a(i,u):function(){return i.apply(u,arguments)}}},1619:function(s,d,t){var r=t(7438);s.exports=!r(function(){var o=function(){}.bind();return typeof o!="function"||o.hasOwnProperty("prototype")})},5724:function(s,d,t){var r=t(1619),o=Function.prototype.call;s.exports=r?o.bind(o):function(){return o.apply(o,arguments)}},1163:function(s,d,t){var r=t(2553),o=t(1702),n=Function.prototype,a=r&&Object.getOwnPropertyDescriptor,i=o(n,"name"),u=i&&function(){}.name==="something",c=i&&(!r||r&&a(n,"name").configurable);s.exports={EXISTS:i,PROPER:u,CONFIGURABLE:c}},1290:function(s,d,t){var r=t(1619),o=Function.prototype,n=o.call,a=r&&o.bind.bind(n,n);s.exports=r?a:function(i){return function(){return n.apply(i,arguments)}}},5789:function(s,d,t){var r=t(4661),o=t(1290);s.exports=function(n){if(r(n)==="Function")return o(n)}},3360:function(s,d,t){var r=t(7636),o=t(5872),n=function(a){return o(a)?a:void 0};s.exports=function(a,i){return arguments.length<2?n(r[a]):r[a]&&r[a][i]}},3726:function(s,d,t){var r=t(3442),o=t(1309),n=t(3330),a=t(8824),i=t(2414),u=i("iterator");s.exports=function(c){if(!n(c))return o(c,u)||o(c,"@@iterator")||a[r(c)]}},7106:function(s,d,t){var r=t(5724),o=t(9117),n=t(7694),a=t(8738),i=t(3726),u=TypeError;s.exports=function(c,e){var v=arguments.length<2?i(c):e;if(o(v))return n(r(v,c));throw u(a(c)+" is not iterable")}},1309:function(s,d,t){var r=t(9117),o=t(3330);s.exports=function(n,a){var i=n[a];return o(i)?void 0:r(i)}},1045:function(s,d,t){var r=t(5789),o=t(6680),n=Math.floor,a=r("".charAt),i=r("".replace),u=r("".slice),c=/\$([$&'`]|\d{1,2}|<[^>]*>)/g,e=/\$([$&'`]|\d{1,2})/g;s.exports=function(v,l,h,m,y,x){var O=h+v.length,R=m.length,B=e;return y!==void 0&&(y=o(y),B=c),i(x,B,function(w,N){var C;switch(a(N,0)){case"$":return"$";case"&":return v;case"`":return u(l,0,h);case"'":return u(l,O);case"<":C=y[u(N,1,-1)];break;default:var T=+N;if(T===0)return w;if(T>R){var P=n(T/10);return P===0?w:P<=R?m[P-1]===void 0?a(N,1):m[P-1]+a(N,1):w}C=m[T-1]}return C===void 0?"":C})}},7636:function(s,d,t){var r=function(o){return o&&o.Math==Math&&o};s.exports=r(typeof globalThis=="object"&&globalThis)||r(typeof window=="object"&&window)||r(typeof self=="object"&&self)||r(typeof t.g=="object"&&t.g)||function(){return this}()||Function("return this")()},1702:function(s,d,t){var r=t(5789),o=t(6680),n=r({}.hasOwnProperty);s.exports=Object.hasOwn||function(i,u){return n(o(i),u)}},2208:function(s){s.exports={}},3542:function(s,d,t){var r=t(7636);s.exports=function(o,n){var a=r.console;a&&a.error&&(arguments.length==1?a.error(o):a.error(o,n))}},9326:function(s,d,t){var r=t(3360);s.exports=r("document","documentElement")},4658:function(s,d,t){var r=t(2553),o=t(7438),n=t(1226);s.exports=!r&&!o(function(){return Object.defineProperty(n("div"),"a",{get:function(){return 7}}).a!=7})},7180:function(s,d,t){var r=t(5789),o=t(7438),n=t(4661),a=Object,i=r("".split);s.exports=o(function(){return!a("z").propertyIsEnumerable(0)})?function(u){return n(u)=="String"?i(u,""):a(u)}:a},1538:function(s,d,t){var r=t(5872),o=t(1451),n=t(3858);s.exports=function(a,i,u){var c,e;return n&&r(c=i.constructor)&&c!==u&&o(e=c.prototype)&&e!==u.prototype&&n(a,e),a}},8369:function(s,d,t){var r=t(5789),o=t(5872),n=t(9562),a=r(Function.toString);o(n.inspectSource)||(n.inspectSource=function(i){return a(i)}),s.exports=n.inspectSource},6106:function(s,d,t){var r=t(6809),o=t(5789),n=t(2208),a=t(1451),i=t(1702),u=t(3486).f,c=t(81),e=t(7233),v=t(1363),l=t(6541),h=t(7963),m=!1,y=l("meta"),x=0,O=function(T){u(T,y,{value:{objectID:"O"+x++,weakData:{}}})},R=function(T,P){if(!a(T))return typeof T=="symbol"?T:(typeof T=="string"?"S":"P")+T;if(!i(T,y)){if(!v(T))return"F";if(!P)return"E";O(T)}return T[y].objectID},B=function(T,P){if(!i(T,y)){if(!v(T))return!0;if(!P)return!1;O(T)}return T[y].weakData},w=function(T){return h&&m&&v(T)&&!i(T,y)&&O(T),T},N=function(){C.enable=function(){},m=!0;var T=c.f,P=o([].splice),I={};I[y]=1,T(I).length&&(c.f=function(A){for(var U=T(A),H=0,Y=U.length;HU;U++)if(Y=F(x[U]),Y&&c(y,Y))return Y;return new m(!1)}I=e(x,A)}for(rt=N?x.next:I.next;!(W=o(rt,I)).done;){try{Y=F(W.value)}catch(J){l(I,"throw",J)}if(typeof Y=="object"&&Y&&c(y,Y))return Y}return new m(!1)}},3384:function(s,d,t){var r=t(5724),o=t(7694),n=t(1309);s.exports=function(a,i,u){var c,e;o(a);try{if(c=n(a,"return"),!c){if(i==="throw")throw u;return u}c=r(c,a)}catch(v){e=!0,c=v}if(i==="throw")throw u;if(e)throw c;return o(c),u}},8411:function(s,d,t){"use strict";var r=t(8094).IteratorPrototype,o=t(349),n=t(6247),a=t(7718),i=t(8824),u=function(){return this};s.exports=function(c,e,v,l){var h=e+" Iterator";return c.prototype=o(r,{next:n(+!l,v)}),a(c,h,!1,!0),i[h]=u,c}},7341:function(s,d,t){"use strict";var r=t(6809),o=t(5724),n=t(5258),a=t(1163),i=t(5872),u=t(8411),c=t(3510),e=t(3858),v=t(7718),l=t(9316),h=t(8905),m=t(2414),y=t(8824),x=t(8094),O=a.PROPER,R=a.CONFIGURABLE,B=x.IteratorPrototype,w=x.BUGGY_SAFARI_ITERATORS,N=m("iterator"),C="keys",T="values",P="entries",I=function(){return this};s.exports=function(A,U,H,Y,rt,W,K){u(H,U,Y);var F=function(St){if(St===rt&&j)return j;if(!w&&St in ot)return ot[St];switch(St){case C:return function(){return new H(this,St)};case T:return function(){return new H(this,St)};case P:return function(){return new H(this,St)}}return function(){return new H(this)}},J=U+" Iterator",it=!1,ot=A.prototype,G=ot[N]||ot["@@iterator"]||rt&&ot[rt],j=!w&&G||F(rt),V=U=="Array"&&ot.entries||G,tt,nt,at;if(V&&(tt=c(V.call(new A)),tt!==Object.prototype&&tt.next&&(!n&&c(tt)!==B&&(e?e(tt,B):i(tt[N])||h(tt,N,I)),v(tt,J,!0,!0),n&&(y[J]=I))),O&&rt==T&&G&&G.name!==T&&(!n&&R?l(ot,"name",T):(it=!0,j=function(){return o(G,this)})),rt)if(nt={values:F(T),keys:W?j:F(C),entries:F(P)},K)for(at in nt)(w||it||!(at in ot))&&h(ot,at,nt[at]);else r({target:U,proto:!0,forced:w||it},nt);return(!n||K)&&ot[N]!==j&&h(ot,N,j,{name:rt}),y[U]=j,nt}},8094:function(s,d,t){"use strict";var r=t(7438),o=t(5872),n=t(1451),a=t(349),i=t(3510),u=t(8905),c=t(2414),e=t(5258),v=c("iterator"),l=!1,h,m,y;[].keys&&(y=[].keys(),"next"in y?(m=i(i(y)),m!==Object.prototype&&(h=m)):l=!0);var x=!n(h)||r(function(){var O={};return h[v].call(O)!==O});x?h={}:e&&(h=a(h)),o(h[v])||u(h,v,function(){return this}),s.exports={IteratorPrototype:h,BUGGY_SAFARI_ITERATORS:l}},8824:function(s){s.exports={}},4273:function(s,d,t){var r=t(1079);s.exports=function(o){return r(o.length)}},5038:function(s,d,t){var r=t(7438),o=t(5872),n=t(1702),a=t(2553),i=t(1163).CONFIGURABLE,u=t(8369),c=t(7946),e=c.enforce,v=c.get,l=Object.defineProperty,h=a&&!r(function(){return l(function(){},"length",{value:8}).length!==8}),m=String(String).split("String"),y=s.exports=function(x,O,R){String(O).slice(0,7)==="Symbol("&&(O="["+String(O).replace(/^Symbol\(([^)]*)\)/,"$1")+"]"),R&&R.getter&&(O="get "+O),R&&R.setter&&(O="set "+O),(!n(x,"name")||i&&x.name!==O)&&(a?l(x,"name",{value:O,configurable:!0}):x.name=O),h&&R&&n(R,"arity")&&x.length!==R.arity&&l(x,"length",{value:R.arity});try{R&&n(R,"constructor")&&R.constructor?a&&l(x,"prototype",{writable:!1}):x.prototype&&(x.prototype=void 0)}catch{}var B=e(x);return n(B,"source")||(B.source=m.join(typeof O=="string"?O:"")),x};Function.prototype.toString=y(function(){return o(this)&&v(this).source||u(this)},"toString")},3026:function(s){var d=Math.ceil,t=Math.floor;s.exports=Math.trunc||function(o){var n=+o;return(n>0?t:d)(n)}},4002:function(s,d,t){var r=t(7636),o=t(5025),n=t(9100).f,a=t(4846).set,i=t(2998),u=t(1387),c=t(3770),e=t(5963),v=r.MutationObserver||r.WebKitMutationObserver,l=r.document,h=r.process,m=r.Promise,y=n(r,"queueMicrotask"),x=y&&y.value,O,R,B,w,N,C,T,P;x||(O=function(){var I,A;for(e&&(I=h.domain)&&I.exit();R;){A=R.fn,R=R.next;try{A()}catch(U){throw R?w():B=void 0,U}}B=void 0,I&&I.enter()},!i&&!e&&!c&&v&&l?(N=!0,C=l.createTextNode(""),new v(O).observe(C,{characterData:!0}),w=function(){C.data=N=!N}):!u&&m&&m.resolve?(T=m.resolve(void 0),T.constructor=m,P=o(T.then,T),w=function(){P(O)}):e?w=function(){h.nextTick(O)}:(a=o(a,r),w=function(){a(O)})),s.exports=x||function(I){var A={fn:I,next:void 0};B&&(B.next=A),R||(R=A,w()),B=A}},1096:function(s,d,t){"use strict";var r=t(9117),o=TypeError,n=function(a){var i,u;this.promise=new a(function(c,e){if(i!==void 0||u!==void 0)throw o("Bad Promise constructor");i=c,u=e}),this.resolve=r(i),this.reject=r(u)};s.exports.f=function(a){return new n(a)}},4232:function(s,d,t){var r=t(5173),o=TypeError;s.exports=function(n){if(r(n))throw o("The method doesn't accept regular expressions");return n}},2656:function(s,d,t){var r=t(7636),o=t(7438),n=t(5789),a=t(1430),i=t(6159).trim,u=t(1541),c=r.parseInt,e=r.Symbol,v=e&&e.iterator,l=/^[+-]?0x/i,h=n(l.exec),m=c(u+"08")!==8||c(u+"0x16")!==22||v&&!o(function(){c(Object(v))});s.exports=m?function(x,O){var R=i(a(x));return c(R,O>>>0||(h(l,R)?16:10))}:c},4268:function(s,d,t){"use strict";var r=t(2553),o=t(5789),n=t(5724),a=t(7438),i=t(4709),u=t(2032),c=t(2204),e=t(6680),v=t(7180),l=Object.assign,h=Object.defineProperty,m=o([].concat);s.exports=!l||a(function(){if(r&&l({b:1},l(h({},"a",{enumerable:!0,get:function(){h(this,"b",{value:3,enumerable:!1})}}),{b:2})).b!==1)return!0;var y={},x={},O=Symbol(),R="abcdefghijklmnopqrst";return y[O]=7,R.split("").forEach(function(B){x[B]=B}),l({},y)[O]!=7||i(l({},x)).join("")!=R})?function(x,O){for(var R=e(x),B=arguments.length,w=1,N=u.f,C=c.f;B>w;)for(var T=v(arguments[w++]),P=N?m(i(T),N(T)):i(T),I=P.length,A=0,U;I>A;)U=P[A++],(!r||n(C,T,U))&&(R[U]=T[U]);return R}:l},349:function(s,d,t){var r=t(7694),o=t(5970),n=t(7678),a=t(2208),i=t(9326),u=t(1226),c=t(3612),e=">",v="<",l="prototype",h="script",m=c("IE_PROTO"),y=function(){},x=function(N){return v+h+e+N+v+"/"+h+e},O=function(N){N.write(x("")),N.close();var C=N.parentWindow.Object;return N=null,C},R=function(){var N=u("iframe"),C="java"+h+":",T;return N.style.display="none",i.appendChild(N),N.src=String(C),T=N.contentWindow.document,T.open(),T.write(x("document.F=Object")),T.close(),T.F},B,w=function(){try{B=new ActiveXObject("htmlfile")}catch{}w=typeof document<"u"?document.domain&&B?O(B):R():O(B);for(var N=n.length;N--;)delete w[l][n[N]];return w()};a[m]=!0,s.exports=Object.create||function(C,T){var P;return C!==null?(y[l]=r(C),P=new y,y[l]=null,P[m]=C):P=w(),T===void 0?P:o.f(P,T)}},5970:function(s,d,t){var r=t(2553),o=t(4127),n=t(3486),a=t(7694),i=t(4712),u=t(4709);d.f=r&&!o?Object.defineProperties:function(e,v){a(e);for(var l=i(v),h=u(v),m=h.length,y=0,x;m>y;)n.f(e,x=h[y++],l[x]);return e}},3486:function(s,d,t){var r=t(2553),o=t(4658),n=t(4127),a=t(7694),i=t(2308),u=TypeError,c=Object.defineProperty,e=Object.getOwnPropertyDescriptor,v="enumerable",l="configurable",h="writable";d.f=r?n?function(y,x,O){if(a(y),x=i(x),a(O),typeof y=="function"&&x==="prototype"&&"value"in O&&h in O&&!O[h]){var R=e(y,x);R&&R[h]&&(y[x]=O.value,O={configurable:l in O?O[l]:R[l],enumerable:v in O?O[v]:R[v],writable:!1})}return c(y,x,O)}:c:function(y,x,O){if(a(y),x=i(x),a(O),o)try{return c(y,x,O)}catch{}if("get"in O||"set"in O)throw u("Accessors not supported");return"value"in O&&(y[x]=O.value),y}},9100:function(s,d,t){var r=t(2553),o=t(5724),n=t(2204),a=t(6247),i=t(4712),u=t(2308),c=t(1702),e=t(4658),v=Object.getOwnPropertyDescriptor;d.f=r?v:function(h,m){if(h=i(h),m=u(m),e)try{return v(h,m)}catch{}if(c(h,m))return a(!o(n.f,h,m),h[m])}},7233:function(s,d,t){var r=t(4661),o=t(4712),n=t(81).f,a=t(8236),i=typeof window=="object"&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],u=function(c){try{return n(c)}catch{return a(i)}};s.exports.f=function(e){return i&&r(e)=="Window"?u(e):n(o(e))}},81:function(s,d,t){var r=t(2095),o=t(7678),n=o.concat("length","prototype");d.f=Object.getOwnPropertyNames||function(i){return r(i,n)}},2032:function(s,d){d.f=Object.getOwnPropertySymbols},3510:function(s,d,t){var r=t(1702),o=t(5872),n=t(6680),a=t(3612),i=t(3556),u=a("IE_PROTO"),c=Object,e=c.prototype;s.exports=i?c.getPrototypeOf:function(v){var l=n(v);if(r(l,u))return l[u];var h=l.constructor;return o(h)&&l instanceof h?h.prototype:l instanceof c?e:null}},1363:function(s,d,t){var r=t(7438),o=t(1451),n=t(4661),a=t(2009),i=Object.isExtensible,u=r(function(){i(1)});s.exports=u||a?function(e){return!o(e)||a&&n(e)=="ArrayBuffer"?!1:i?i(e):!0}:i},3406:function(s,d,t){var r=t(5789);s.exports=r({}.isPrototypeOf)},2095:function(s,d,t){var r=t(5789),o=t(1702),n=t(4712),a=t(2102).indexOf,i=t(2208),u=r([].push);s.exports=function(c,e){var v=n(c),l=0,h=[],m;for(m in v)!o(i,m)&&o(v,m)&&u(h,m);for(;e.length>l;)o(v,m=e[l++])&&(~a(h,m)||u(h,m));return h}},4709:function(s,d,t){var r=t(2095),o=t(7678);s.exports=Object.keys||function(a){return r(a,o)}},2204:function(s,d){"use strict";var t={}.propertyIsEnumerable,r=Object.getOwnPropertyDescriptor,o=r&&!t.call({1:2},1);d.f=o?function(a){var i=r(this,a);return!!i&&i.enumerable}:t},3858:function(s,d,t){var r=t(5789),o=t(7694),n=t(8157);s.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var a=!1,i={},u;try{u=r(Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set),u(i,[]),a=i instanceof Array}catch{}return function(e,v){return o(e),n(v),a?u(e,v):e.__proto__=v,e}}():void 0)},2360:function(s,d,t){"use strict";var r=t(8517),o=t(3442);s.exports=r?{}.toString:function(){return"[object "+o(this)+"]"}},1587:function(s,d,t){var r=t(5724),o=t(5872),n=t(1451),a=TypeError;s.exports=function(i,u){var c,e;if(u==="string"&&o(c=i.toString)&&!n(e=r(c,i))||o(c=i.valueOf)&&!n(e=r(c,i))||u!=="string"&&o(c=i.toString)&&!n(e=r(c,i)))return e;throw a("Can't convert object to primitive value")}},700:function(s,d,t){var r=t(3360),o=t(5789),n=t(81),a=t(2032),i=t(7694),u=o([].concat);s.exports=r("Reflect","ownKeys")||function(e){var v=n.f(i(e)),l=a.f;return l?u(v,l(e)):v}},7788:function(s,d,t){var r=t(7636);s.exports=r},150:function(s){s.exports=function(d){try{return{error:!1,value:d()}}catch(t){return{error:!0,value:t}}}},7857:function(s,d,t){var r=t(7636),o=t(5137),n=t(5872),a=t(4237),i=t(8369),u=t(2414),c=t(9871),e=t(2343),v=t(5258),l=t(7985),h=o&&o.prototype,m=u("species"),y=!1,x=n(r.PromiseRejectionEvent),O=a("Promise",function(){var R=i(o),B=R!==String(o);if(!B&&l===66||v&&!(h.catch&&h.finally))return!0;if(!l||l<51||!/native code/.test(R)){var w=new o(function(T){T(1)}),N=function(T){T(function(){},function(){})},C=w.constructor={};if(C[m]=N,y=w.then(function(){})instanceof N,!y)return!0}return!B&&(c||e)&&!x});s.exports={CONSTRUCTOR:O,REJECTION_EVENT:x,SUBCLASSING:y}},5137:function(s,d,t){var r=t(7636);s.exports=r.Promise},8103:function(s,d,t){var r=t(7694),o=t(1451),n=t(1096);s.exports=function(a,i){if(r(a),o(i)&&i.constructor===a)return i;var u=n.f(a),c=u.resolve;return c(i),u.promise}},1928:function(s,d,t){var r=t(5137),o=t(7927),n=t(7857).CONSTRUCTOR;s.exports=n||!o(function(a){r.all(a).then(void 0,function(){})})},5188:function(s){var d=function(){this.head=null,this.tail=null};d.prototype={add:function(t){var r={item:t,next:null};this.head?this.tail.next=r:this.head=r,this.tail=r},get:function(){var t=this.head;if(t)return this.head=t.next,this.tail===t&&(this.tail=null),t.item}},s.exports=d},5533:function(s,d,t){var r=t(5724),o=t(7694),n=t(5872),a=t(4661),i=t(2458),u=TypeError;s.exports=function(c,e){var v=c.exec;if(n(v)){var l=r(v,c,e);return l!==null&&o(l),l}if(a(c)==="RegExp")return r(i,c,e);throw u("RegExp#exec called on incompatible receiver")}},2458:function(s,d,t){"use strict";var r=t(5724),o=t(5789),n=t(1430),a=t(3632),i=t(3964),u=t(5998),c=t(349),e=t(7946).get,v=t(9656),l=t(213),h=u("native-string-replace",String.prototype.replace),m=RegExp.prototype.exec,y=m,x=o("".charAt),O=o("".indexOf),R=o("".replace),B=o("".slice),w=function(){var P=/a/,I=/b*/g;return r(m,P,"a"),r(m,I,"a"),P.lastIndex!==0||I.lastIndex!==0}(),N=i.BROKEN_CARET,C=/()??/.exec("")[1]!==void 0,T=w||C||N||v||l;T&&(y=function(I){var A=this,U=e(A),H=n(I),Y=U.raw,rt,W,K,F,J,it,ot;if(Y)return Y.lastIndex=A.lastIndex,rt=r(y,Y,H),A.lastIndex=Y.lastIndex,rt;var G=U.groups,j=N&&A.sticky,V=r(a,A),tt=A.source,nt=0,at=H;if(j&&(V=R(V,"y",""),O(V,"g")===-1&&(V+="g"),at=B(H,A.lastIndex),A.lastIndex>0&&(!A.multiline||A.multiline&&x(H,A.lastIndex-1)!==` +`)&&(tt="(?: "+tt+")",at=" "+at,nt++),W=new RegExp("^(?:"+tt+")",V)),C&&(W=new RegExp("^"+tt+"$(?!\\s)",V)),w&&(K=A.lastIndex),F=r(m,j?W:A,at),j?F?(F.input=B(F.input,nt),F[0]=B(F[0],nt),F.index=A.lastIndex,A.lastIndex+=F[0].length):A.lastIndex=0:w&&F&&(A.lastIndex=A.global?F.index+F[0].length:K),C&&F&&F.length>1&&r(h,F[0],W,function(){for(J=1;Jb)","g");return a.exec("b").groups.a!=="b"||"b".replace(a,"$c")!=="bc"})},6953:function(s,d,t){var r=t(3330),o=TypeError;s.exports=function(n){if(r(n))throw o("Can't call method on "+n);return n}},3264:function(s,d,t){"use strict";var r=t(3360),o=t(3486),n=t(2414),a=t(2553),i=n("species");s.exports=function(u){var c=r(u),e=o.f;a&&c&&!c[i]&&e(c,i,{configurable:!0,get:function(){return this}})}},7718:function(s,d,t){var r=t(3486).f,o=t(1702),n=t(2414),a=n("toStringTag");s.exports=function(i,u,c){i&&!c&&(i=i.prototype),i&&!o(i,a)&&r(i,a,{configurable:!0,value:u})}},3612:function(s,d,t){var r=t(5998),o=t(6541),n=r("keys");s.exports=function(a){return n[a]||(n[a]=o(a))}},9562:function(s,d,t){var r=t(7636),o=t(3586),n="__core-js_shared__",a=r[n]||o(n,{});s.exports=a},5998:function(s,d,t){var r=t(5258),o=t(9562);(s.exports=function(n,a){return o[n]||(o[n]=a!==void 0?a:{})})("versions",[]).push({version:"3.26.0",mode:r?"pure":"global",copyright:"\xA9 2014-2022 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.26.0/LICENSE",source:"https://github.com/zloirock/core-js"})},3856:function(s,d,t){var r=t(7694),o=t(8757),n=t(3330),a=t(2414),i=a("species");s.exports=function(u,c){var e=r(u).constructor,v;return e===void 0||n(v=r(e)[i])?c:o(v)}},5128:function(s,d,t){var r=t(5789),o=t(2468),n=t(1430),a=t(6953),i=r("".charAt),u=r("".charCodeAt),c=r("".slice),e=function(v){return function(l,h){var m=n(a(l)),y=o(h),x=m.length,O,R;return y<0||y>=x?v?"":void 0:(O=u(m,y),O<55296||O>56319||y+1===x||(R=u(m,y+1))<56320||R>57343?v?i(m,y):O:v?c(m,y,y+2):(O-55296<<10)+(R-56320)+65536)}};s.exports={codeAt:e(!1),charAt:e(!0)}},3413:function(s,d,t){"use strict";var r=t(5789),o=2147483647,n=36,a=1,i=26,u=38,c=700,e=72,v=128,l="-",h=/[^\0-\u007E]/,m=/[.\u3002\uFF0E\uFF61]/g,y="Overflow: input needs wider integers to process",x=n-a,O=RangeError,R=r(m.exec),B=Math.floor,w=String.fromCharCode,N=r("".charCodeAt),C=r([].join),T=r([].push),P=r("".replace),I=r("".split),A=r("".toLowerCase),U=function(W){for(var K=[],F=0,J=W.length;F=55296&&it<=56319&&F>1,W+=B(W/K);W>x*i>>1;)W=B(W/x),J+=n;return B(J+(x+1)*W/(W+u))},rt=function(W){var K=[];W=U(W);var F=W.length,J=v,it=0,ot=e,G,j;for(G=0;G=J&&jB((o-it)/at))throw O(y);for(it+=(nt-J)*at,J=nt,G=0;Go)throw O(y);if(j==J){for(var St=it,vt=n;;){var At=vt<=ot?a:vt>=ot+i?i:vt-ot;if(St0?o(r(n),9007199254740991):0}},6680:function(s,d,t){var r=t(6953),o=Object;s.exports=function(n){return o(r(n))}},158:function(s,d,t){var r=t(5724),o=t(1451),n=t(2684),a=t(1309),i=t(1587),u=t(2414),c=TypeError,e=u("toPrimitive");s.exports=function(v,l){if(!o(v)||n(v))return v;var h=a(v,e),m;if(h){if(l===void 0&&(l="default"),m=r(h,v,l),!o(m)||n(m))return m;throw c("Can't convert object to primitive value")}return l===void 0&&(l="number"),i(v,l)}},2308:function(s,d,t){var r=t(158),o=t(2684);s.exports=function(n){var a=r(n,"string");return o(a)?a:a+""}},8517:function(s,d,t){var r=t(2414),o=r("toStringTag"),n={};n[o]="z",s.exports=String(n)==="[object z]"},1430:function(s,d,t){var r=t(3442),o=String;s.exports=function(n){if(r(n)==="Symbol")throw TypeError("Cannot convert a Symbol value to a string");return o(n)}},8738:function(s){var d=String;s.exports=function(t){try{return d(t)}catch{return"Object"}}},6541:function(s,d,t){var r=t(5789),o=0,n=Math.random(),a=r(1 .toString);s.exports=function(i){return"Symbol("+(i===void 0?"":i)+")_"+a(++o+n,36)}},4817:function(s,d,t){var r=t(7438),o=t(2414),n=t(5258),a=o("iterator");s.exports=!r(function(){var i=new URL("b?a=1&b=2&c=3","http://a"),u=i.searchParams,c="";return i.pathname="c%20d",u.forEach(function(e,v){u.delete("b"),c+=v+e}),n&&!i.toJSON||!u.sort||i.href!=="http://a/c%20d?a=1&c=3"||u.get("c")!=="3"||String(new URLSearchParams("?a=1"))!=="a=1"||!u[a]||new URL("https://a@b").username!=="a"||new URLSearchParams(new URLSearchParams("a=b")).get("a")!=="b"||new URL("http://\u0442\u0435\u0441\u0442").host!=="xn--e1aybc"||new URL("http://a#\u0431").hash!=="#%D0%B1"||c!=="a1c3"||new URL("http://x",void 0).host!=="x"})},5677:function(s,d,t){var r=t(5364);s.exports=r&&!Symbol.sham&&typeof Symbol.iterator=="symbol"},4127:function(s,d,t){var r=t(2553),o=t(7438);s.exports=r&&o(function(){return Object.defineProperty(function(){},"prototype",{value:42,writable:!1}).prototype!=42})},977:function(s){var d=TypeError;s.exports=function(t,r){if(t=51||!o(function(){var w=[];return w[y]=!1,w.concat()[0]!==w}),O=l("concat"),R=function(w){if(!a(w))return!1;var N=w[y];return N!==void 0?!!N:n(w)},B=!x||!O;r({target:"Array",proto:!0,arity:1,forced:B},{concat:function(N){var C=i(this),T=v(C,0),P=0,I,A,U,H,Y;for(I=-1,U=arguments.length;I1?arguments[1]:void 0)}})},969:function(s,d,t){"use strict";var r=t(6809),o=t(2580).findIndex,n=t(9950),a="findIndex",i=!0;a in[]&&Array(1)[a](function(){i=!1}),r({target:"Array",proto:!0,forced:i},{findIndex:function(c){return o(this,c,arguments.length>1?arguments[1]:void 0)}}),n(a)},9848:function(s,d,t){"use strict";var r=t(6809),o=t(2580).find,n=t(9950),a="find",i=!0;a in[]&&Array(1)[a](function(){i=!1}),r({target:"Array",proto:!0,forced:i},{find:function(c){return o(this,c,arguments.length>1?arguments[1]:void 0)}}),n(a)},551:function(s,d,t){var r=t(6809),o=t(1039),n=t(7927),a=!n(function(i){Array.from(i)});r({target:"Array",stat:!0,forced:a},{from:o})},2238:function(s,d,t){"use strict";var r=t(6809),o=t(2102).includes,n=t(7438),a=t(9950),i=n(function(){return!Array(1).includes()});r({target:"Array",proto:!0,forced:i},{includes:function(c){return o(this,c,arguments.length>1?arguments[1]:void 0)}}),a("includes")},8257:function(s,d,t){"use strict";var r=t(6809),o=t(5789),n=t(2102).indexOf,a=t(2905),i=o([].indexOf),u=!!i&&1/i([1],1,-0)<0,c=a("indexOf");r({target:"Array",proto:!0,forced:u||!c},{indexOf:function(v){var l=arguments.length>1?arguments[1]:void 0;return u?i(this,v,l)||0:n(this,v,l)}})},3949:function(s,d,t){"use strict";var r=t(4712),o=t(9950),n=t(8824),a=t(7946),i=t(3486).f,u=t(7341),c=t(2228),e=t(5258),v=t(2553),l="Array Iterator",h=a.set,m=a.getterFor(l);s.exports=u(Array,"Array",function(x,O){h(this,{type:l,target:r(x),index:0,kind:O})},function(){var x=m(this),O=x.target,R=x.kind,B=x.index++;return!O||B>=O.length?(x.target=void 0,c(void 0,!0)):R=="keys"?c(B,!1):R=="values"?c(O[B],!1):c([B,O[B]],!1)},"values");var y=n.Arguments=n.Array;if(o("keys"),o("values"),o("entries"),!e&&v&&y.name!=="values")try{i(y,"name",{value:"values"})}catch{}},1345:function(s,d,t){"use strict";var r=t(6809),o=t(2580).map,n=t(4574),a=n("map");r({target:"Array",proto:!0,forced:!a},{map:function(u){return o(this,u,arguments.length>1?arguments[1]:void 0)}})},825:function(s,d,t){"use strict";var r=t(6809),o=t(5729).left,n=t(2905),a=t(7985),i=t(5963),u=n("reduce"),c=!i&&a>79&&a<83;r({target:"Array",proto:!0,forced:!u||c},{reduce:function(v){var l=arguments.length;return o(this,v,l,l>1?arguments[1]:void 0)}})},6489:function(s,d,t){"use strict";var r=t(6809),o=t(5789),n=t(4747),a=o([].reverse),i=[1,2];r({target:"Array",proto:!0,forced:String(i)===String(i.reverse())},{reverse:function(){return n(this)&&(this.length=this.length),a(this)}})},9325:function(s,d,t){"use strict";var r=t(6809),o=t(4747),n=t(414),a=t(1451),i=t(4863),u=t(4273),c=t(4712),e=t(6133),v=t(2414),l=t(4574),h=t(1973),m=l("slice"),y=v("species"),x=Array,O=Math.max;r({target:"Array",proto:!0,forced:!m},{slice:function(B,w){var N=c(this),C=u(N),T=i(B,C),P=i(w===void 0?C:w,C),I,A,U;if(o(N)&&(I=N.constructor,n(I)&&(I===x||o(I.prototype))?I=void 0:a(I)&&(I=I[y],I===null&&(I=void 0)),I===x||I===void 0))return h(N,T,P);for(A=new(I===void 0?x:I)(O(P-T,0)),U=0;TN-I+P;U--)l(w,U-1)}else if(P>I)for(U=N-I;U>C;U--)H=U+I-1,Y=U+P-1,H in w?w[Y]=w[H]:l(w,Y);for(U=0;U2){if(K=R(K),F=P(K,0),F===43||F===45){if(J=P(K,2),J===88||J===120)return NaN}else if(F===48){switch(P(K,1)){case 66:case 98:it=2,ot=49;break;case 79:case 111:it=8,ot=55;break;default:return+K}for(G=T(K,2),j=G.length,V=0;Vot)return NaN;return parseInt(G,it)}}return+K};if(a(B,!w(" 0o1")||!w("0b1")||w("+0x1"))){for(var U=function(K){var F=arguments.length<1?0:w(I(K)),J=this;return e(N,J)&&h(function(){O(J)})?c(Object(F),J,U):F},H=r?m(w):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,isFinite,isInteger,isNaN,isSafeInteger,parseFloat,parseInt,fromString,range".split(","),Y=0,rt;H.length>Y;Y++)u(w,rt=H[Y])&&!u(U,rt)&&x(U,rt,y(w,rt));U.prototype=N,N.constructor=U,i(o,B,U,{constructor:!0})}},5072:function(s,d,t){var r=t(6809),o=t(4268);r({target:"Object",stat:!0,arity:2,forced:Object.assign!==o},{assign:o})},3569:function(s,d,t){var r=t(6809),o=t(2553),n=t(700),a=t(4712),i=t(9100),u=t(6133);r({target:"Object",stat:!0,sham:!o},{getOwnPropertyDescriptors:function(e){for(var v=a(e),l=i.f,h=n(v),m={},y=0,x,O;h.length>y;)O=l(v,x=h[y++]),O!==void 0&&u(m,x,O);return m}})},6542:function(s,d,t){var r=t(6809),o=t(5364),n=t(7438),a=t(2032),i=t(6680),u=!o||n(function(){a.f(1)});r({target:"Object",stat:!0,forced:u},{getOwnPropertySymbols:function(e){var v=a.f;return v?v(i(e)):[]}})},314:function(s,d,t){var r=t(8517),o=t(8905),n=t(2360);r||o(Object.prototype,"toString",n,{unsafe:!0})},9275:function(s,d,t){var r=t(6809),o=t(2656);r({global:!0,forced:parseInt!=o},{parseInt:o})},6356:function(s,d,t){"use strict";var r=t(6809),o=t(5724),n=t(9117),a=t(1096),i=t(150),u=t(5045),c=t(1928);r({target:"Promise",stat:!0,forced:c},{all:function(v){var l=this,h=a.f(l),m=h.resolve,y=h.reject,x=i(function(){var O=n(l.resolve),R=[],B=0,w=1;u(v,function(N){var C=B++,T=!1;w++,o(O,l,N).then(function(P){T||(T=!0,R[C]=P,--w||m(R))},y)}),--w||m(R)});return x.error&&y(x.value),h.promise}})},6592:function(s,d,t){"use strict";var r=t(6809),o=t(5258),n=t(7857).CONSTRUCTOR,a=t(5137),i=t(3360),u=t(5872),c=t(8905),e=a&&a.prototype;if(r({target:"Promise",proto:!0,forced:n,real:!0},{catch:function(l){return this.then(void 0,l)}}),!o&&u(a)){var v=i("Promise").prototype.catch;e.catch!==v&&c(e,"catch",v,{unsafe:!0})}},4871:function(s,d,t){"use strict";var r=t(6809),o=t(5258),n=t(5963),a=t(7636),i=t(5724),u=t(8905),c=t(3858),e=t(7718),v=t(3264),l=t(9117),h=t(5872),m=t(1451),y=t(8714),x=t(3856),O=t(4846).set,R=t(4002),B=t(3542),w=t(150),N=t(5188),C=t(7946),T=t(5137),P=t(7857),I=t(1096),A="Promise",U=P.CONSTRUCTOR,H=P.REJECTION_EVENT,Y=P.SUBCLASSING,rt=C.getterFor(A),W=C.set,K=T&&T.prototype,F=T,J=K,it=a.TypeError,ot=a.document,G=a.process,j=I.f,V=j,tt=!!(ot&&ot.createEvent&&a.dispatchEvent),nt="unhandledrejection",at="rejectionhandled",St=0,vt=1,At=2,Et=1,jt=2,bt,Lt,Dt,Zt,kt=function(st){var b;return m(st)&&h(b=st.then)?b:!1},qt=function(st,b){var et=b.value,Tt=b.state==vt,Pt=Tt?st.ok:st.fail,Rt=st.resolve,dt=st.reject,gt=st.domain,ht,_,lt;try{Pt?(Tt||(b.rejection===jt&&ae(b),b.rejection=Et),Pt===!0?ht=et:(gt&>.enter(),ht=Pt(et),gt&&(gt.exit(),lt=!0)),ht===st.promise?dt(it("Promise-chain cycle")):(_=kt(ht))?i(_,ht,Rt,dt):Rt(ht)):dt(et)}catch(pt){gt&&!lt&>.exit(),dt(pt)}},Gt=function(st,b){st.notified||(st.notified=!0,R(function(){for(var et=st.reactions,Tt;Tt=et.get();)qt(Tt,st);st.notified=!1,b&&!st.rejection&&ce(st)}))},Vt=function(st,b,et){var Tt,Pt;tt?(Tt=ot.createEvent("Event"),Tt.promise=b,Tt.reason=et,Tt.initEvent(st,!1,!0),a.dispatchEvent(Tt)):Tt={promise:b,reason:et},!H&&(Pt=a["on"+st])?Pt(Tt):st===nt&&B("Unhandled promise rejection",et)},ce=function(st){i(O,a,function(){var b=st.facade,et=st.value,Tt=ee(st),Pt;if(Tt&&(Pt=w(function(){n?G.emit("unhandledRejection",et,b):Vt(nt,b,et)}),st.rejection=n||ee(st)?jt:Et,Pt.error))throw Pt.value})},ee=function(st){return st.rejection!==Et&&!st.parent},ae=function(st){i(O,a,function(){var b=st.facade;n?G.emit("rejectionHandled",b):Vt(at,b,st.value)})},Mt=function(st,b,et){return function(Tt){st(b,Tt,et)}},Jt=function(st,b,et){st.done||(st.done=!0,et&&(st=et),st.value=b,st.state=At,Gt(st,!0))},re=function(st,b,et){if(!st.done){st.done=!0,et&&(st=et);try{if(st.facade===b)throw it("Promise can't be resolved itself");var Tt=kt(b);Tt?R(function(){var Pt={done:!1};try{i(Tt,b,Mt(re,Pt,st),Mt(Jt,Pt,st))}catch(Rt){Jt(Pt,Rt,st)}}):(st.value=b,st.state=vt,Gt(st,!1))}catch(Pt){Jt({done:!1},Pt,st)}}};if(U&&(F=function(b){y(this,J),l(b),i(bt,this);var et=rt(this);try{b(Mt(re,et),Mt(Jt,et))}catch(Tt){Jt(et,Tt)}},J=F.prototype,bt=function(b){W(this,{type:A,done:!1,notified:!1,parent:!1,reactions:new N,rejection:!1,state:St,value:void 0})},bt.prototype=u(J,"then",function(b,et){var Tt=rt(this),Pt=j(x(this,F));return Tt.parent=!0,Pt.ok=h(b)?b:!0,Pt.fail=h(et)&&et,Pt.domain=n?G.domain:void 0,Tt.state==St?Tt.reactions.add(Pt):R(function(){qt(Pt,Tt)}),Pt.promise}),Lt=function(){var st=new bt,b=rt(st);this.promise=st,this.resolve=Mt(re,b),this.reject=Mt(Jt,b)},I.f=j=function(st){return st===F||st===Dt?new Lt(st):V(st)},!o&&h(T)&&K!==Object.prototype)){Zt=K.then,Y||u(K,"then",function(b,et){var Tt=this;return new F(function(Pt,Rt){i(Zt,Tt,Pt,Rt)}).then(b,et)},{unsafe:!0});try{delete K.constructor}catch{}c&&c(K,J)}r({global:!0,constructor:!0,wrap:!0,forced:U},{Promise:F}),e(F,A,!1,!0),v(A)},136:function(s,d,t){"use strict";var r=t(6809),o=t(5258),n=t(5137),a=t(7438),i=t(3360),u=t(5872),c=t(3856),e=t(8103),v=t(8905),l=n&&n.prototype,h=!!n&&a(function(){l.finally.call({then:function(){}},function(){})});if(r({target:"Promise",proto:!0,real:!0,forced:h},{finally:function(y){var x=c(this,i("Promise")),O=u(y);return this.then(O?function(R){return e(x,y()).then(function(){return R})}:y,O?function(R){return e(x,y()).then(function(){throw R})}:y)}}),!o&&u(n)){var m=i("Promise").prototype.finally;l.finally!==m&&v(l,"finally",m,{unsafe:!0})}},2501:function(s,d,t){t(4871),t(6356),t(6592),t(4306),t(20),t(5359)},4306:function(s,d,t){"use strict";var r=t(6809),o=t(5724),n=t(9117),a=t(1096),i=t(150),u=t(5045),c=t(1928);r({target:"Promise",stat:!0,forced:c},{race:function(v){var l=this,h=a.f(l),m=h.reject,y=i(function(){var x=n(l.resolve);u(v,function(O){o(x,l,O).then(h.resolve,m)})});return y.error&&m(y.value),h.promise}})},20:function(s,d,t){"use strict";var r=t(6809),o=t(5724),n=t(1096),a=t(7857).CONSTRUCTOR;r({target:"Promise",stat:!0,forced:a},{reject:function(u){var c=n.f(this);return o(c.reject,void 0,u),c.promise}})},5359:function(s,d,t){"use strict";var r=t(6809),o=t(3360),n=t(5258),a=t(5137),i=t(7857).CONSTRUCTOR,u=t(8103),c=o("Promise"),e=n&&!i;r({target:"Promise",stat:!0,forced:n||i},{resolve:function(l){return u(e&&this===c?a:this,l)}})},1563:function(s,d,t){var r=t(6809);r({target:"Reflect",stat:!0},{has:function(n,a){return a in n}})},7364:function(s,d,t){"use strict";var r=t(6809),o=t(2458);r({target:"RegExp",proto:!0,forced:/./.exec!==o},{exec:o})},3692:function(s,d,t){"use strict";var r=t(1163).PROPER,o=t(8905),n=t(7694),a=t(1430),i=t(7438),u=t(6101),c="toString",e=RegExp.prototype,v=e[c],l=i(function(){return v.call({source:"a",flags:"b"})!="/a/b"}),h=r&&v.name!=c;(l||h)&&o(RegExp.prototype,c,function(){var y=n(this),x=a(y.source),O=a(u(y));return"/"+x+"/"+O},{unsafe:!0})},4504:function(s,d,t){"use strict";var r=t(6809),o=t(5789),n=t(4232),a=t(6953),i=t(1430),u=t(6965),c=o("".indexOf);r({target:"String",proto:!0,forced:!u("includes")},{includes:function(v){return!!~c(i(a(this)),i(n(v)),arguments.length>1?arguments[1]:void 0)}})},4527:function(s,d,t){"use strict";var r=t(5128).charAt,o=t(1430),n=t(7946),a=t(7341),i=t(2228),u="String Iterator",c=n.set,e=n.getterFor(u);a(String,"String",function(v){c(this,{type:u,string:o(v),index:0})},function(){var l=e(this),h=l.string,m=l.index,y;return m>=h.length?i(void 0,!0):(y=r(h,m),l.index+=y.length,i(y,!1))})},5752:function(s,d,t){"use strict";var r=t(5724),o=t(2367),n=t(7694),a=t(3330),i=t(1079),u=t(1430),c=t(6953),e=t(1309),v=t(9822),l=t(5533);o("match",function(h,m,y){return[function(O){var R=c(this),B=a(O)?void 0:e(O,h);return B?r(B,O,R):new RegExp(O)[h](u(R))},function(x){var O=n(this),R=u(x),B=y(m,O,R);if(B.done)return B.value;if(!O.global)return l(O,R);var w=O.unicode;O.lastIndex=0;for(var N=[],C=0,T;(T=l(O,R))!==null;){var P=u(T[0]);N[C]=P,P===""&&(O.lastIndex=v(R,i(O.lastIndex),w)),C++}return C===0?null:N}]})},8801:function(s,d,t){"use strict";var r=t(1434),o=t(5724),n=t(5789),a=t(2367),i=t(7438),u=t(7694),c=t(5872),e=t(3330),v=t(2468),l=t(1079),h=t(1430),m=t(6953),y=t(9822),x=t(1309),O=t(1045),R=t(5533),B=t(2414),w=B("replace"),N=Math.max,C=Math.min,T=n([].concat),P=n([].push),I=n("".indexOf),A=n("".slice),U=function(W){return W===void 0?W:String(W)},H=function(){return"a".replace(/./,"$0")==="$0"}(),Y=function(){return/./[w]?/./[w]("a","$0")==="":!1}(),rt=!i(function(){var W=/./;return W.exec=function(){var K=[];return K.groups={a:"7"},K},"".replace(W,"$")!=="7"});a("replace",function(W,K,F){var J=Y?"$":"$0";return[function(ot,G){var j=m(this),V=e(ot)?void 0:x(ot,w);return V?o(V,ot,j,G):o(K,h(j),ot,G)},function(it,ot){var G=u(this),j=h(it);if(typeof ot=="string"&&I(ot,J)===-1&&I(ot,"$<")===-1){var V=F(K,G,j,ot);if(V.done)return V.value}var tt=c(ot);tt||(ot=h(ot));var nt=G.global;if(nt){var at=G.unicode;G.lastIndex=0}for(var St=[];;){var vt=R(G,j);if(vt===null||(P(St,vt),!nt))break;var At=h(vt[0]);At===""&&(G.lastIndex=y(j,l(G.lastIndex),at))}for(var Et="",jt=0,bt=0;bt=jt&&(Et+=A(j,jt,Dt)+Vt,jt=Dt+Lt.length)}return Et+A(j,jt)}]},!rt||!H||Y)},5939:function(s,d,t){var r=t(3208);r("asyncIterator")},6788:function(s,d,t){"use strict";var r=t(6809),o=t(7636),n=t(5724),a=t(5789),i=t(5258),u=t(2553),c=t(5364),e=t(7438),v=t(1702),l=t(3406),h=t(7694),m=t(4712),y=t(2308),x=t(1430),O=t(6247),R=t(349),B=t(4709),w=t(81),N=t(7233),C=t(2032),T=t(9100),P=t(3486),I=t(5970),A=t(2204),U=t(8905),H=t(5998),Y=t(3612),rt=t(2208),W=t(6541),K=t(2414),F=t(8046),J=t(3208),it=t(7841),ot=t(7718),G=t(7946),j=t(2580).forEach,V=Y("hidden"),tt="Symbol",nt="prototype",at=G.set,St=G.getterFor(tt),vt=Object[nt],At=o.Symbol,Et=At&&At[nt],jt=o.TypeError,bt=o.QObject,Lt=T.f,Dt=P.f,Zt=N.f,kt=A.f,qt=a([].push),Gt=H("symbols"),Vt=H("op-symbols"),ce=H("wks"),ee=!bt||!bt[nt]||!bt[nt].findChild,ae=u&&e(function(){return R(Dt({},"a",{get:function(){return Dt(this,"a",{value:7}).a}})).a!=7})?function(Rt,dt,gt){var ht=Lt(vt,dt);ht&&delete vt[dt],Dt(Rt,dt,gt),ht&&Rt!==vt&&Dt(vt,dt,ht)}:Dt,Mt=function(Rt,dt){var gt=Gt[Rt]=R(Et);return at(gt,{type:tt,tag:Rt,description:dt}),u||(gt.description=dt),gt},Jt=function(dt,gt,ht){dt===vt&&Jt(Vt,gt,ht),h(dt);var _=y(gt);return h(ht),v(Gt,_)?(ht.enumerable?(v(dt,V)&&dt[V][_]&&(dt[V][_]=!1),ht=R(ht,{enumerable:O(0,!1)})):(v(dt,V)||Dt(dt,V,O(1,{})),dt[V][_]=!0),ae(dt,_,ht)):Dt(dt,_,ht)},re=function(dt,gt){h(dt);var ht=m(gt),_=B(ht).concat(Pt(ht));return j(_,function(lt){(!u||n(b,ht,lt))&&Jt(dt,lt,ht[lt])}),dt},st=function(dt,gt){return gt===void 0?R(dt):re(R(dt),gt)},b=function(dt){var gt=y(dt),ht=n(kt,this,gt);return this===vt&&v(Gt,gt)&&!v(Vt,gt)?!1:ht||!v(this,gt)||!v(Gt,gt)||v(this,V)&&this[V][gt]?ht:!0},et=function(dt,gt){var ht=m(dt),_=y(gt);if(!(ht===vt&&v(Gt,_)&&!v(Vt,_))){var lt=Lt(ht,_);return lt&&v(Gt,_)&&!(v(ht,V)&&ht[V][_])&&(lt.enumerable=!0),lt}},Tt=function(dt){var gt=Zt(m(dt)),ht=[];return j(gt,function(_){!v(Gt,_)&&!v(rt,_)&&qt(ht,_)}),ht},Pt=function(Rt){var dt=Rt===vt,gt=Zt(dt?Vt:m(Rt)),ht=[];return j(gt,function(_){v(Gt,_)&&(!dt||v(vt,_))&&qt(ht,Gt[_])}),ht};c||(At=function(){if(l(Et,this))throw jt("Symbol is not a constructor");var dt=!arguments.length||arguments[0]===void 0?void 0:x(arguments[0]),gt=W(dt),ht=function(_){this===vt&&n(ht,Vt,_),v(this,V)&&v(this[V],gt)&&(this[V][gt]=!1),ae(this,gt,O(1,_))};return u&&ee&&ae(vt,gt,{configurable:!0,set:ht}),Mt(gt,dt)},Et=At[nt],U(Et,"toString",function(){return St(this).tag}),U(At,"withoutSetter",function(Rt){return Mt(W(Rt),Rt)}),A.f=b,P.f=Jt,I.f=re,T.f=et,w.f=N.f=Tt,C.f=Pt,F.f=function(Rt){return Mt(K(Rt),Rt)},u&&(Dt(Et,"description",{configurable:!0,get:function(){return St(this).description}}),i||U(vt,"propertyIsEnumerable",b,{unsafe:!0}))),r({global:!0,constructor:!0,wrap:!0,forced:!c,sham:!c},{Symbol:At}),j(B(ce),function(Rt){J(Rt)}),r({target:tt,stat:!0,forced:!c},{useSetter:function(){ee=!0},useSimple:function(){ee=!1}}),r({target:"Object",stat:!0,forced:!c,sham:!u},{create:st,defineProperty:Jt,defineProperties:re,getOwnPropertyDescriptor:et}),r({target:"Object",stat:!0,forced:!c},{getOwnPropertyNames:Tt}),it(),ot(At,tt),rt[V]=!0},6882:function(s,d,t){"use strict";var r=t(6809),o=t(2553),n=t(7636),a=t(5789),i=t(1702),u=t(5872),c=t(3406),e=t(1430),v=t(3486).f,l=t(1413),h=n.Symbol,m=h&&h.prototype;if(o&&u(h)&&(!("description"in m)||h().description!==void 0)){var y={},x=function(){var P=arguments.length<1||arguments[0]===void 0?void 0:e(arguments[0]),I=c(m,this)?new h(P):P===void 0?h():h(P);return P===""&&(y[I]=!0),I};l(x,h),x.prototype=m,m.constructor=x;var O=String(h("test"))=="Symbol(test)",R=a(m.valueOf),B=a(m.toString),w=/^Symbol\((.*)\)[^)]+$/,N=a("".replace),C=a("".slice);v(m,"description",{configurable:!0,get:function(){var P=R(this);if(i(y,P))return"";var I=B(P),A=O?C(I,7,-1):N(I,w,"$1");return A===""?void 0:A}}),r({global:!0,constructor:!0,forced:!0},{Symbol:x})}},5015:function(s,d,t){var r=t(6809),o=t(3360),n=t(1702),a=t(1430),i=t(5998),u=t(3973),c=i("string-to-symbol-registry"),e=i("symbol-to-string-registry");r({target:"Symbol",stat:!0,forced:!u},{for:function(v){var l=a(v);if(n(c,l))return c[l];var h=o("Symbol")(l);return c[l]=h,e[h]=l,h}})},5794:function(s,d,t){t(6788),t(5015),t(8041),t(3907),t(6542)},8041:function(s,d,t){var r=t(6809),o=t(1702),n=t(2684),a=t(8738),i=t(5998),u=t(3973),c=i("symbol-to-string-registry");r({target:"Symbol",stat:!0,forced:!u},{keyFor:function(v){if(!n(v))throw TypeError(a(v)+" is not a symbol");if(o(c,v))return c[v]}})},8191:function(s,d,t){var r=t(3208),o=t(7841);r("toPrimitive"),o()},9692:function(s,d,t){var r=t(3360),o=t(3208),n=t(7718);o("toStringTag"),n(r("Symbol"),"Symbol")},8567:function(s,d,t){"use strict";var r=t(7636),o=t(5789),n=t(1372),a=t(6106),i=t(4267),u=t(1940),c=t(1451),e=t(1363),v=t(7946).enforce,l=t(1125),h=!r.ActiveXObject&&"ActiveXObject"in r,m,y=function(C){return function(){return C(this,arguments.length?arguments[0]:void 0)}},x=i("WeakMap",y,u);if(l&&h){m=u.getConstructor(y,"WeakMap",!0),a.enable();var O=x.prototype,R=o(O.delete),B=o(O.has),w=o(O.get),N=o(O.set);n(O,{delete:function(C){if(c(C)&&!e(C)){var T=v(this);return T.frozen||(T.frozen=new m),R(this,C)||T.frozen.delete(C)}return R(this,C)},has:function(T){if(c(T)&&!e(T)){var P=v(this);return P.frozen||(P.frozen=new m),B(this,T)||P.frozen.has(T)}return B(this,T)},get:function(T){if(c(T)&&!e(T)){var P=v(this);return P.frozen||(P.frozen=new m),B(this,T)?w(this,T):P.frozen.get(T)}return w(this,T)},set:function(T,P){if(c(T)&&!e(T)){var I=v(this);I.frozen||(I.frozen=new m),B(this,T)?N(this,T,P):I.frozen.set(T,P)}else N(this,T,P);return this}})}},517:function(s,d,t){t(8567)},7495:function(s,d,t){t(710)},5095:function(s,d,t){var r=t(7636),o=t(625),n=t(3427),a=t(248),i=t(9316),u=function(e){if(e&&e.forEach!==a)try{i(e,"forEach",a)}catch{e.forEach=a}};for(var c in o)o[c]&&u(r[c]&&r[c].prototype);u(n)},982:function(s,d,t){var r=t(7636),o=t(625),n=t(3427),a=t(3949),i=t(9316),u=t(2414),c=u("iterator"),e=u("toStringTag"),v=a.values,l=function(m,y){if(m){if(m[c]!==v)try{i(m,c,v)}catch{m[c]=v}if(m[e]||i(m,e,y),o[y]){for(var x in a)if(m[x]!==a[x])try{i(m,x,a[x])}catch{m[x]=a[x]}}}};for(var h in o)l(r[h]&&r[h].prototype,h);l(n,"DOMTokenList")},3955:function(s,d,t){"use strict";t(3949);var r=t(6809),o=t(7636),n=t(5724),a=t(5789),i=t(2553),u=t(4817),c=t(8905),e=t(1372),v=t(7718),l=t(8411),h=t(7946),m=t(8714),y=t(5872),x=t(1702),O=t(5025),R=t(3442),B=t(7694),w=t(1451),N=t(1430),C=t(349),T=t(6247),P=t(7106),I=t(3726),A=t(977),U=t(2414),H=t(8619),Y=U("iterator"),rt="URLSearchParams",W=rt+"Iterator",K=h.set,F=h.getterFor(rt),J=h.getterFor(W),it=Object.getOwnPropertyDescriptor,ot=function(_){if(!i)return o[_];var lt=it(o,_);return lt&<.value},G=ot("fetch"),j=ot("Request"),V=ot("Headers"),tt=j&&j.prototype,nt=V&&V.prototype,at=o.RegExp,St=o.TypeError,vt=o.decodeURIComponent,At=o.encodeURIComponent,Et=a("".charAt),jt=a([].join),bt=a([].push),Lt=a("".replace),Dt=a([].shift),Zt=a([].splice),kt=a("".split),qt=a("".slice),Gt=/\+/g,Vt=Array(4),ce=function(_){return Vt[_-1]||(Vt[_-1]=at("((?:%[\\da-f]{2}){"+_+"})","gi"))},ee=function(_){try{return vt(_)}catch{return _}},ae=function(_){var lt=Lt(_,Gt," "),pt=4;try{return vt(lt)}catch{for(;pt;)lt=Lt(lt,ce(pt--),ee);return lt}},Mt=/[!'()~]|%20/g,Jt={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+"},re=function(_){return Jt[_]},st=function(_){return Lt(At(_),Mt,re)},b=l(function(lt,pt){K(this,{type:W,iterator:P(F(lt).entries),kind:pt})},"Iterator",function(){var lt=J(this),pt=lt.kind,It=lt.iterator.next(),Ot=It.value;return It.done||(It.value=pt==="keys"?Ot.key:pt==="values"?Ot.value:[Ot.key,Ot.value]),It},!0),et=function(_){this.entries=[],this.url=null,_!==void 0&&(w(_)?this.parseObject(_):this.parseQuery(typeof _=="string"?Et(_,0)==="?"?qt(_,1):_:N(_)))};et.prototype={type:rt,bindURL:function(_){this.url=_,this.update()},parseObject:function(_){var lt=I(_),pt,It,Ot,wt,se,ue,ne;if(lt)for(pt=P(_,lt),It=pt.next;!(Ot=n(It,pt)).done;){if(wt=P(B(Ot.value)),se=wt.next,(ue=n(se,wt)).done||(ne=n(se,wt)).done||!n(se,wt).done)throw St("Expected sequence with length 2");bt(this.entries,{key:N(ue.value),value:N(ne.value)})}else for(var oe in _)x(_,oe)&&bt(this.entries,{key:oe,value:N(_[oe])})},parseQuery:function(_){if(_)for(var lt=kt(_,"&"),pt=0,It,Ot;pt0?arguments[0]:void 0;K(this,new et(lt))},Pt=Tt.prototype;if(e(Pt,{append:function(lt,pt){A(arguments.length,2);var It=F(this);bt(It.entries,{key:N(lt),value:N(pt)}),It.updateURL()},delete:function(_){A(arguments.length,1);for(var lt=F(this),pt=lt.entries,It=N(_),Ot=0;OtIt.key?1:-1}),lt.updateURL()},forEach:function(lt){for(var pt=F(this).entries,It=O(lt,arguments.length>1?arguments[1]:void 0),Ot=0,wt;Ot1?gt(arguments[1]):{})}}),y(j)){var ht=function(lt){return m(this,tt),new j(lt,arguments.length>1?gt(arguments[1]):{})};tt.constructor=ht,ht.prototype=tt,r({global:!0,constructor:!0,dontCallGetSet:!0,forced:!0},{Request:ht})}}s.exports={URLSearchParams:Tt,getState:F}},310:function(s,d,t){t(3955)},4e3:function(s,d,t){"use strict";t(4527);var r=t(6809),o=t(2553),n=t(4817),a=t(7636),i=t(5025),u=t(5789),c=t(8905),e=t(809),v=t(8714),l=t(1702),h=t(4268),m=t(1039),y=t(8236),x=t(5128).codeAt,O=t(3413),R=t(1430),B=t(7718),w=t(977),N=t(3955),C=t(7946),T=C.set,P=C.getterFor("URL"),I=N.URLSearchParams,A=N.getState,U=a.URL,H=a.TypeError,Y=a.parseInt,rt=Math.floor,W=Math.pow,K=u("".charAt),F=u(/./.exec),J=u([].join),it=u(1 .toString),ot=u([].pop),G=u([].push),j=u("".replace),V=u([].shift),tt=u("".split),nt=u("".slice),at=u("".toLowerCase),St=u([].unshift),vt="Invalid authority",At="Invalid scheme",Et="Invalid host",jt="Invalid port",bt=/[a-z]/i,Lt=/[\d+-.a-z]/i,Dt=/\d/,Zt=/^0x/i,kt=/^[0-7]+$/,qt=/^\d+$/,Gt=/^[\da-f]+$/i,Vt=/[\0\t\n\r #%/:<>?@[\\\]^|]/,ce=/[\0\t\n\r #/:<>?@[\\\]^|]/,ee=/^[\u0000-\u0020]+|[\u0000-\u0020]+$/g,ae=/[\t\n\r]/g,Mt,Jt=function($){var Q=tt($,"."),z,D,Z,xt,ct,$t,Bt;if(Q.length&&Q[Q.length-1]==""&&Q.length--,z=Q.length,z>4)return $;for(D=[],Z=0;Z1&&K(xt,0)=="0"&&(ct=F(Zt,xt)?16:8,xt=nt(xt,ct==8?1:2)),xt==="")$t=0;else{if(!F(ct==10?qt:ct==8?kt:Gt,xt))return $;$t=Y(xt,ct)}G(D,$t)}for(Z=0;Z=W(256,5-z))return null}else if($t>255)return null;for(Bt=ot(D),Z=0;Z6))return;for($t=0;Ut();){if(Bt=null,$t>0)if(Ut()=="."&&$t<4)Z++;else return;if(!F(Dt,Ut()))return;for(;F(Dt,Ut());){if(Nt=Y(Ut(),10),Bt===null)Bt=Nt;else{if(Bt==0)return;Bt=Bt*10+Nt}if(Bt>255)return;Z++}Q[z]=Q[z]*256+Bt,$t++,($t==2||$t==4)&&z++}if($t!=4)return;break}else if(Ut()==":"){if(Z++,!Ut())return}else if(Ut())return;Q[z++]=xt}if(D!==null)for(Qt=z-D,z=7;z!=0&&Qt>0;)k=Q[z],Q[z--]=Q[D+Qt-1],Q[D+--Qt]=k;else if(z!=8)return;return Q},st=function($){for(var Q=null,z=1,D=null,Z=0,xt=0;xt<8;xt++)$[xt]!==0?(Z>z&&(Q=D,z=Z),D=null,Z=0):(D===null&&(D=xt),++Z);return Z>z&&(Q=D,z=Z),Q},b=function($){var Q,z,D,Z;if(typeof $=="number"){for(Q=[],z=0;z<4;z++)St(Q,$%256),$=rt($/256);return J(Q,".")}else if(typeof $=="object"){for(Q="",D=st($),z=0;z<8;z++)Z&&$[z]===0||(Z&&(Z=!1),D===z?(Q+=z?":":"::",Z=!0):(Q+=it($[z],16),z<7&&(Q+=":")));return"["+Q+"]"}return $},et={},Tt=h({},et,{" ":1,'"':1,"<":1,">":1,"`":1}),Pt=h({},Tt,{"#":1,"?":1,"{":1,"}":1}),Rt=h({},Pt,{"/":1,":":1,";":1,"=":1,"@":1,"[":1,"\\":1,"]":1,"^":1,"|":1}),dt=function($,Q){var z=x($,0);return z>32&&z<127&&!l(Q,$)?$:encodeURIComponent($)},gt={ftp:21,file:null,http:80,https:443,ws:80,wss:443},ht=function($,Q){var z;return $.length==2&&F(bt,K($,0))&&((z=K($,1))==":"||!Q&&z=="|")},_=function($){var Q;return $.length>1&&ht(nt($,0,2))&&($.length==2||(Q=K($,2))==="/"||Q==="\\"||Q==="?"||Q==="#")},lt=function($){return $==="."||at($)==="%2e"},pt=function($){return $=at($),$===".."||$==="%2e."||$===".%2e"||$==="%2e%2e"},It={},Ot={},wt={},se={},ue={},ne={},oe={},Re={},Oe={},Ee={},Ae={},Ce={},xe={},be={},De={},Ne={},pe={},Ht={},we={},de={},le={},Ie=function($,Q,z){var D=R($),Z,xt,ct;if(Q){if(xt=this.parse(D),xt)throw H(xt);this.searchParams=null}else{if(z!==void 0&&(Z=new Ie(z,!0)),xt=this.parse(D,null,Z),xt)throw H(xt);ct=A(new I),ct.bindURL(this),this.searchParams=ct}};Ie.prototype={type:"URL",parse:function($,Q,z){var D=this,Z=Q||It,xt=0,ct="",$t=!1,Bt=!1,Nt=!1,Qt,k,Ut,ie;for($=R($),Q||(D.scheme="",D.username="",D.password="",D.host=null,D.port=null,D.path=[],D.query=null,D.fragment=null,D.cannotBeABaseURL=!1,$=j($,ee,"")),$=j($,ae,""),Qt=m($);xt<=Qt.length;){switch(k=Qt[xt],Z){case It:if(k&&F(bt,k))ct+=at(k),Z=Ot;else{if(Q)return At;Z=wt;continue}break;case Ot:if(k&&(F(Lt,k)||k=="+"||k=="-"||k=="."))ct+=at(k);else if(k==":"){if(Q&&(D.isSpecial()!=l(gt,ct)||ct=="file"&&(D.includesCredentials()||D.port!==null)||D.scheme=="file"&&!D.host))return;if(D.scheme=ct,Q){D.isSpecial()&>[D.scheme]==D.port&&(D.port=null);return}ct="",D.scheme=="file"?Z=be:D.isSpecial()&&z&&z.scheme==D.scheme?Z=se:D.isSpecial()?Z=Re:Qt[xt+1]=="/"?(Z=ue,xt++):(D.cannotBeABaseURL=!0,G(D.path,""),Z=we)}else{if(Q)return At;ct="",Z=wt,xt=0;continue}break;case wt:if(!z||z.cannotBeABaseURL&&k!="#")return At;if(z.cannotBeABaseURL&&k=="#"){D.scheme=z.scheme,D.path=y(z.path),D.query=z.query,D.fragment="",D.cannotBeABaseURL=!0,Z=le;break}Z=z.scheme=="file"?be:ne;continue;case se:if(k=="/"&&Qt[xt+1]=="/")Z=Oe,xt++;else{Z=ne;continue}break;case ue:if(k=="/"){Z=Ee;break}else{Z=Ht;continue}case ne:if(D.scheme=z.scheme,k==Mt)D.username=z.username,D.password=z.password,D.host=z.host,D.port=z.port,D.path=y(z.path),D.query=z.query;else if(k=="/"||k=="\\"&&D.isSpecial())Z=oe;else if(k=="?")D.username=z.username,D.password=z.password,D.host=z.host,D.port=z.port,D.path=y(z.path),D.query="",Z=de;else if(k=="#")D.username=z.username,D.password=z.password,D.host=z.host,D.port=z.port,D.path=y(z.path),D.query=z.query,D.fragment="",Z=le;else{D.username=z.username,D.password=z.password,D.host=z.host,D.port=z.port,D.path=y(z.path),D.path.length--,Z=Ht;continue}break;case oe:if(D.isSpecial()&&(k=="/"||k=="\\"))Z=Oe;else if(k=="/")Z=Ee;else{D.username=z.username,D.password=z.password,D.host=z.host,D.port=z.port,Z=Ht;continue}break;case Re:if(Z=Oe,k!="/"||K(ct,xt+1)!="/")continue;xt++;break;case Oe:if(k!="/"&&k!="\\"){Z=Ee;continue}break;case Ee:if(k=="@"){$t&&(ct="%40"+ct),$t=!0,Ut=m(ct);for(var je=0;je65535)return jt;D.port=D.isSpecial()&&me===gt[D.scheme]?null:me,ct=""}if(Q)return;Z=pe;continue}else return jt;break;case be:if(D.scheme="file",k=="/"||k=="\\")Z=De;else if(z&&z.scheme=="file")if(k==Mt)D.host=z.host,D.path=y(z.path),D.query=z.query;else if(k=="?")D.host=z.host,D.path=y(z.path),D.query="",Z=de;else if(k=="#")D.host=z.host,D.path=y(z.path),D.query=z.query,D.fragment="",Z=le;else{_(J(y(Qt,xt),""))||(D.host=z.host,D.path=y(z.path),D.shortenPath()),Z=Ht;continue}else{Z=Ht;continue}break;case De:if(k=="/"||k=="\\"){Z=Ne;break}z&&z.scheme=="file"&&!_(J(y(Qt,xt),""))&&(ht(z.path[0],!0)?G(D.path,z.path[0]):D.host=z.host),Z=Ht;continue;case Ne:if(k==Mt||k=="/"||k=="\\"||k=="?"||k=="#"){if(!Q&&ht(ct))Z=Ht;else if(ct==""){if(D.host="",Q)return;Z=pe}else{if(ie=D.parseHost(ct),ie)return ie;if(D.host=="localhost"&&(D.host=""),Q)return;ct="",Z=pe}continue}else ct+=k;break;case pe:if(D.isSpecial()){if(Z=Ht,k!="/"&&k!="\\")continue}else if(!Q&&k=="?")D.query="",Z=de;else if(!Q&&k=="#")D.fragment="",Z=le;else if(k!=Mt&&(Z=Ht,k!="/"))continue;break;case Ht:if(k==Mt||k=="/"||k=="\\"&&D.isSpecial()||!Q&&(k=="?"||k=="#")){if(pt(ct)?(D.shortenPath(),k!="/"&&!(k=="\\"&&D.isSpecial())&&G(D.path,"")):lt(ct)?k!="/"&&!(k=="\\"&&D.isSpecial())&&G(D.path,""):(D.scheme=="file"&&!D.path.length&&ht(ct)&&(D.host&&(D.host=""),ct=K(ct,0)+":"),G(D.path,ct)),ct="",D.scheme=="file"&&(k==Mt||k=="?"||k=="#"))for(;D.path.length>1&&D.path[0]==="";)V(D.path);k=="?"?(D.query="",Z=de):k=="#"&&(D.fragment="",Z=le)}else ct+=dt(k,Pt);break;case we:k=="?"?(D.query="",Z=de):k=="#"?(D.fragment="",Z=le):k!=Mt&&(D.path[0]+=dt(k,et));break;case de:!Q&&k=="#"?(D.fragment="",Z=le):k!=Mt&&(k=="'"&&D.isSpecial()?D.query+="%27":k=="#"?D.query+="%23":D.query+=dt(k,et));break;case le:k!=Mt&&(D.fragment+=dt(k,Tt));break}xt++}},parseHost:function($){var Q,z,D;if(K($,0)=="["){if(K($,$.length-1)!="]"||(Q=re(nt($,1,-1)),!Q))return Et;this.host=Q}else if(this.isSpecial()){if($=O($),F(Vt,$)||(Q=Jt($),Q===null))return Et;this.host=Q}else{if(F(ce,$))return Et;for(Q="",z=m($),D=0;D1?arguments[1]:void 0,Z=T(z,new Ie(Q,!1,D));o||(z.href=Z.serialize(),z.origin=Z.getOrigin(),z.protocol=Z.getProtocol(),z.username=Z.getUsername(),z.password=Z.getPassword(),z.host=Z.getHost(),z.hostname=Z.getHostname(),z.port=Z.getPort(),z.pathname=Z.getPathname(),z.search=Z.getSearch(),z.searchParams=Z.getSearchParams(),z.hash=Z.getHash())},Yt=he.prototype,Xt=function($,Q){return{get:function(){return P(this)[$]()},set:Q&&function(z){return P(this)[Q](z)},configurable:!0,enumerable:!0}};if(o&&(e(Yt,"href",Xt("serialize","setHref")),e(Yt,"origin",Xt("getOrigin")),e(Yt,"protocol",Xt("getProtocol","setProtocol")),e(Yt,"username",Xt("getUsername","setUsername")),e(Yt,"password",Xt("getPassword","setPassword")),e(Yt,"host",Xt("getHost","setHost")),e(Yt,"hostname",Xt("getHostname","setHostname")),e(Yt,"port",Xt("getPort","setPort")),e(Yt,"pathname",Xt("getPathname","setPathname")),e(Yt,"search",Xt("getSearch","setSearch")),e(Yt,"searchParams",Xt("getSearchParams")),e(Yt,"hash",Xt("getHash","setHash"))),c(Yt,"toJSON",function(){return P(this).serialize()},{enumerable:!0}),c(Yt,"toString",function(){return P(this).serialize()},{enumerable:!0}),U){var Ue=U.createObjectURL,Be=U.revokeObjectURL;Ue&&c(he,"createObjectURL",i(Ue,U)),Be&&c(he,"revokeObjectURL",i(Be,U))}B(he,"URL"),r({global:!0,constructor:!0,forced:!n,sham:!o},{URL:he})},7113:function(s,d,t){t(4e3)},2217:function(s,d,t){"use strict";var r=t(6809),o=t(5724);r({target:"URL",proto:!0,enumerable:!0},{toJSON:function(){return o(URL.prototype.toString,this)}})},4984:function(s,d,t){t(5794),t(6882),t(5939),t(9692),t(3949),t(6489),t(9325),t(6254),t(8242),t(314),t(2501),t(7495),t(5095),t(982);var r=function(o){"use strict";var n=Object.prototype,a=n.hasOwnProperty,i=Object.defineProperty||function(G,j,V){G[j]=V.value},u,c=typeof Symbol=="function"?Symbol:{},e=c.iterator||"@@iterator",v=c.asyncIterator||"@@asyncIterator",l=c.toStringTag||"@@toStringTag";function h(G,j,V){return Object.defineProperty(G,j,{value:V,enumerable:!0,configurable:!0,writable:!0}),G[j]}try{h({},"")}catch{h=function(V,tt,nt){return V[tt]=nt}}function m(G,j,V,tt){var nt=j&&j.prototype instanceof N?j:N,at=Object.create(nt.prototype),St=new J(tt||[]);return i(at,"_invoke",{value:rt(G,V,St)}),at}o.wrap=m;function y(G,j,V){try{return{type:"normal",arg:G.call(j,V)}}catch(tt){return{type:"throw",arg:tt}}}var x="suspendedStart",O="suspendedYield",R="executing",B="completed",w={};function N(){}function C(){}function T(){}var P={};h(P,e,function(){return this});var I=Object.getPrototypeOf,A=I&&I(I(it([])));A&&A!==n&&a.call(A,e)&&(P=A);var U=T.prototype=N.prototype=Object.create(P);C.prototype=T,i(U,"constructor",{value:T,configurable:!0}),i(T,"constructor",{value:C,configurable:!0}),C.displayName=h(T,l,"GeneratorFunction");function H(G){["next","throw","return"].forEach(function(j){h(G,j,function(V){return this._invoke(j,V)})})}o.isGeneratorFunction=function(G){var j=typeof G=="function"&&G.constructor;return j?j===C||(j.displayName||j.name)==="GeneratorFunction":!1},o.mark=function(G){return Object.setPrototypeOf?Object.setPrototypeOf(G,T):(G.__proto__=T,h(G,l,"GeneratorFunction")),G.prototype=Object.create(U),G},o.awrap=function(G){return{__await:G}};function Y(G,j){function V(at,St,vt,At){var Et=y(G[at],G,St);if(Et.type==="throw")At(Et.arg);else{var jt=Et.arg,bt=jt.value;return bt&&typeof bt=="object"&&a.call(bt,"__await")?j.resolve(bt.__await).then(function(Lt){V("next",Lt,vt,At)},function(Lt){V("throw",Lt,vt,At)}):j.resolve(bt).then(function(Lt){jt.value=Lt,vt(jt)},function(Lt){return V("throw",Lt,vt,At)})}}var tt;function nt(at,St){function vt(){return new j(function(At,Et){V(at,St,At,Et)})}return tt=tt?tt.then(vt,vt):vt()}i(this,"_invoke",{value:nt})}H(Y.prototype),h(Y.prototype,v,function(){return this}),o.AsyncIterator=Y,o.async=function(G,j,V,tt,nt){nt===void 0&&(nt=Promise);var at=new Y(m(G,j,V,tt),nt);return o.isGeneratorFunction(j)?at:at.next().then(function(St){return St.done?St.value:at.next()})};function rt(G,j,V){var tt=x;return function(at,St){if(tt===R)throw new Error("Generator is already running");if(tt===B){if(at==="throw")throw St;return ot()}for(V.method=at,V.arg=St;;){var vt=V.delegate;if(vt){var At=W(vt,V);if(At){if(At===w)continue;return At}}if(V.method==="next")V.sent=V._sent=V.arg;else if(V.method==="throw"){if(tt===x)throw tt=B,V.arg;V.dispatchException(V.arg)}else V.method==="return"&&V.abrupt("return",V.arg);tt=R;var Et=y(G,j,V);if(Et.type==="normal"){if(tt=V.done?B:O,Et.arg===w)continue;return{value:Et.arg,done:V.done}}else Et.type==="throw"&&(tt=B,V.method="throw",V.arg=Et.arg)}}}function W(G,j){var V=j.method,tt=G.iterator[V];if(tt===u)return j.delegate=null,V==="throw"&&G.iterator.return&&(j.method="return",j.arg=u,W(G,j),j.method==="throw")||V!=="return"&&(j.method="throw",j.arg=new TypeError("The iterator does not provide a '"+V+"' method")),w;var nt=y(tt,G.iterator,j.arg);if(nt.type==="throw")return j.method="throw",j.arg=nt.arg,j.delegate=null,w;var at=nt.arg;if(!at)return j.method="throw",j.arg=new TypeError("iterator result is not an object"),j.delegate=null,w;if(at.done)j[G.resultName]=at.value,j.next=G.nextLoc,j.method!=="return"&&(j.method="next",j.arg=u);else return at;return j.delegate=null,w}H(U),h(U,l,"Generator"),h(U,e,function(){return this}),h(U,"toString",function(){return"[object Generator]"});function K(G){var j={tryLoc:G[0]};1 in G&&(j.catchLoc=G[1]),2 in G&&(j.finallyLoc=G[2],j.afterLoc=G[3]),this.tryEntries.push(j)}function F(G){var j=G.completion||{};j.type="normal",delete j.arg,G.completion=j}function J(G){this.tryEntries=[{tryLoc:"root"}],G.forEach(K,this),this.reset(!0)}o.keys=function(G){var j=Object(G),V=[];for(var tt in j)V.push(tt);return V.reverse(),function nt(){for(;V.length;){var at=V.pop();if(at in j)return nt.value=at,nt.done=!1,nt}return nt.done=!0,nt}};function it(G){if(G!=null){var j=G[e];if(j)return j.call(G);if(typeof G.next=="function")return G;if(!isNaN(G.length)){var V=-1,tt=function nt(){for(;++V=0;--nt){var at=this.tryEntries[nt],St=at.completion;if(at.tryLoc==="root")return tt("end");if(at.tryLoc<=this.prev){var vt=a.call(at,"catchLoc"),At=a.call(at,"finallyLoc");if(vt&&At){if(this.prev=0;--tt){var nt=this.tryEntries[tt];if(nt.tryLoc<=this.prev&&a.call(nt,"finallyLoc")&&this.prev=0;--V){var tt=this.tryEntries[V];if(tt.finallyLoc===j)return this.complete(tt.completion,tt.afterLoc),F(tt),w}},catch:function(j){for(var V=this.tryEntries.length-1;V>=0;--V){var tt=this.tryEntries[V];if(tt.tryLoc===j){var nt=tt.completion;if(nt.type==="throw"){var at=nt.arg;F(tt)}return at}}throw new Error("illegal catch attempt")},delegateYield:function(j,V,tt){return this.delegate={iterator:it(j),resultName:V,nextLoc:tt},this.method==="next"&&(this.arg=u),w}},o}(s.exports);try{regeneratorRuntime=r}catch{typeof globalThis=="object"?globalThis.regeneratorRuntime=r:Function("r","regeneratorRuntime = r")(r)}},8577:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"B",{value:!0}),d.A=void 0,t(5151),t(314),t(2501),t(136);var o=r(t(792)),n=t(1522),a=d.A={mixins:[n.localeMixins],props:{hasPermission:{type:Boolean},resourceType:{type:String,default:""},resourceCode:{type:String,default:""},projectCode:{type:String,default:""},ajaxPrefix:{type:String,default:""}},emits:["open-manage"],data(){return{isOpenManageLoading:!1}},computed:{title(){var i={pipeline:this.t("\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD"),pipeline_group:this.t("\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650")};return i[this.resourceType]}},methods:{openManage(){var i=this;return this.isOpenManageLoading=!0,o.default.put("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/enable")).then(function(){i.$emit("open-manage")}).finally(function(){i.isOpenManageLoading=!1})}}}},7941:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"B",{value:!0}),d.A=void 0,t(5151),t(969),t(9167),t(8221),t(314),t(9275),t(2501),t(136),t(7364);var o=r(t(792)),n=t(1522),a=d.A={mixins:[n.localeMixins],props:{isShow:{type:Boolean},groupName:{type:String},groupId:{type:String},expiredDisplay:{type:String},title:{type:String},type:{type:String,default:"apply"},resourceType:{type:String},ajaxPrefix:{type:String,default:""},projectCode:{type:String,default:""}},emits:["update:show"],data(){var i=this,u=this;return{isLoading:!1,pagination:{page:1,pageSize:20,projectName:""},customTime:1,formData:{expireTime:0,reason:""},currentActive:2592e3,timeFilters:{2592e3:u.t("1\u4E2A\u6708"),7776e3:u.t("3\u4E2A\u6708"),15552e3:u.t("6\u4E2A\u6708"),31104e3:u.t("12\u4E2A\u6708")},rules:{expireTime:[{validator:function(){return i.currentActive==="custom"&&i.customTime?!0:i.currentActive!=="custom"},message:u.t("\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650"),trigger:"blur"}],reason:[{required:!0,message:u.t("\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531"),trigger:"blur"}]}}},computed:{userName(){return this.$userInfo&&this.$userInfo.username?this.$userInfo.username:""},projectId(){return this.$route.params.projectId},newExpiredDisplay(){var i={2592e3:30,7776e3:90,15552e3:180,31104e3:360};return this.currentActive==="custom"?Number(this.expiredDisplay)+Number(this.customTime):Number(this.expiredDisplay)+i[this.currentActive]}},created(){this.formData.expireTime=this.formatTimes(2592e3),this.projectCode&&(this.formData.englishName=this.projectCode),this.type==="apply"&&(this.formData.reason="")},methods:{handleConfirm(){if(this.currentActive==="custom"){var i=this.customTime*24*3600;this.formData.expireTime=this.formatTimes(i)}if(this.type==="renewal"){var u=this.newExpiredDisplay*24*3600,c=this.formatTimes(u);this.formData.expireTime=c,this.handleRenewalGroup()}else this.handleApplyGroup()},handleCancel(){var i=this;this.$emit("cancel"),this.customTime=1,this.formData.expireTime=this.formatTimes(2592e3),this.formData.reason="",this.currentActive=2592e3,setTimeout(function(){i.$refs.applyFrom.clearError()},500)},handleChangeCustomTime(i){var u=this;/^[0-9]*$/.test(i)?this.customTime>365&&this.$nextTick(function(){u.customTime=365}):this.$nextTick(function(){u.customTime=1})},handleChangeTime(i){this.$refs.applyFrom.clearError(),this.currentActive=Number(i),this.formData.expireTime=this.formatTimes(i)},handleChangCustom(){this.currentActive="custom"},formatTimes(i){var u=+new Date/1e3,c=String(u).split(""),e=c.findIndex(function(l){return l==="."}),v=parseInt(c.splice(0,e).join(""),10);return Number(i)+v},handleApplyGroup(){var i=this;this.$refs.applyFrom.validate().then(function(){i.isLoading=!0,o.default.post("".concat(i.ajaxPrefix,"/auth/api/user/auth/apply/applyToJoinGroup"),{groupIds:[i.groupId],expiredAt:i.formData.expireTime,reason:i.formData.reason,applicant:i.userName,projectCode:i.projectCode}).then(function(){i.$bkMessage({theme:"success",message:i.t("\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279")})}).catch(function(u){i.$bkMessage({theme:"error",message:u.message})}).finally(function(){i.isLoading=!1,i.handleCancel()})})},handleRenewalGroup(){var i=this;this.isLoading=!0,o.default.put("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.groupId,"/member/renewal"),{expiredAt:this.formData.expireTime,projectId:this.projectId,resourceType:this.resourceType}).then(function(){i.$bkMessage({theme:"success",message:i.t("\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279")})}).catch(function(u){i.$bkMessage({theme:"error",message:u.message})}).finally(function(){i.isLoading=!1,i.handleCancel()})}}}},9564:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"B",{value:!0}),d.A=void 0,t(5151),t(314),t(2501),t(136);var o=r(t(792)),n=r(t(4350)),a=r(t(1651)),i=r(t(1117)),u=r(t(7263)),c=t(1522),e=function(){return{isShow:!1,groupName:"",groupId:"",expiredDisplay:"",title:"",type:""}},v=d.A={components:{ApplyDialog:n.default},mixins:[c.localeMixins],props:{resourceType:{type:String,default:""},resourceCode:{type:String,default:""},projectCode:{type:String,default:""},ajaxPrefix:{type:String,default:""}},data(){return{showDetail:!1,logout:{loading:!1,isShow:!1,groupId:"",name:""},apply:e(),memberList:[],isLoading:!1,isDetailLoading:!1,groupPolicies:[],groupName:""}},computed:{permissionTitle(){var l={pipeline:this.t("\u6D41\u6C34\u7EBF\u7BA1\u7406"),pipeline_template:this.t("\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406"),pipeline_group:this.t("\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406")};return l[this.resourceType]}},mounted(){this.getMemberList()},methods:{handleHidden(){this.showDetail=!1},getMemberList(){var l=this;return this.isLoading=!0,o.default.get("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/groupMember")).then(function(h){l.memberList=h.data}).catch(function(h){l.$bkMessage({theme:"error",message:h.message||h})}).finally(function(){l.isLoading=!1})},handleViewDetail(l){var h=this,m=l.groupId,y=l.groupName;this.groupName=y,this.showDetail=!0,this.isDetailLoading=!0,o.default.get("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(m,"/groupPolicies")).then(function(x){var O=x.data;h.groupPolicies=O}).catch(function(x){h.$bkMessage({theme:"error",message:x.message||x})}).finally(function(){h.isDetailLoading=!1})},statusFormatter(l){var h={NOT_JOINED:this.t("\u672A\u52A0\u5165"),NORMAL:this.t("\u6B63\u5E38"),EXPIRED:this.t("\u5DF2\u8FC7\u671F")};return h[l]},statusIcon(l){var h={NOT_JOINED:a.default,NORMAL:i.default,EXPIRED:u.default};return h[l]},handleRenewal(l){this.apply.isShow=!0,this.apply.groupName=l.groupName,this.apply.groupId=l.groupId,this.apply.expiredDisplay=l.expiredDisplay,this.apply.title=this.t("\u7EED\u671F"),this.apply.type="renewal"},handleApply(l){this.apply.isShow=!0,this.apply.groupName=l.groupName,this.apply.groupId=l.groupId,this.apply.title=this.t("\u7533\u8BF7\u52A0\u5165"),this.apply.type="apply"},handleShowLogout(l){this.logout.isShow=!0,this.logout.groupId=l.groupId,this.logout.name=l.groupName},handleCancelLogout(){this.logout.isShow=!1},handleLogout(){var l=this;return this.logout.loading=!0,o.default.delete("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.logout.groupId,"/member")).then(function(){l.handleCancelLogout(),l.getMemberList()}).catch(function(h){l.$bkMessage({theme:"error",message:h.message||h})}).finally(function(){l.logout.loading=!1})}}}},1093:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"B",{value:!0}),d.A=void 0;var o=r(t(7957)),n=r(t(2272)),a=d.A={props:{title:{type:String,default:""},resourceType:{type:String,default:""},resourceCode:{type:String,default:""},projectCode:{type:String,default:""},ajaxPrefix:{type:String,default:""}},computed:{renderComponent(){return this.resourceType==="project"?n.default:o.default}}}},1306:function(s,d,t){"use strict";Object.defineProperty(d,"B",{value:!0}),d.A=void 0;var r=t(1522),o=d.A={mixins:[r.localeMixins]}},6872:function(s,d,t){"use strict";var r=t(3268);Object.defineProperty(d,"B",{value:!0}),d.A=void 0,t(5151),t(3525),t(9848),t(969),t(3949),t(314),t(2501),t(136),t(7364),t(8801),t(982),t(4984);var o=r(t(4839)),n=r(t(4939)),a=r(t(792)),i=t(1522),u=d.A={components:{ScrollLoadList:n.default},mixins:[i.localeMixins],props:{activeIndex:{type:Boolean,default:0},resourceType:{type:String,default:""},resourceCode:{type:String,default:""},resourceName:{type:String,default:""},projectCode:{type:String,default:""},showCreateGroup:{type:Boolean,default:!0},ajaxPrefix:{type:String,default:""}},emits:["choose-group","create-group","close-manage"],data(){return{page:1,activeTab:"",deleteObj:{group:{},isShow:!1,isLoading:!1},closeObj:{isShow:!1,isLoading:!1},groupList:[],hasLoadEnd:!1,isClosing:!1,curGroupIndex:-1}},computed:{groupCountField(){return this.resourceType==="pipeline"?["userCount","templateCount","departmentCount"]:["userCount","departmentCount"]}},watch:{activeIndex(c){var e;this.activeTab=((e=this.groupList[c])===null||e===void 0?void 0:e.groupId)||""}},created(){var c=this;return(0,o.default)(regeneratorRuntime.mark(function e(){return regeneratorRuntime.wrap(function(l){for(;;)switch(l.prev=l.next){case 0:window.addEventListener("message",c.handleMessage);case 1:case"end":return l.stop()}},e)}))()},beforeUnmount(){window.removeEventListener("message",this.handleMessage)},methods:{handleGetData(c){var e=this;return a.default.get("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/listGroup?page=").concat(this.page,"&pageSize=").concat(c)).then(function(v){var l=v.data;if(e.hasLoadEnd=!l.hasNext,e.groupList.push(...l.records),e.page===1){var h=e.groupList.find(function(m){var y;return+m.groupId==+((y=e.$route.query)===null||y===void 0?void 0:y.groupId)})||e.groupList[0];e.handleChooseGroup(h)}e.page+=1})},refreshList(){return this.groupList=[],this.hasLoadEnd=!1,this.page=1,this.handleGetData(100)},handleShowDeleteGroup(c){this.deleteObj.group=c,this.deleteObj.isShow=!0},handleHiddenDeleteGroup(){this.deleteObj.isShow=!1,this.deleteObj.group={}},handleDeleteGroup(){var c=this;return this.deleteObj.isLoading=!0,a.default.delete("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.deleteObj.group.groupId)).then(function(){c.handleHiddenDeleteGroup(),c.refreshList()}).finally(function(){c.deleteObj.isLoading=!1})},handleChooseGroup(c){this.$router.replace({query:{groupId:c.groupId}}),this.activeTab=c.groupId,this.curGroupIndex=this.groupList.findIndex(function(e){return e.groupId===c.groupId}),this.$emit("choose-group",c)},handleCreateGroup(){this.activeTab="",this.$emit("create-group")},handleCloseManage(){var c=this;return this.isClosing=!0,a.default.put("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/disable")).then(function(){c.$emit("close-manage")}).finally(function(){c.isClosing=!1})},showCloseManageDialog(){this.closeObj.isShow=!0},handleHiddenCloseManage(){this.closeObj.isShow=!1},handleMessage(c){var e=this,v=c.data;if(v.type==="IAM")switch(v.code){case"create_user_group_submit":this.refreshList().then(function(){var m=e.groupList.find(function(y){var x;return y.groupId===(v==null||(x=v.data)===null||x===void 0?void 0:x.id)})||e.groupList[0];e.handleChooseGroup(m)});break;case"create_user_group_cancel":this.handleChooseGroup(this.groupList[0]);break;case"add_user_confirm":this.groupList[this.curGroupIndex].departmentCount+=v.data.departments.length,this.groupList[this.curGroupIndex].userCount+=v.data.users.length,this.syncGroupIAM(this.groupList[this.curGroupIndex].groupId);break;case"remove_user_confirm":var l=v.data.members.filter(function(m){return m.type==="department"}),h=v.data.members.filter(function(m){return m.type==="user"});this.groupList[this.curGroupIndex].departmentCount-=l.length,this.groupList[this.curGroupIndex].userCount-=h.length,this.syncGroupIAM(this.groupList[this.curGroupIndex].groupId);break;case"change_group_detail_tab":this.$emit("change-group-detail-tab",v.data.tab)}},syncGroupIAM(c){var e=this;return(0,o.default)(regeneratorRuntime.mark(function v(){return regeneratorRuntime.wrap(function(h){for(;;)switch(h.prev=h.next){case 0:return h.prev=0,h.next=3,a.default.put("".concat(e.ajaxPrefix,"/auth/api/user/auth/resource/group/sync/").concat(e.projectCode,"/").concat(c,"/syncGroupMember"));case 3:h.next=8;break;case 5:h.prev=5,h.t0=h.catch(0),Message({theme:"error",message:h.t0.message});case 8:case"end":return h.stop()}},v,null,[[0,5]])}))()}}}},9496:function(s,d,t){"use strict";t(5794),t(3525),t(3569);var r=t(3268);Object.defineProperty(d,"B",{value:!0}),d.A=void 0;var o=r(t(5135));t(5151),t(3949),t(314),t(5095),t(982),t(7113),t(2217),t(310);function n(u,c){var e=Object.keys(u);if(Object.getOwnPropertySymbols){var v=Object.getOwnPropertySymbols(u);c&&(v=v.filter(function(l){return Object.getOwnPropertyDescriptor(u,l).enumerable})),e.push.apply(e,v)}return e}function a(u){for(var c=1;c400&&console.warn("HTTP \u8BF7\u6C42\u51FA\u9519 status: ".concat(u)),u>=200&&u<=503},withCredentials:!0});function n(i){return Promise.reject(i)}a.interceptors.response.use(function(i){var u=i.data,l=u.status,f=u.message,d=u.code,v=u.result,p=i.status;if(p===503){var h={status:p,message:f||"service is in deployment"};return Promise.reject(h)}if(p===403){var y={httpStatus:p,code:p,message:f||"Permission Deny"};return Promise.reject(y)}if(typeof l<"u"&&l!==0||typeof v<"u"&&!v){var g={httpStatus:p,message:f,code:d||l};return Promise.reject(g)}if(p===400){var m={httpStatus:p,message:f||"service is abnormal"};return Promise.reject(m)}return i.data},n);var e=c.default=a},37428:function(s,c,t){"use strict";t(74780),t(68215),t(50939),t(43477);var r=t(13523);Object.defineProperty(c,"__esModule",{value:!0}),c.AuthorityDirectiveV2=M,c.AuthorityDirectiveV3=E,c.default=void 0;var o=r(t(77546));t(81993);var a=r(t(18122)),n=r(t(11546));t(94362),t(72028),t(18091),t(63335),t(49844),t(41568),t(68147),t(3945),t(88242),t(94216),t(92355);var e=r(t(83866)),i=t(4613),u=["projectId"];function l(I,S){var x=Object.keys(I);if(Object.getOwnPropertySymbols){var T=Object.getOwnPropertySymbols(I);S&&(T=T.filter(function(N){return Object.getOwnPropertyDescriptor(I,N).enumerable})),x.push.apply(x,T)}return x}function f(I){for(var S=1;S1&&arguments[1]!==void 0?arguments[1]:"";return d=I,class{static install(x){x.directive("perm",{bind(T,N,A){A.key||(A.key=new Date().getTime())},inserted(T,N,A){var D=N.value.disablePermissionApi;D?p(T,N.value,A):g(T,N.value,A,S)},update(T,N,A){var D=N.value,B=N.oldValue;D.hasPermission!==B.hasPermission&&p(T,N.value,A)},unbind(T,N,A){h(T,A)}})}}}function E(I){var S=arguments.length>1&&arguments[1]!==void 0?arguments[1]:"";return d=I,class{static install(x){x.directive("perm",{created(T,N,A){A.key||(A.key=new Date().getTime())},mounted(T,N,A){var D=N.value.disablePermissionApi;D?p(T,N.value,A):g(T,N.value,A,S)},updated(T,N,A){var D=N.value,B=N.oldValue;D.hasPermission!==B.hasPermission&&p(T,N.value,A)},beforeUnmount(T,N,A){h(T,A)}})}}}var O=c.default=i.version===2?M:E},26945:function(s,c,t){"use strict";var r=t(13523);Object.defineProperty(c,"__esModule",{value:!0}),c.handleNoPermissionV3=c.handleNoPermissionV2=c.default=void 0,t(68215),t(63335),t(41568),t(54611);var o=r(t(83866)),a=t(4613),n=t(22771),e=c.handleNoPermissionV2=function(f,d,v){var p=arguments.length>3&&arguments[3]!==void 0?arguments[3]:void 0,h=arguments.length>4&&arguments[4]!==void 0?arguments[4]:"",y={},g={},m=[{label:(0,n.t)("\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650"),prop:"actionName"},{label:(0,n.t)("\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B"),prop:"resourceTypeName"},{label:(0,n.t)("\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B"),prop:"resourceName"}],M=function(){return v(f.bkException,{class:"permission-exception",props:{type:"403",scene:"part"}},(0,n.t)("\u6CA1\u6709\u64CD\u4F5C\u6743\u9650"))},E=function(T){return v(f.bkTable,{class:"permission-table",props:{outerBorder:!1,data:[T]}},m.filter(function(N){return T[N.prop]}).map(function(N){return v(f.bkTableColumn,{props:{showOverflowTooltip:!0,label:N.label,prop:N.prop}})}))},O=function(T){return v("section",{class:"permission-footer"},[T.auth?v(f.bkDropdownMenu,{class:"permission-list",scopedSlots:{"dropdown-content"(){return v("ui",{class:"bk-dropdown-list"},T.groupInfoList.map(function(N){return v("li",{on:{click(){window.open(encodeURI(N.url),"_blank"),I()}}},[N.groupName])}))},"dropdown-trigger"(){return[v("span",{class:"bk-dropdown-list permission-confirm"},[(0,n.t)("\u53BB\u7533\u8BF7")]),v("i",{class:"bk-icon icon-angle-down"})]}}}):v(f.bkButton,{class:"permission-confirm",props:{theme:"primary"},on:{click(){window.open(encodeURI(T.groupInfoList[0].url),"_blank"),I()}}},[(0,n.t)("\u53BB\u7533\u8BF7")]),v(f.bkButton,{class:"permission-cancel",on:{click(){var N,A;(N=y)===null||N===void 0||(A=N.close)===null||A===void 0||A.call(N)}}},[(0,n.t)("\u53D6\u6D88")])])},I=function(){var T,N;(T=y)===null||T===void 0||(N=T.close)===null||N===void 0||N.call(T),g=f.bkInfoBox({title:(0,n.t)("\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4"),subHeader:v("section",[(0,n.t)("\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762"),v("section",{class:"permission-refresh-dialog"},[v(f.bkButton,{class:"mr20",props:{theme:"primary"},on:{click(){location.reload()}}},[(0,n.t)("\u5237\u65B0\u9875\u9762")]),v(f.bkButton,{on:{click(){var A,D;(A=(D=g).close)===null||A===void 0||A.call(D)}}},[(0,n.t)("\u5173\u95ED")])])]),extCls:"permission-dialog",width:500,showFooter:!1})},S=function(T){y=f.bkInfoBox({subHeader:v("section",[M(),E(T),O(T)]),extCls:"permission-dialog",width:640,showFooter:!1})};p?S(p):o.default.get("".concat(h,"/ms/auth/api/user/auth/apply/getRedirectInformation"),{params:d}).then(function(){var x=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},T=x.data?x.data:x;S(T)})},i=c.handleNoPermissionV3=function(f,d,v,p){var h=arguments.length>4&&arguments[4]!==void 0?arguments[4]:"",y={},g={},m=[{label:(0,n.t)("\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650"),prop:"actionName"},{label:(0,n.t)("\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B"),prop:"resourceTypeName"},{label:(0,n.t)("\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B"),prop:"resourceName"}],M=function(){return v(f.Exception,{type:"403",scene:"part"},(0,n.t)("\u6CA1\u6709\u64CD\u4F5C\u6743\u9650"))},E=function(T){return v("section",{class:"permission-table-wrapper"},v(f.Table,{border:"none",data:[T]},m.filter(function(N){return T[N.prop]}).map(function(N){return v(f.TableColumn,{showOverflowTooltip:!0,label:N.label,prop:N.prop})})))},O=function(T){return v("section",{class:"permission-footer"},[T.auth?v(f.Dropdown,{},{content(){return v(f.Dropdown.DropdownMenu,{},T.groupInfoList.map(function(N){return v(f.Dropdown.DropdownItem,{onClick(){window.open(encodeURI(N.url),"_blank"),I()}},[N.groupName])}))},default(){return[v(f.Button,{theme:"primary",class:"mr10"},[(0,n.t)("\u53BB\u7533\u8BF7"),v(f.AngleDown,{class:"icon-angle-down-v3"})])]}}):v(f.Button,{class:"mr10",theme:"primary",onClick(){window.open(encodeURI(T.groupInfoList[0].url),"_blank"),I()}},[(0,n.t)("\u53BB\u7533\u8BF7")]),v(f.Button,{class:"mr25",onClick(){var N,A;(N=y)===null||N===void 0||(A=N.hide)===null||A===void 0||A.call(N)}},[(0,n.t)("\u53D6\u6D88")])])},I=function(){var T,N;(T=y)===null||T===void 0||(N=T.hide)===null||N===void 0||N.call(T),g=f.InfoBox({title:(0,n.t)("\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4"),subTitle:v("section",[(0,n.t)("\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762"),v("section",{class:"permission-refresh-dialog"},[v(f.Button,{class:"mr20",theme:"primary",onClick(){location.reload()}},[(0,n.t)("\u5237\u65B0\u9875\u9762")]),v(f.Button,{onClick(){var A,D;(A=(D=g).hide)===null||A===void 0||A.call(D)}},[(0,n.t)("\u5173\u95ED")])])]),extCls:"permission-dialog",width:500,dialogType:"show"})},S=function(T){y=f.InfoBox({title:"",subTitle:v("section",[M(),E(T),O(T)]),extCls:"permission-dialog-v3",width:640,dialogType:"show"})};p?S(p):o.default.get("".concat(h,"/ms/auth/api/user/auth/apply/getRedirectInformation"),{params:d}).then(function(){var x=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},T=x.data?x.data:x;S(T)})},u=c.default=a.version===2?e:i},11946:function(s,c,t){"use strict";t(18091),t(41568),t(92995),t(94216);var r=t(13523);Object.defineProperty(c,"__esModule",{value:!0}),Object.defineProperty(c,"AuthorityDirectiveV3",{enumerable:!0,get:function(){return a.AuthorityDirectiveV3}}),Object.defineProperty(c,"BkPermission",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(c,"PermissionDirective",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(c,"handleNoPermission",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(c,"handleNoPermissionV3",{enumerable:!0,get:function(){return n.handleNoPermissionV3}});var o=r(t(24718)),a=u(t(37428)),n=u(t(26945)),e=t(22771);function i(f){if(typeof WeakMap!="function")return null;var d=new WeakMap,v=new WeakMap;return(i=function(h){return h?v:d})(f)}function u(f,d){if(!d&&f&&f.__esModule)return f;if(f===null||typeof f!="object"&&typeof f!="function")return{default:f};var v=i(d);if(v&&v.has(f))return v.get(f);var p={__proto__:null},h=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var y in f)if(y!=="default"&&{}.hasOwnProperty.call(f,y)){var g=h?Object.getOwnPropertyDescriptor(f,y):null;g&&(g.get||g.set)?Object.defineProperty(p,y,g):p[y]=f[y]}return p.default=f,v&&v.set(f,p),p}function l(f){var d=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{};(0,e.loadI18nMessages)(d.i18n),f.component("bk-permission",o.default)}o.default.install=l},22771:function(s,c,t){"use strict";t(74780),t(68215),t(50939),t(43477);var r=t(13523);Object.defineProperty(c,"__esModule",{value:!0}),c.loadI18nMessages=d,c.localeMixins=void 0,c.t=v,t(24281),t(18091),t(23467),t(41568),t(94216);var o=r(t(18122)),a=r(t(53079)),n=r(t(2380));function e(h,y){var g=Object.keys(h);if(Object.getOwnPropertySymbols){var m=Object.getOwnPropertySymbols(h);y&&(m=m.filter(function(M){return Object.getOwnPropertyDescriptor(h,M).enumerable})),g.push.apply(g,m)}return g}function i(h){for(var y=1;y1?g-1:0),M=1;M"u"&&P.toLowerCase()==="content-type"?delete E[P]:x.setRequestHeader(P,z)}),r.isUndefined(h.withCredentials)||(x.withCredentials=!!h.withCredentials),O&&O!=="json"&&(x.responseType=h.responseType),typeof h.onDownloadProgress=="function"&&x.addEventListener("progress",h.onDownloadProgress),typeof h.onUploadProgress=="function"&&x.upload&&x.upload.addEventListener("progress",h.onUploadProgress),(h.cancelToken||h.signal)&&(I=function(z){!x||(m(!z||z&&z.type?new d:z),x.abort(),x=null)},h.cancelToken&&h.cancelToken.subscribe(I),h.signal&&(h.signal.aborted?I():h.signal.addEventListener("abort",I))),M||(M=null);var H=v(A);if(H&&["http","https","file"].indexOf(H)===-1){m(new f("Unsupported protocol "+H+":",f.ERR_BAD_REQUEST,h));return}x.send(M)})}},71528:function(s,c,t){"use strict";t(37206),t(8505),t(65e3),t(30491);var r=t(33523),o=t(59509),a=t(55490),n=t(10046),e=t(8437);function i(l){var f=new a(l),d=o(a.prototype.request,f);return r.extend(d,a.prototype,f),r.extend(d,f),d.create=function(p){return i(n(l,p))},d}var u=i(e);u.Axios=a,u.CanceledError=t(16866),u.CancelToken=t(63826),u.isCancel=t(13199),u.VERSION=t(99048).version,u.toFormData=t(2961),u.AxiosError=t(79942),u.Cancel=u.CanceledError,u.all=function(f){return Promise.all(f)},u.spread=t(26613),u.isAxiosError=t(26746),s.exports=u,s.exports.default=u},63826:function(s,c,t){"use strict";t(75506),t(16404),t(8505),t(65e3);var r=t(16866);function o(a){if(typeof a!="function")throw new TypeError("executor must be a function.");var n;this.promise=new Promise(function(u){n=u});var e=this;this.promise.then(function(i){if(!!e._listeners){var u,l=e._listeners.length;for(u=0;u=200&&p<300},headers:{common:{Accept:"application/json, text/plain, */*"}}};r.forEach(["delete","get","head"],function(p){d.headers[p]={}}),r.forEach(["post","put","patch"],function(p){d.headers[p]=r.merge(i)}),s.exports=d},82159:function(s){"use strict";s.exports={silentJSONParsing:!0,forcedJSONParsing:!0,clarifyTimeoutError:!1}},99048:function(s){s.exports={version:"0.27.2"}},59509:function(s){"use strict";s.exports=function(t,r){return function(){for(var a=new Array(arguments.length),n=0;n"u"||(r.isArray(v)?p=p+"[]":v=[v],r.forEach(v,function(y){r.isDate(y)?y=y.toISOString():r.isObject(y)&&(y=JSON.stringify(y)),l.push(o(p)+"="+o(y))}))}),u=l.join("&")}if(u){var f=n.indexOf("#");f!==-1&&(n=n.slice(0,f)),n+=(n.indexOf("?")===-1?"?":"&")+u}return n}},56555:function(s,c,t){"use strict";t(85297),t(5706),s.exports=function(o,a){return a?o.replace(/\/+$/,"")+"/"+a.replace(/^\/+/,""):o}},92583:function(s,c,t){"use strict";t(85474),t(85297),t(15251),t(51943);var r=t(33523);s.exports=r.isStandardBrowserEnv()?function(){return{write:function(n,e,i,u,l,f){var d=[];d.push(n+"="+encodeURIComponent(e)),r.isNumber(i)&&d.push("expires="+new Date(i).toGMTString()),r.isString(u)&&d.push("path="+u),r.isString(l)&&d.push("domain="+l),f===!0&&d.push("secure"),document.cookie=d.join("; ")},read:function(n){var e=document.cookie.match(new RegExp("(^|;\\s*)("+n+")=([^;]*)"));return e?decodeURIComponent(e[3]):null},remove:function(n){this.write(n,"",Date.now()-864e5)}}}():function(){return{write:function(){},read:function(){return null},remove:function(){}}}()},56322:function(s,c,t){"use strict";t(85297),s.exports=function(o){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(o)}},26746:function(s,c,t){"use strict";var r=t(33523);s.exports=function(a){return r.isObject(a)&&a.isAxiosError===!0}},72601:function(s,c,t){"use strict";t(85297),t(5706),t(34300);var r=t(33523);s.exports=r.isStandardBrowserEnv()?function(){var a=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a"),e;function i(u){var l=u;return a&&(n.setAttribute("href",l),l=n.href),n.setAttribute("href",l),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:n.pathname.charAt(0)==="/"?n.pathname:"/"+n.pathname}}return e=i(window.location.href),function(l){var f=r.isString(l)?i(l):l;return f.protocol===e.protocol&&f.host===e.host}}():function(){return function(){return!0}}()},42673:function(s,c,t){"use strict";t(8505),t(56394);var r=t(33523);s.exports=function(a,n){r.forEach(a,function(i,u){u!==n&&u.toUpperCase()===n.toUpperCase()&&(a[n]=i,delete a[u])})}},71911:function(s){s.exports=null},78693:function(s,c,t){"use strict";t(72692),t(75506),t(8505),t(27308),t(56394);var r=t(33523),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];s.exports=function(n){var e={},i,u,l;return n&&r.forEach(n.split(` -`),function(d){if(l=d.indexOf(":"),i=r.trim(d.substr(0,l)).toLowerCase(),u=r.trim(d.substr(l+1)),i){if(e[i]&&o.indexOf(i)>=0)return;i==="set-cookie"?e[i]=(e[i]?e[i]:[]).concat([u]):e[i]=e[i]?e[i]+", "+u:u}}),e}},25603:function(s,c,t){"use strict";t(85297),s.exports=function(o){var a=/^([-+\w]{1,25})(:?\/\/|:)/.exec(o);return a&&a[1]||""}},26613:function(s){"use strict";s.exports=function(t){return function(o){return t.apply(null,o)}}},2961:function(s,c,t){"use strict";t(75506),t(8505),t(65e3),t(30023),t(56394);var r=t(33523);function o(a,n){n=n||new FormData;var e=[];function i(l){return l===null?"":r.isDate(l)?l.toISOString():r.isArrayBuffer(l)||r.isTypedArray(l)?typeof Blob=="function"?new Blob([l]):Buffer.from(l):l}function u(l,f){if(r.isPlainObject(l)||r.isArray(l)){if(e.indexOf(l)!==-1)throw Error("Circular reference detected in "+f);e.push(l),r.forEach(l,function(v,p){if(!r.isUndefined(v)){var h=f?f+"."+p:p,y;if(v&&!f&&typeof v=="object"){if(r.endsWith(p,"{}"))v=JSON.stringify(v);else if(r.endsWith(p,"[]")&&(y=r.toArray(v))){y.forEach(function(g){!r.isUndefined(g)&&n.append(h,i(g))});return}}u(v,h)}}),e.pop()}else n.append(f,i(l))}return u(a),n}s.exports=o},30822:function(s,c,t){"use strict";t(8505);var r=t(99048).version,o=t(79942),a={};["object","boolean","number","function","string","symbol"].forEach(function(i,u){a[i]=function(f){return typeof f===i||"a"+(u<1?"n ":" ")+i}});var n={};a.transitional=function(u,l,f){function d(v,p){return"[Axios v"+r+"] Transitional option '"+v+"'"+p+(f?". "+f:"")}return function(v,p,h){if(u===!1)throw new o(d(p," has been removed"+(l?" in "+l:"")),o.ERR_DEPRECATED);return l&&!n[p]&&(n[p]=!0,console.warn(d(p," has been deprecated since v"+l+" and will be removed in the near future"))),u?u(v,p,h):!0}};function e(i,u,l){if(typeof i!="object")throw new o("options must be an object",o.ERR_BAD_OPTION_VALUE);for(var f=Object.keys(i),d=f.length;d-- >0;){var v=f[d],p=u[v];if(p){var h=i[v],y=h===void 0||p(h,v,i);if(y!==!0)throw new o("option "+v+" must be "+y,o.ERR_BAD_OPTION_VALUE);continue}if(l!==!0)throw new o("Unknown option "+v,o.ERR_BAD_OPTION)}}s.exports={assertOptions:e,validators:a}},33523:function(s,c,t){"use strict";t(75506),t(37206),t(6580),t(65849),t(70803),t(83787),t(8505),t(85297),t(15251),t(5706),t(27308),t(51811),t(7482),t(11878),t(83717),t(23343),t(56171),t(45203),t(46558);var r=t(59509),o=Object.prototype.toString,a=function(R){return function(L){var C=o.call(L);return R[C]||(R[C]=C.slice(8,-1).toLowerCase())}}(Object.create(null));function n(R){return R=R.toLowerCase(),function(C){return a(C)===R}}function e(R){return Array.isArray(R)}function i(R){return typeof R>"u"}function u(R){return R!==null&&!i(R)&&R.constructor!==null&&!i(R.constructor)&&typeof R.constructor.isBuffer=="function"&&R.constructor.isBuffer(R)}var l=n("ArrayBuffer");function f(R){var L;return typeof ArrayBuffer<"u"&&ArrayBuffer.isView?L=ArrayBuffer.isView(R):L=R&&R.buffer&&l(R.buffer),L}function d(R){return typeof R=="string"}function v(R){return typeof R=="number"}function p(R){return R!==null&&typeof R=="object"}function h(R){if(a(R)!=="object")return!1;var L=Object.getPrototypeOf(R);return L===null||L===Object.prototype}var y=n("Date"),g=n("File"),m=n("Blob"),M=n("FileList");function E(R){return o.call(R)==="[object Function]"}function O(R){return p(R)&&E(R.pipe)}function I(R){var L="[object FormData]";return R&&(typeof FormData=="function"&&R instanceof FormData||o.call(R)===L||E(R.toString)&&R.toString()===L)}var S=n("URLSearchParams");function x(R){return R.trim?R.trim():R.replace(/^\s+|\s+$/g,"")}function T(){return typeof navigator<"u"&&(navigator.product==="ReactNative"||navigator.product==="NativeScript"||navigator.product==="NS")?!1:typeof window<"u"&&typeof document<"u"}function N(R,L){if(!(R===null||typeof R>"u"))if(typeof R!="object"&&(R=[R]),e(R))for(var C=0,j=R.length;C0;)w=j[U],X[w]||(L[w]=R[w],X[w]=!0);R=Object.getPrototypeOf(R)}while(R&&(!C||C(R,L))&&R!==Object.prototype);return L}function z(R,L,C){R=String(R),(C===void 0||C>R.length)&&(C=R.length),C-=L.length;var j=R.indexOf(L,C);return j!==-1&&j===C}function P(R){if(!R)return null;var L=R.length;if(i(L))return null;for(var C=new Array(L);L-- >0;)C[L]=R[L];return C}var b=function(R){return function(L){return R&&L instanceof R}}(typeof Uint8Array<"u"&&Object.getPrototypeOf(Uint8Array));s.exports={isArray:e,isArrayBuffer:l,isBuffer:u,isFormData:I,isArrayBufferView:f,isString:d,isNumber:v,isObject:p,isPlainObject:h,isUndefined:i,isDate:y,isFile:g,isBlob:m,isFunction:E,isStream:O,isURLSearchParams:S,isStandardBrowserEnv:T,forEach:N,merge:A,extend:D,trim:x,stripBOM:B,inherits:H,toFlatObject:Y,kindOf:a,kindOfTest:n,endsWith:z,toArray:P,isTypedArray:b,isFileList:M}},66652:function(s,c,t){var r=t(53687),o=t(72317),a=TypeError;s.exports=function(n){if(r(n))return n;throw a(o(n)+" is not a function")}},69202:function(s,c,t){var r=t(70003),o=t(72317),a=TypeError;s.exports=function(n){if(r(n))return n;throw a(o(n)+" is not a constructor")}},4312:function(s,c,t){var r=t(53687),o=String,a=TypeError;s.exports=function(n){if(typeof n=="object"||r(n))return n;throw a("Can't set "+o(n)+" as a prototype")}},14395:function(s,c,t){var r=t(56045),o=t(598),a=t(65519).f,n=r("unscopables"),e=Array.prototype;e[n]==null&&a(e,n,{configurable:!0,value:o(null)}),s.exports=function(i){e[n][i]=!0}},2911:function(s,c,t){"use strict";var r=t(22093).charAt;s.exports=function(o,a,n){return a+(n?r(o,a).length:1)}},42201:function(s,c,t){var r=t(86275),o=TypeError;s.exports=function(a,n){if(r(n,a))return a;throw o("Incorrect invocation")}},23825:function(s,c,t){var r=t(22796),o=String,a=TypeError;s.exports=function(n){if(r(n))return n;throw a(o(n)+" is not an object")}},41149:function(s){s.exports=typeof ArrayBuffer<"u"&&typeof DataView<"u"},9610:function(s,c,t){"use strict";var r=t(41149),o=t(87650),a=t(2241),n=t(53687),e=t(22796),i=t(8103),u=t(19453),l=t(72317),f=t(1537),d=t(31478),v=t(65519).f,p=t(86275),h=t(84097),y=t(79309),g=t(56045),m=t(89198),M=t(80359),E=M.enforce,O=M.get,I=a.Int8Array,S=I&&I.prototype,x=a.Uint8ClampedArray,T=x&&x.prototype,N=I&&h(I),A=S&&h(S),D=Object.prototype,B=a.TypeError,H=g("toStringTag"),Y=m("TYPED_ARRAY_TAG"),z="TypedArrayConstructor",P=r&&!!y&&u(a.opera)!=="Opera",b=!1,R,L,C,j={Int8Array:1,Uint8Array:1,Uint8ClampedArray:1,Int16Array:2,Uint16Array:2,Int32Array:4,Uint32Array:4,Float32Array:4,Float64Array:8},U={BigInt64Array:8,BigUint64Array:8},w=function(vt){if(!e(vt))return!1;var dt=u(vt);return dt==="DataView"||i(j,dt)||i(U,dt)},X=function(_){var vt=h(_);if(!!e(vt)){var dt=O(vt);return dt&&i(dt,z)?dt[z]:X(vt)}},K=function(_){if(!e(_))return!1;var vt=u(_);return i(j,vt)||i(U,vt)},ut=function(_){if(K(_))return _;throw B("Target is not a typed array")},it=function(_){if(n(_)&&(!y||p(N,_)))return _;throw B(l(_)+" is not a typed array constructor")},ct=function(_,vt,dt,ht){if(!!o){if(dt)for(var Ot in j){var St=a[Ot];if(St&&i(St.prototype,_))try{delete St.prototype[_]}catch{try{St.prototype[_]=vt}catch{}}}(!A[_]||dt)&&d(A,_,dt?vt:P&&S[_]||vt,ht)}},at=function(_,vt,dt){var ht,Ot;if(!!o){if(y){if(dt){for(ht in j)if(Ot=a[ht],Ot&&i(Ot,_))try{delete Ot[_]}catch{}}if(!N[_]||dt)try{return d(N,_,dt?vt:P&&N[_]||vt)}catch{}else return}for(ht in j)Ot=a[ht],Ot&&(!Ot[_]||dt)&&d(Ot,_,vt)}};for(R in j)L=a[R],C=L&&L.prototype,C?E(C)[z]=L:P=!1;for(R in U)L=a[R],C=L&&L.prototype,C&&(E(C)[z]=L);if((!P||!n(N)||N===Function.prototype)&&(N=function(){throw B("Incorrect invocation")},P))for(R in j)a[R]&&y(a[R],N);if((!P||!A||A===D)&&(A=N.prototype,P))for(R in j)a[R]&&y(a[R].prototype,A);if(P&&h(T)!==A&&y(T,A),o&&!i(A,H)){b=!0,v(A,H,{get:function(){return e(this)?this[Y]:void 0}});for(R in j)a[R]&&f(a[R],Y,R)}s.exports={NATIVE_ARRAY_BUFFER_VIEWS:P,TYPED_ARRAY_TAG:b&&Y,aTypedArray:ut,aTypedArrayConstructor:it,exportTypedArrayMethod:ct,exportTypedArrayStaticMethod:at,getTypedArrayConstructor:X,isView:w,isTypedArray:K,TypedArray:N,TypedArrayPrototype:A}},82708:function(s,c,t){"use strict";var r=t(2241),o=t(17310),a=t(87650),n=t(41149),e=t(26164),i=t(1537),u=t(57085),l=t(9805),f=t(42201),d=t(19633),v=t(44664),p=t(63858),h=t(37844),y=t(84097),g=t(79309),m=t(81602).f,M=t(65519).f,E=t(41931),O=t(29989),I=t(5961),S=t(80359),x=e.PROPER,T=e.CONFIGURABLE,N=S.get,A=S.set,D="ArrayBuffer",B="DataView",H="prototype",Y="Wrong length",z="Wrong index",P=r[D],b=P,R=b&&b[H],L=r[B],C=L&&L[H],j=Object.prototype,U=r.Array,w=r.RangeError,X=o(E),K=o([].reverse),ut=h.pack,it=h.unpack,ct=function(J){return[J&255]},at=function(J){return[J&255,J>>8&255]},_=function(J){return[J&255,J>>8&255,J>>16&255,J>>24&255]},vt=function(J){return J[3]<<24|J[2]<<16|J[1]<<8|J[0]},dt=function(J){return ut(J,23,4)},ht=function(J){return ut(J,52,8)},Ot=function(J,lt){M(J[H],lt,{get:function(){return N(this)[lt]}})},St=function(J,lt,F,Z){var et=p(F),k=N(J);if(et+lt>k.byteLength)throw w(z);var ft=N(k.buffer).bytes,mt=et+k.byteOffset,yt=O(ft,mt,mt+lt);return Z?yt:K(yt)},Pt=function(J,lt,F,Z,et,k){var ft=p(F),mt=N(J);if(ft+lt>mt.byteLength)throw w(z);for(var yt=N(mt.buffer).bytes,pt=ft+mt.byteOffset,st=Z(+et),ot=0;otet)throw w("Wrong offset");if(Z=Z===void 0?et-k:v(Z),k+Z>et)throw w(Y);A(this,{buffer:lt,byteLength:Z,byteOffset:k}),a||(this.buffer=lt,this.byteLength=Z,this.byteOffset=k)},C=L[H],a&&(Ot(b,"byteLength"),Ot(L,"buffer"),Ot(L,"byteLength"),Ot(L,"byteOffset")),u(C,{getInt8:function(lt){return St(this,1,lt)[0]<<24>>24},getUint8:function(lt){return St(this,1,lt)[0]},getInt16:function(lt){var F=St(this,2,lt,arguments.length>1?arguments[1]:void 0);return(F[1]<<8|F[0])<<16>>16},getUint16:function(lt){var F=St(this,2,lt,arguments.length>1?arguments[1]:void 0);return F[1]<<8|F[0]},getInt32:function(lt){return vt(St(this,4,lt,arguments.length>1?arguments[1]:void 0))},getUint32:function(lt){return vt(St(this,4,lt,arguments.length>1?arguments[1]:void 0))>>>0},getFloat32:function(lt){return it(St(this,4,lt,arguments.length>1?arguments[1]:void 0),23)},getFloat64:function(lt){return it(St(this,8,lt,arguments.length>1?arguments[1]:void 0),52)},setInt8:function(lt,F){Pt(this,1,lt,ct,F)},setUint8:function(lt,F){Pt(this,1,lt,ct,F)},setInt16:function(lt,F){Pt(this,2,lt,at,F,arguments.length>2?arguments[2]:void 0)},setUint16:function(lt,F){Pt(this,2,lt,at,F,arguments.length>2?arguments[2]:void 0)},setInt32:function(lt,F){Pt(this,4,lt,_,F,arguments.length>2?arguments[2]:void 0)},setUint32:function(lt,F){Pt(this,4,lt,_,F,arguments.length>2?arguments[2]:void 0)},setFloat32:function(lt,F){Pt(this,4,lt,dt,F,arguments.length>2?arguments[2]:void 0)},setFloat64:function(lt,F){Pt(this,8,lt,ht,F,arguments.length>2?arguments[2]:void 0)}});else{var Mt=x&&P.name!==D;if(!l(function(){P(1)})||!l(function(){new P(-1)})||l(function(){return new P,new P(1.5),new P(NaN),P.length!=1||Mt&&!T})){b=function(lt){return f(this,R),new P(p(lt))},b[H]=R;for(var Et=m(P),Ct=0,Nt;Et.length>Ct;)(Nt=Et[Ct++])in b||i(b,Nt,P[Nt]);R.constructor=b}else Mt&&T&&i(P,"name",D);g&&y(C)!==j&&g(C,j);var It=new L(new b(2)),Tt=o(C.setInt8);It.setInt8(0,2147483648),It.setInt8(1,2147483649),(It.getInt8(0)||!It.getInt8(1))&&u(C,{setInt8:function(lt,F){Tt(this,lt,F<<24>>24)},setUint8:function(lt,F){Tt(this,lt,F<<24>>24)}},{unsafe:!0})}I(b,D),I(L,B),s.exports={ArrayBuffer:b,DataView:L}},41931:function(s,c,t){"use strict";var r=t(98479),o=t(73908),a=t(98732);s.exports=function(e){for(var i=r(this),u=a(i),l=arguments.length,f=o(l>1?arguments[1]:void 0,u),d=l>2?arguments[2]:void 0,v=d===void 0?u:o(d,u);v>f;)i[f++]=e;return i}},59693:function(s,c,t){"use strict";var r=t(68999).forEach,o=t(15756),a=o("forEach");s.exports=a?[].forEach:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0)}},97783:function(s,c,t){var r=t(83043),o=t(73908),a=t(98732),n=function(e){return function(i,u,l){var f=r(i),d=a(f),v=o(l,d),p;if(e&&u!=u){for(;d>v;)if(p=f[v++],p!=p)return!0}else for(;d>v;v++)if((e||v in f)&&f[v]===u)return e||v||0;return!e&&-1}};s.exports={includes:n(!0),indexOf:n(!1)}},68999:function(s,c,t){var r=t(30510),o=t(17310),a=t(27181),n=t(98479),e=t(98732),i=t(50523),u=o([].push),l=function(f){var d=f==1,v=f==2,p=f==3,h=f==4,y=f==6,g=f==7,m=f==5||y;return function(M,E,O,I){for(var S=n(M),x=a(S),T=r(E,O),N=e(x),A=0,D=I||i,B=d?D(M,N):v||g?D(M,0):void 0,H,Y;N>A;A++)if((m||A in x)&&(H=x[A],Y=T(H,A,S),f))if(d)B[A]=Y;else if(Y)switch(f){case 3:return!0;case 5:return H;case 6:return A;case 2:u(B,H)}else switch(f){case 4:return!1;case 7:u(B,H)}return y?-1:p||h?h:B}};s.exports={forEach:l(0),map:l(1),filter:l(2),some:l(3),every:l(4),find:l(5),findIndex:l(6),filterReject:l(7)}},66783:function(s,c,t){var r=t(9805),o=t(56045),a=t(20670),n=o("species");s.exports=function(e){return a>=51||!r(function(){var i=[],u=i.constructor={};return u[n]=function(){return{foo:1}},i[e](Boolean).foo!==1})}},15756:function(s,c,t){"use strict";var r=t(9805);s.exports=function(o,a){var n=[][o];return!!n&&r(function(){n.call(null,a||function(){return 1},1)})}},95805:function(s,c,t){"use strict";var r=t(87650),o=t(50006),a=TypeError,n=Object.getOwnPropertyDescriptor,e=r&&!function(){if(this!==void 0)return!0;try{Object.defineProperty([],"length",{writable:!1}).length=1}catch(i){return i instanceof TypeError}}();s.exports=e?function(i,u){if(o(i)&&!n(i,"length").writable)throw a("Cannot set read only .length");return i.length=u}:function(i,u){return i.length=u}},29989:function(s,c,t){var r=t(73908),o=t(98732),a=t(36906),n=Array,e=Math.max;s.exports=function(i,u,l){for(var f=o(i),d=r(u,f),v=r(l===void 0?f:l,f),p=n(e(v-d,0)),h=0;d0;)i[v]=i[--v];v!==f++&&(i[v]=d)}return i},e=function(i,u,l,f){for(var d=u.length,v=l.length,p=0,h=0;p"u"&&c!==void 0;s.exports={all:c,IS_HTMLDDA:t}},51589:function(s,c,t){var r=t(2241),o=t(22796),a=r.document,n=o(a)&&o(a.createElement);s.exports=function(e){return n?a.createElement(e):{}}},16087:function(s){var c=TypeError,t=9007199254740991;s.exports=function(r){if(r>t)throw c("Maximum allowed index exceeded");return r}},95438:function(s){s.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},91474:function(s,c,t){var r=t(51589),o=r("span").classList,a=o&&o.constructor&&o.constructor.prototype;s.exports=a===Object.prototype?void 0:a},96960:function(s,c,t){var r=t(39002),o=r.match(/firefox\/(\d+)/i);s.exports=!!o&&+o[1]},63712:function(s,c,t){var r=t(71486),o=t(26146);s.exports=!r&&!o&&typeof window=="object"&&typeof document=="object"},71486:function(s){s.exports=typeof Deno=="object"&&Deno&&typeof Deno.version=="object"},66120:function(s,c,t){var r=t(39002);s.exports=/MSIE|Trident/.test(r)},94222:function(s,c,t){var r=t(39002),o=t(2241);s.exports=/ipad|iphone|ipod/i.test(r)&&o.Pebble!==void 0},99477:function(s,c,t){var r=t(39002);s.exports=/(?:ipad|iphone|ipod).*applewebkit/i.test(r)},26146:function(s,c,t){var r=t(96282),o=t(2241);s.exports=r(o.process)=="process"},38363:function(s,c,t){var r=t(39002);s.exports=/web0s(?!.*chrome)/i.test(r)},39002:function(s,c,t){var r=t(23893);s.exports=r("navigator","userAgent")||""},20670:function(s,c,t){var r=t(2241),o=t(39002),a=r.process,n=r.Deno,e=a&&a.versions||n&&n.version,i=e&&e.v8,u,l;i&&(u=i.split("."),l=u[0]>0&&u[0]<4?1:+(u[0]+u[1])),!l&&o&&(u=o.match(/Edge\/(\d+)/),(!u||u[1]>=74)&&(u=o.match(/Chrome\/(\d+)/),u&&(l=+u[1]))),s.exports=l},60970:function(s,c,t){var r=t(39002),o=r.match(/AppleWebKit\/(\d+)\./);s.exports=!!o&&+o[1]},68657:function(s){s.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},50008:function(s,c,t){var r=t(2241),o=t(47661).f,a=t(1537),n=t(31478),e=t(36011),i=t(51810),u=t(9097);s.exports=function(l,f){var d=l.target,v=l.global,p=l.stat,h,y,g,m,M,E;if(v?y=r:p?y=r[d]||e(d,{}):y=(r[d]||{}).prototype,y)for(g in f){if(M=f[g],l.dontCallGetSet?(E=o(y,g),m=E&&E.value):m=y[g],h=u(v?g:d+(p?".":"#")+g,l.forced),!h&&m!==void 0){if(typeof M==typeof m)continue;i(M,m)}(l.sham||m&&m.sham)&&a(M,"sham",!0),n(y,g,M,l)}}},9805:function(s){s.exports=function(c){try{return!!c()}catch{return!0}}},6018:function(s,c,t){"use strict";t(85297);var r=t(17310),o=t(31478),a=t(88981),n=t(9805),e=t(56045),i=t(1537),u=e("species"),l=RegExp.prototype;s.exports=function(f,d,v,p){var h=e(f),y=!n(function(){var E={};return E[h]=function(){return 7},""[f](E)!=7}),g=y&&!n(function(){var E=!1,O=/a/;return f==="split"&&(O={},O.constructor={},O.constructor[u]=function(){return O},O.flags="",O[h]=/./[h]),O.exec=function(){return E=!0,null},O[h](""),!E});if(!y||!g||v){var m=r(/./[h]),M=d(h,""[f],function(E,O,I,S,x){var T=r(E),N=O.exec;return N===a||N===l.exec?y&&!x?{done:!0,value:m(O,I,S)}:{done:!0,value:T(I,O,S)}:{done:!1}});o(String.prototype,f,M[0]),o(l,h,M[1])}p&&i(l[h],"sham",!0)}},19191:function(s,c,t){var r=t(91006),o=Function.prototype,a=o.apply,n=o.call;s.exports=typeof Reflect=="object"&&Reflect.apply||(r?n.bind(a):function(){return n.apply(a,arguments)})},30510:function(s,c,t){var r=t(17310),o=t(66652),a=t(91006),n=r(r.bind);s.exports=function(e,i){return o(e),i===void 0?e:a?n(e,i):function(){return e.apply(i,arguments)}}},91006:function(s,c,t){var r=t(9805);s.exports=!r(function(){var o=function(){}.bind();return typeof o!="function"||o.hasOwnProperty("prototype")})},88139:function(s,c,t){var r=t(91006),o=Function.prototype.call;s.exports=r?o.bind(o):function(){return o.apply(o,arguments)}},26164:function(s,c,t){var r=t(87650),o=t(8103),a=Function.prototype,n=r&&Object.getOwnPropertyDescriptor,e=o(a,"name"),i=e&&function(){}.name==="something",u=e&&(!r||r&&n(a,"name").configurable);s.exports={EXISTS:e,PROPER:i,CONFIGURABLE:u}},87553:function(s,c,t){var r=t(91006),o=Function.prototype,a=o.call,n=r&&o.bind.bind(a,a);s.exports=r?n:function(e){return function(){return a.apply(e,arguments)}}},17310:function(s,c,t){var r=t(96282),o=t(87553);s.exports=function(a){if(r(a)==="Function")return o(a)}},23893:function(s,c,t){var r=t(2241),o=t(53687),a=function(n){return o(n)?n:void 0};s.exports=function(n,e){return arguments.length<2?a(r[n]):r[n]&&r[n][e]}},93901:function(s,c,t){var r=t(19453),o=t(27624),a=t(59899),n=t(53787),e=t(56045),i=e("iterator");s.exports=function(u){if(!a(u))return o(u,i)||o(u,"@@iterator")||n[r(u)]}},90915:function(s,c,t){var r=t(88139),o=t(66652),a=t(23825),n=t(72317),e=t(93901),i=TypeError;s.exports=function(u,l){var f=arguments.length<2?e(u):l;if(o(f))return a(r(f,u));throw i(n(u)+" is not iterable")}},27624:function(s,c,t){var r=t(66652),o=t(59899);s.exports=function(a,n){var e=a[n];return o(e)?void 0:r(e)}},22536:function(s,c,t){var r=t(17310),o=t(98479),a=Math.floor,n=r("".charAt),e=r("".replace),i=r("".slice),u=/\$([$&'`]|\d{1,2}|<[^>]*>)/g,l=/\$([$&'`]|\d{1,2})/g;s.exports=function(f,d,v,p,h,y){var g=v+f.length,m=p.length,M=l;return h!==void 0&&(h=o(h),M=u),e(y,M,function(E,O){var I;switch(n(O,0)){case"$":return"$";case"&":return f;case"`":return i(d,0,v);case"'":return i(d,g);case"<":I=h[i(O,1,-1)];break;default:var S=+O;if(S===0)return E;if(S>m){var x=a(S/10);return x===0?E:x<=m?p[x-1]===void 0?n(O,1):p[x-1]+n(O,1):E}I=p[S-1]}return I===void 0?"":I})}},2241:function(s,c,t){var r=function(o){return o&&o.Math==Math&&o};s.exports=r(typeof globalThis=="object"&&globalThis)||r(typeof window=="object"&&window)||r(typeof self=="object"&&self)||r(typeof t.g=="object"&&t.g)||function(){return this}()||Function("return this")()},8103:function(s,c,t){var r=t(17310),o=t(98479),a=r({}.hasOwnProperty);s.exports=Object.hasOwn||function(e,i){return a(o(e),i)}},743:function(s){s.exports={}},24751:function(s,c,t){var r=t(2241);s.exports=function(o,a){var n=r.console;n&&n.error&&(arguments.length==1?n.error(o):n.error(o,a))}},55135:function(s,c,t){var r=t(23893);s.exports=r("document","documentElement")},77147:function(s,c,t){var r=t(87650),o=t(9805),a=t(51589);s.exports=!r&&!o(function(){return Object.defineProperty(a("div"),"a",{get:function(){return 7}}).a!=7})},37844:function(s){var c=Array,t=Math.abs,r=Math.pow,o=Math.floor,a=Math.log,n=Math.LN2,e=function(u,l,f){var d=c(f),v=f*8-l-1,p=(1<>1,y=l===23?r(2,-24)-r(2,-77):0,g=u<0||u===0&&1/u<0?1:0,m=0,M,E,O;for(u=t(u),u!=u||u===1/0?(E=u!=u?1:0,M=p):(M=o(a(u)/n),O=r(2,-M),u*O<1&&(M--,O*=2),M+h>=1?u+=y/O:u+=y*r(2,1-h),u*O>=2&&(M++,O/=2),M+h>=p?(E=0,M=p):M+h>=1?(E=(u*O-1)*r(2,l),M=M+h):(E=u*r(2,h-1)*r(2,l),M=0));l>=8;)d[m++]=E&255,E/=256,l-=8;for(M=M<0;)d[m++]=M&255,M/=256,v-=8;return d[--m]|=g*128,d},i=function(u,l){var f=u.length,d=f*8-l-1,v=(1<>1,h=d-7,y=f-1,g=u[y--],m=g&127,M;for(g>>=7;h>0;)m=m*256+u[y--],h-=8;for(M=m&(1<<-h)-1,m>>=-h,h+=l;h>0;)M=M*256+u[y--],h-=8;if(m===0)m=1-p;else{if(m===v)return M?NaN:g?-1/0:1/0;M=M+r(2,l),m=m-p}return(g?-1:1)*M*r(2,m-l)};s.exports={pack:e,unpack:i}},27181:function(s,c,t){var r=t(17310),o=t(9805),a=t(96282),n=Object,e=r("".split);s.exports=o(function(){return!n("z").propertyIsEnumerable(0)})?function(i){return a(i)=="String"?e(i,""):n(i)}:n},92929:function(s,c,t){var r=t(53687),o=t(22796),a=t(79309);s.exports=function(n,e,i){var u,l;return a&&r(u=e.constructor)&&u!==i&&o(l=u.prototype)&&l!==i.prototype&&a(n,l),n}},28696:function(s,c,t){var r=t(17310),o=t(53687),a=t(66675),n=r(Function.toString);o(a.inspectSource)||(a.inspectSource=function(e){return n(e)}),s.exports=a.inspectSource},80359:function(s,c,t){var r=t(12440),o=t(2241),a=t(22796),n=t(1537),e=t(8103),i=t(66675),u=t(48189),l=t(743),f="Object already initialized",d=o.TypeError,v=o.WeakMap,p,h,y,g=function(O){return y(O)?h(O):p(O,{})},m=function(O){return function(I){var S;if(!a(I)||(S=h(I)).type!==O)throw d("Incompatible receiver, "+O+" required");return S}};if(r||i.state){var M=i.state||(i.state=new v);M.get=M.get,M.has=M.has,M.set=M.set,p=function(O,I){if(M.has(O))throw d(f);return I.facade=O,M.set(O,I),I},h=function(O){return M.get(O)||{}},y=function(O){return M.has(O)}}else{var E=u("state");l[E]=!0,p=function(O,I){if(e(O,E))throw d(f);return I.facade=O,n(O,E,I),I},h=function(O){return e(O,E)?O[E]:{}},y=function(O){return e(O,E)}}s.exports={set:p,get:h,has:y,enforce:g,getterFor:m}},24639:function(s,c,t){var r=t(56045),o=t(53787),a=r("iterator"),n=Array.prototype;s.exports=function(e){return e!==void 0&&(o.Array===e||n[a]===e)}},50006:function(s,c,t){var r=t(96282);s.exports=Array.isArray||function(a){return r(a)=="Array"}},74337:function(s,c,t){var r=t(19453),o=t(17310),a=o("".slice);s.exports=function(n){return a(r(n),0,3)==="Big"}},53687:function(s,c,t){var r=t(42689),o=r.all;s.exports=r.IS_HTMLDDA?function(a){return typeof a=="function"||a===o}:function(a){return typeof a=="function"}},70003:function(s,c,t){var r=t(17310),o=t(9805),a=t(53687),n=t(19453),e=t(23893),i=t(28696),u=function(){},l=[],f=e("Reflect","construct"),d=/^\s*(?:class|function)\b/,v=r(d.exec),p=!d.exec(u),h=function(m){if(!a(m))return!1;try{return f(u,l,m),!0}catch{return!1}},y=function(m){if(!a(m))return!1;switch(n(m)){case"AsyncFunction":case"GeneratorFunction":case"AsyncGeneratorFunction":return!1}try{return p||!!v(d,i(m))}catch{return!0}};y.sham=!0,s.exports=!f||o(function(){var g;return h(h.call)||!h(Object)||!h(function(){g=!0})||g})?y:h},9097:function(s,c,t){var r=t(9805),o=t(53687),a=/#|\.prototype\./,n=function(f,d){var v=i[e(f)];return v==l?!0:v==u?!1:o(d)?r(d):!!d},e=n.normalize=function(f){return String(f).replace(a,".").toLowerCase()},i=n.data={},u=n.NATIVE="N",l=n.POLYFILL="P";s.exports=n},90973:function(s,c,t){var r=t(22796),o=Math.floor;s.exports=Number.isInteger||function(n){return!r(n)&&isFinite(n)&&o(n)===n}},59899:function(s){s.exports=function(c){return c==null}},22796:function(s,c,t){var r=t(53687),o=t(42689),a=o.all;s.exports=o.IS_HTMLDDA?function(n){return typeof n=="object"?n!==null:r(n)||n===a}:function(n){return typeof n=="object"?n!==null:r(n)}},43937:function(s){s.exports=!1},9830:function(s,c,t){var r=t(22796),o=t(96282),a=t(56045),n=a("match");s.exports=function(e){var i;return r(e)&&((i=e[n])!==void 0?!!i:o(e)=="RegExp")}},13555:function(s,c,t){var r=t(23893),o=t(53687),a=t(86275),n=t(59970),e=Object;s.exports=n?function(i){return typeof i=="symbol"}:function(i){var u=r("Symbol");return o(u)&&a(u.prototype,e(i))}},50870:function(s,c,t){var r=t(30510),o=t(88139),a=t(23825),n=t(72317),e=t(24639),i=t(98732),u=t(86275),l=t(90915),f=t(93901),d=t(77405),v=TypeError,p=function(y,g){this.stopped=y,this.result=g},h=p.prototype;s.exports=function(y,g,m){var M=m&&m.that,E=!!(m&&m.AS_ENTRIES),O=!!(m&&m.IS_RECORD),I=!!(m&&m.IS_ITERATOR),S=!!(m&&m.INTERRUPTED),x=r(g,M),T,N,A,D,B,H,Y,z=function(b){return T&&d(T,"normal",b),new p(!0,b)},P=function(b){return E?(a(b),S?x(b[0],b[1],z):x(b[0],b[1])):S?x(b,z):x(b)};if(O)T=y.iterator;else if(I)T=y;else{if(N=f(y),!N)throw v(n(y)+" is not iterable");if(e(N)){for(A=0,D=i(y);D>A;A++)if(B=P(y[A]),B&&u(h,B))return B;return new p(!1)}T=l(y,N)}for(H=O?y.next:T.next;!(Y=o(H,T)).done;){try{B=P(Y.value)}catch(b){d(T,"throw",b)}if(typeof B=="object"&&B&&u(h,B))return B}return new p(!1)}},77405:function(s,c,t){var r=t(88139),o=t(23825),a=t(27624);s.exports=function(n,e,i){var u,l;o(n);try{if(u=a(n,"return"),!u){if(e==="throw")throw i;return i}u=r(u,n)}catch(f){l=!0,u=f}if(e==="throw")throw i;if(l)throw u;return o(u),i}},77180:function(s,c,t){"use strict";var r=t(93855).IteratorPrototype,o=t(598),a=t(87670),n=t(5961),e=t(53787),i=function(){return this};s.exports=function(u,l,f,d){var v=l+" Iterator";return u.prototype=o(r,{next:a(+!d,f)}),n(u,v,!1,!0),e[v]=i,u}},48994:function(s,c,t){"use strict";var r=t(50008),o=t(88139),a=t(43937),n=t(26164),e=t(53687),i=t(77180),u=t(84097),l=t(79309),f=t(5961),d=t(1537),v=t(31478),p=t(56045),h=t(53787),y=t(93855),g=n.PROPER,m=n.CONFIGURABLE,M=y.IteratorPrototype,E=y.BUGGY_SAFARI_ITERATORS,O=p("iterator"),I="keys",S="values",x="entries",T=function(){return this};s.exports=function(N,A,D,B,H,Y,z){i(D,A,B);var P=function(ut){if(ut===H&&j)return j;if(!E&&ut in L)return L[ut];switch(ut){case I:return function(){return new D(this,ut)};case S:return function(){return new D(this,ut)};case x:return function(){return new D(this,ut)}}return function(){return new D(this)}},b=A+" Iterator",R=!1,L=N.prototype,C=L[O]||L["@@iterator"]||H&&L[H],j=!E&&C||P(H),U=A=="Array"&&L.entries||C,w,X,K;if(U&&(w=u(U.call(new N)),w!==Object.prototype&&w.next&&(!a&&u(w)!==M&&(l?l(w,M):e(w[O])||v(w,O,T)),f(w,b,!0,!0),a&&(h[b]=T))),g&&H==S&&C&&C.name!==S&&(!a&&m?d(L,"name",S):(R=!0,j=function(){return o(C,this)})),H)if(X={values:P(S),keys:Y?j:P(I),entries:P(x)},z)for(K in X)(E||R||!(K in L))&&v(L,K,X[K]);else r({target:A,proto:!0,forced:E||R},X);return(!a||z)&&L[O]!==j&&v(L,O,j,{name:H}),h[A]=j,X}},93855:function(s,c,t){"use strict";var r=t(9805),o=t(53687),a=t(22796),n=t(598),e=t(84097),i=t(31478),u=t(56045),l=t(43937),f=u("iterator"),d=!1,v,p,h;[].keys&&(h=[].keys(),"next"in h?(p=e(e(h)),p!==Object.prototype&&(v=p)):d=!0);var y=!a(v)||r(function(){var g={};return v[f].call(g)!==g});y?v={}:l&&(v=n(v)),o(v[f])||i(v,f,function(){return this}),s.exports={IteratorPrototype:v,BUGGY_SAFARI_ITERATORS:d}},53787:function(s){s.exports={}},98732:function(s,c,t){var r=t(44664);s.exports=function(o){return r(o.length)}},24701:function(s,c,t){var r=t(9805),o=t(53687),a=t(8103),n=t(87650),e=t(26164).CONFIGURABLE,i=t(28696),u=t(80359),l=u.enforce,f=u.get,d=Object.defineProperty,v=n&&!r(function(){return d(function(){},"length",{value:8}).length!==8}),p=String(String).split("String"),h=s.exports=function(y,g,m){String(g).slice(0,7)==="Symbol("&&(g="["+String(g).replace(/^Symbol\(([^)]*)\)/,"$1")+"]"),m&&m.getter&&(g="get "+g),m&&m.setter&&(g="set "+g),(!a(y,"name")||e&&y.name!==g)&&(n?d(y,"name",{value:g,configurable:!0}):y.name=g),v&&m&&a(m,"arity")&&y.length!==m.arity&&d(y,"length",{value:m.arity});try{m&&a(m,"constructor")&&m.constructor?n&&d(y,"prototype",{writable:!1}):y.prototype&&(y.prototype=void 0)}catch{}var M=l(y);return a(M,"source")||(M.source=p.join(typeof g=="string"?g:"")),y};Function.prototype.toString=h(function(){return o(this)&&f(this).source||i(this)},"toString")},62963:function(s){var c=Math.ceil,t=Math.floor;s.exports=Math.trunc||function(o){var a=+o;return(a>0?t:c)(a)}},91285:function(s,c,t){var r=t(2241),o=t(30510),a=t(47661).f,n=t(38451).set,e=t(99477),i=t(94222),u=t(38363),l=t(26146),f=r.MutationObserver||r.WebKitMutationObserver,d=r.document,v=r.process,p=r.Promise,h=a(r,"queueMicrotask"),y=h&&h.value,g,m,M,E,O,I,S,x;y||(g=function(){var T,N;for(l&&(T=v.domain)&&T.exit();m;){N=m.fn,m=m.next;try{N()}catch(A){throw m?E():M=void 0,A}}M=void 0,T&&T.enter()},!e&&!l&&!u&&f&&d?(O=!0,I=d.createTextNode(""),new f(g).observe(I,{characterData:!0}),E=function(){I.data=O=!O}):!i&&p&&p.resolve?(S=p.resolve(void 0),S.constructor=p,x=o(S.then,S),E=function(){x(g)}):l?E=function(){v.nextTick(g)}:(n=o(n,r),E=function(){n(g)})),s.exports=y||function(T){var N={fn:T,next:void 0};M&&(M.next=N),m||(m=N,E()),M=N}},76161:function(s,c,t){"use strict";var r=t(66652),o=TypeError,a=function(n){var e,i;this.promise=new n(function(u,l){if(e!==void 0||i!==void 0)throw o("Bad Promise constructor");e=u,i=l}),this.resolve=r(e),this.reject=r(i)};s.exports.f=function(n){return new a(n)}},26745:function(s,c,t){var r=t(9830),o=TypeError;s.exports=function(a){if(r(a))throw o("The method doesn't accept regular expressions");return a}},4787:function(s,c,t){"use strict";var r=t(87650),o=t(17310),a=t(88139),n=t(9805),e=t(27814),i=t(71351),u=t(73311),l=t(98479),f=t(27181),d=Object.assign,v=Object.defineProperty,p=o([].concat);s.exports=!d||n(function(){if(r&&d({b:1},d(v({},"a",{enumerable:!0,get:function(){v(this,"b",{value:3,enumerable:!1})}}),{b:2})).b!==1)return!0;var h={},y={},g=Symbol(),m="abcdefghijklmnopqrst";return h[g]=7,m.split("").forEach(function(M){y[M]=M}),d({},h)[g]!=7||e(d({},y)).join("")!=m})?function(y,g){for(var m=l(y),M=arguments.length,E=1,O=i.f,I=u.f;M>E;)for(var S=f(arguments[E++]),x=O?p(e(S),O(S)):e(S),T=x.length,N=0,A;T>N;)A=x[N++],(!r||a(I,S,A))&&(m[A]=S[A]);return m}:d},598:function(s,c,t){var r=t(23825),o=t(60355),a=t(68657),n=t(743),e=t(55135),i=t(51589),u=t(48189),l=">",f="<",d="prototype",v="script",p=u("IE_PROTO"),h=function(){},y=function(O){return f+v+l+O+f+"/"+v+l},g=function(O){O.write(y("")),O.close();var I=O.parentWindow.Object;return O=null,I},m=function(){var O=i("iframe"),I="java"+v+":",S;return O.style.display="none",e.appendChild(O),O.src=String(I),S=O.contentWindow.document,S.open(),S.write(y("document.F=Object")),S.close(),S.F},M,E=function(){try{M=new ActiveXObject("htmlfile")}catch{}E=typeof document<"u"?document.domain&&M?g(M):m():g(M);for(var O=a.length;O--;)delete E[d][a[O]];return E()};n[p]=!0,s.exports=Object.create||function(I,S){var x;return I!==null?(h[d]=r(I),x=new h,h[d]=null,x[p]=I):x=E(),S===void 0?x:o.f(x,S)}},60355:function(s,c,t){var r=t(87650),o=t(41628),a=t(65519),n=t(23825),e=t(83043),i=t(27814);c.f=r&&!o?Object.defineProperties:function(l,f){n(l);for(var d=e(f),v=i(f),p=v.length,h=0,y;p>h;)a.f(l,y=v[h++],d[y]);return l}},65519:function(s,c,t){var r=t(87650),o=t(77147),a=t(41628),n=t(23825),e=t(30859),i=TypeError,u=Object.defineProperty,l=Object.getOwnPropertyDescriptor,f="enumerable",d="configurable",v="writable";c.f=r?a?function(h,y,g){if(n(h),y=e(y),n(g),typeof h=="function"&&y==="prototype"&&"value"in g&&v in g&&!g[v]){var m=l(h,y);m&&m[v]&&(h[y]=g.value,g={configurable:d in g?g[d]:m[d],enumerable:f in g?g[f]:m[f],writable:!1})}return u(h,y,g)}:u:function(h,y,g){if(n(h),y=e(y),n(g),o)try{return u(h,y,g)}catch{}if("get"in g||"set"in g)throw i("Accessors not supported");return"value"in g&&(h[y]=g.value),h}},47661:function(s,c,t){var r=t(87650),o=t(88139),a=t(73311),n=t(87670),e=t(83043),i=t(30859),u=t(8103),l=t(77147),f=Object.getOwnPropertyDescriptor;c.f=r?f:function(v,p){if(v=e(v),p=i(p),l)try{return f(v,p)}catch{}if(u(v,p))return n(!o(a.f,v,p),v[p])}},95496:function(s,c,t){var r=t(96282),o=t(83043),a=t(81602).f,n=t(29989),e=typeof window=="object"&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],i=function(u){try{return a(u)}catch{return n(e)}};s.exports.f=function(l){return e&&r(l)=="Window"?i(l):a(o(l))}},81602:function(s,c,t){var r=t(92602),o=t(68657),a=o.concat("length","prototype");c.f=Object.getOwnPropertyNames||function(e){return r(e,a)}},71351:function(s,c){c.f=Object.getOwnPropertySymbols},84097:function(s,c,t){var r=t(8103),o=t(53687),a=t(98479),n=t(48189),e=t(63461),i=n("IE_PROTO"),u=Object,l=u.prototype;s.exports=e?u.getPrototypeOf:function(f){var d=a(f);if(r(d,i))return d[i];var v=d.constructor;return o(v)&&d instanceof v?v.prototype:d instanceof u?l:null}},86275:function(s,c,t){var r=t(17310);s.exports=r({}.isPrototypeOf)},92602:function(s,c,t){var r=t(17310),o=t(8103),a=t(83043),n=t(97783).indexOf,e=t(743),i=r([].push);s.exports=function(u,l){var f=a(u),d=0,v=[],p;for(p in f)!o(e,p)&&o(f,p)&&i(v,p);for(;l.length>d;)o(f,p=l[d++])&&(~n(v,p)||i(v,p));return v}},27814:function(s,c,t){var r=t(92602),o=t(68657);s.exports=Object.keys||function(n){return r(n,o)}},73311:function(s,c){"use strict";var t={}.propertyIsEnumerable,r=Object.getOwnPropertyDescriptor,o=r&&!t.call({1:2},1);c.f=o?function(n){var e=r(this,n);return!!e&&e.enumerable}:t},79309:function(s,c,t){var r=t(17310),o=t(23825),a=t(4312);s.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var n=!1,e={},i;try{i=r(Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set),i(e,[]),n=e instanceof Array}catch{}return function(l,f){return o(l),a(f),n?i(l,f):l.__proto__=f,l}}():void 0)},4017:function(s,c,t){"use strict";var r=t(39902),o=t(19453);s.exports=r?{}.toString:function(){return"[object "+o(this)+"]"}},85096:function(s,c,t){var r=t(88139),o=t(53687),a=t(22796),n=TypeError;s.exports=function(e,i){var u,l;if(i==="string"&&o(u=e.toString)&&!a(l=r(u,e))||o(u=e.valueOf)&&!a(l=r(u,e))||i!=="string"&&o(u=e.toString)&&!a(l=r(u,e)))return l;throw n("Can't convert object to primitive value")}},70109:function(s,c,t){var r=t(23893),o=t(17310),a=t(81602),n=t(71351),e=t(23825),i=o([].concat);s.exports=r("Reflect","ownKeys")||function(l){var f=a.f(e(l)),d=n.f;return d?i(f,d(l)):f}},80593:function(s,c,t){var r=t(2241);s.exports=r},57157:function(s){s.exports=function(c){try{return{error:!1,value:c()}}catch(t){return{error:!0,value:t}}}},64866:function(s,c,t){var r=t(2241),o=t(51060),a=t(53687),n=t(9097),e=t(28696),i=t(56045),u=t(63712),l=t(71486),f=t(43937),d=t(20670),v=o&&o.prototype,p=i("species"),h=!1,y=a(r.PromiseRejectionEvent),g=n("Promise",function(){var m=e(o),M=m!==String(o);if(!M&&d===66||f&&!(v.catch&&v.finally))return!0;if(!d||d<51||!/native code/.test(m)){var E=new o(function(S){S(1)}),O=function(S){S(function(){},function(){})},I=E.constructor={};if(I[p]=O,h=E.then(function(){})instanceof O,!h)return!0}return!M&&(u||l)&&!y});s.exports={CONSTRUCTOR:g,REJECTION_EVENT:y,SUBCLASSING:h}},51060:function(s,c,t){var r=t(2241);s.exports=r.Promise},23256:function(s,c,t){var r=t(23825),o=t(22796),a=t(76161);s.exports=function(n,e){if(r(n),o(e)&&e.constructor===n)return e;var i=a.f(n),u=i.resolve;return u(e),i.promise}},64795:function(s,c,t){var r=t(51060),o=t(29742),a=t(64866).CONSTRUCTOR;s.exports=a||!o(function(n){r.all(n).then(void 0,function(){})})},10730:function(s,c,t){var r=t(65519).f;s.exports=function(o,a,n){n in o||r(o,n,{configurable:!0,get:function(){return a[n]},set:function(e){a[n]=e}})}},35079:function(s){var c=function(){this.head=null,this.tail=null};c.prototype={add:function(t){var r={item:t,next:null};this.head?this.tail.next=r:this.head=r,this.tail=r},get:function(){var t=this.head;if(t)return this.head=t.next,this.tail===t&&(this.tail=null),t.item}},s.exports=c},89536:function(s,c,t){var r=t(88139),o=t(23825),a=t(53687),n=t(96282),e=t(88981),i=TypeError;s.exports=function(u,l){var f=u.exec;if(a(f)){var d=r(f,u,l);return d!==null&&o(d),d}if(n(u)==="RegExp")return r(e,u,l);throw i("RegExp#exec called on incompatible receiver")}},88981:function(s,c,t){"use strict";var r=t(88139),o=t(17310),a=t(32025),n=t(17361),e=t(74215),i=t(25059),u=t(598),l=t(80359).get,f=t(36105),d=t(74300),v=i("native-string-replace",String.prototype.replace),p=RegExp.prototype.exec,h=p,y=o("".charAt),g=o("".indexOf),m=o("".replace),M=o("".slice),E=function(){var x=/a/,T=/b*/g;return r(p,x,"a"),r(p,T,"a"),x.lastIndex!==0||T.lastIndex!==0}(),O=e.BROKEN_CARET,I=/()??/.exec("")[1]!==void 0,S=E||I||O||f||d;S&&(h=function(T){var N=this,A=l(N),D=a(T),B=A.raw,H,Y,z,P,b,R,L;if(B)return B.lastIndex=N.lastIndex,H=r(h,B,D),N.lastIndex=B.lastIndex,H;var C=A.groups,j=O&&N.sticky,U=r(n,N),w=N.source,X=0,K=D;if(j&&(U=m(U,"y",""),g(U,"g")===-1&&(U+="g"),K=M(D,N.lastIndex),N.lastIndex>0&&(!N.multiline||N.multiline&&y(D,N.lastIndex-1)!==` -`)&&(w="(?: "+w+")",K=" "+K,X++),Y=new RegExp("^(?:"+w+")",U)),I&&(Y=new RegExp("^"+w+"$(?!\\s)",U)),E&&(z=N.lastIndex),P=r(p,j?Y:N,K),j?P?(P.input=M(P.input,X),P[0]=M(P[0],X),P.index=N.lastIndex,N.lastIndex+=P[0].length):N.lastIndex=0:E&&P&&(N.lastIndex=N.global?P.index+P[0].length:z),I&&P&&P.length>1&&r(v,P[0],Y,function(){for(b=1;bb)","g");return n.exec("b").groups.a!=="b"||"b".replace(n,"$c")!=="bc"})},62924:function(s,c,t){var r=t(59899),o=TypeError;s.exports=function(a){if(r(a))throw o("Can't call method on "+a);return a}},20288:function(s){s.exports=Object.is||function(t,r){return t===r?t!==0||1/t===1/r:t!=t&&r!=r}},57935:function(s,c,t){"use strict";var r=t(23893),o=t(65519),a=t(56045),n=t(87650),e=a("species");s.exports=function(i){var u=r(i),l=o.f;n&&u&&!u[e]&&l(u,e,{configurable:!0,get:function(){return this}})}},5961:function(s,c,t){var r=t(65519).f,o=t(8103),a=t(56045),n=a("toStringTag");s.exports=function(e,i,u){e&&!u&&(e=e.prototype),e&&!o(e,n)&&r(e,n,{configurable:!0,value:i})}},48189:function(s,c,t){var r=t(25059),o=t(89198),a=r("keys");s.exports=function(n){return a[n]||(a[n]=o(n))}},66675:function(s,c,t){var r=t(2241),o=t(36011),a="__core-js_shared__",n=r[a]||o(a,{});s.exports=n},25059:function(s,c,t){var r=t(43937),o=t(66675);(s.exports=function(a,n){return o[a]||(o[a]=n!==void 0?n:{})})("versions",[]).push({version:"3.26.0",mode:r?"pure":"global",copyright:"\xA9 2014-2022 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.26.0/LICENSE",source:"https://github.com/zloirock/core-js"})},67311:function(s,c,t){var r=t(23825),o=t(69202),a=t(59899),n=t(56045),e=n("species");s.exports=function(i,u){var l=r(i).constructor,f;return l===void 0||a(f=r(l)[e])?u:o(f)}},22093:function(s,c,t){var r=t(17310),o=t(19633),a=t(32025),n=t(62924),e=r("".charAt),i=r("".charCodeAt),u=r("".slice),l=function(f){return function(d,v){var p=a(n(d)),h=o(v),y=p.length,g,m;return h<0||h>=y?f?"":void 0:(g=i(p,h),g<55296||g>56319||h+1===y||(m=i(p,h+1))<56320||m>57343?f?e(p,h):g:f?u(p,h,h+2):(g-55296<<10)+(m-56320)+65536)}};s.exports={codeAt:l(!1),charAt:l(!0)}},93464:function(s,c,t){var r=t(26164).PROPER,o=t(9805),a=t(51042),n="\u200B\x85\u180E";s.exports=function(e){return o(function(){return!!a[e]()||n[e]()!==n||r&&a[e].name!==e})}},1188:function(s,c,t){var r=t(17310),o=t(62924),a=t(32025),n=t(51042),e=r("".replace),i="["+n+"]",u=RegExp("^"+i+i+"*"),l=RegExp(i+i+"*$"),f=function(d){return function(v){var p=a(o(v));return d&1&&(p=e(p,u,"")),d&2&&(p=e(p,l,"")),p}};s.exports={start:f(1),end:f(2),trim:f(3)}},49993:function(s,c,t){var r=t(20670),o=t(9805);s.exports=!!Object.getOwnPropertySymbols&&!o(function(){var a=Symbol();return!String(a)||!(Object(a)instanceof Symbol)||!Symbol.sham&&r&&r<41})},78772:function(s,c,t){var r=t(88139),o=t(23893),a=t(56045),n=t(31478);s.exports=function(){var e=o("Symbol"),i=e&&e.prototype,u=i&&i.valueOf,l=a("toPrimitive");i&&!i[l]&&n(i,l,function(f){return r(u,this)},{arity:1})}},31262:function(s,c,t){var r=t(49993);s.exports=r&&!!Symbol.for&&!!Symbol.keyFor},38451:function(s,c,t){var r=t(2241),o=t(19191),a=t(30510),n=t(53687),e=t(8103),i=t(9805),u=t(55135),l=t(4158),f=t(51589),d=t(70518),v=t(99477),p=t(26146),h=r.setImmediate,y=r.clearImmediate,g=r.process,m=r.Dispatch,M=r.Function,E=r.MessageChannel,O=r.String,I=0,S={},x="onreadystatechange",T,N,A,D;try{T=r.location}catch{}var B=function(P){if(e(S,P)){var b=S[P];delete S[P],b()}},H=function(P){return function(){B(P)}},Y=function(P){B(P.data)},z=function(P){r.postMessage(O(P),T.protocol+"//"+T.host)};(!h||!y)&&(h=function(b){d(arguments.length,1);var R=n(b)?b:M(b),L=l(arguments,1);return S[++I]=function(){o(R,void 0,L)},N(I),I},y=function(b){delete S[b]},p?N=function(P){g.nextTick(H(P))}:m&&m.now?N=function(P){m.now(H(P))}:E&&!v?(A=new E,D=A.port2,A.port1.onmessage=Y,N=a(D.postMessage,D)):r.addEventListener&&n(r.postMessage)&&!r.importScripts&&T&&T.protocol!=="file:"&&!i(z)?(N=z,r.addEventListener("message",Y,!1)):x in f("script")?N=function(P){u.appendChild(f("script"))[x]=function(){u.removeChild(this),B(P)}}:N=function(P){setTimeout(H(P),0)}),s.exports={set:h,clear:y}},73908:function(s,c,t){var r=t(19633),o=Math.max,a=Math.min;s.exports=function(n,e){var i=r(n);return i<0?o(i+e,0):a(i,e)}},86696:function(s,c,t){var r=t(23847),o=TypeError;s.exports=function(a){var n=r(a,"number");if(typeof n=="number")throw o("Can't convert number to bigint");return BigInt(n)}},63858:function(s,c,t){var r=t(19633),o=t(44664),a=RangeError;s.exports=function(n){if(n===void 0)return 0;var e=r(n),i=o(e);if(e!==i)throw a("Wrong length or index");return i}},83043:function(s,c,t){var r=t(27181),o=t(62924);s.exports=function(a){return r(o(a))}},19633:function(s,c,t){var r=t(62963);s.exports=function(o){var a=+o;return a!==a||a===0?0:r(a)}},44664:function(s,c,t){var r=t(19633),o=Math.min;s.exports=function(a){return a>0?o(r(a),9007199254740991):0}},98479:function(s,c,t){var r=t(62924),o=Object;s.exports=function(a){return o(r(a))}},96311:function(s,c,t){var r=t(52160),o=RangeError;s.exports=function(a,n){var e=r(a);if(e%n)throw o("Wrong offset");return e}},52160:function(s,c,t){var r=t(19633),o=RangeError;s.exports=function(a){var n=r(a);if(n<0)throw o("The argument can't be less than 0");return n}},23847:function(s,c,t){var r=t(88139),o=t(22796),a=t(13555),n=t(27624),e=t(85096),i=t(56045),u=TypeError,l=i("toPrimitive");s.exports=function(f,d){if(!o(f)||a(f))return f;var v=n(f,l),p;if(v){if(d===void 0&&(d="default"),p=r(v,f,d),!o(p)||a(p))return p;throw u("Can't convert object to primitive value")}return d===void 0&&(d="number"),e(f,d)}},30859:function(s,c,t){var r=t(23847),o=t(13555);s.exports=function(a){var n=r(a,"string");return o(n)?n:n+""}},39902:function(s,c,t){var r=t(56045),o=r("toStringTag"),a={};a[o]="z",s.exports=String(a)==="[object z]"},32025:function(s,c,t){var r=t(19453),o=String;s.exports=function(a){if(r(a)==="Symbol")throw TypeError("Cannot convert a Symbol value to a string");return o(a)}},72317:function(s){var c=String;s.exports=function(t){try{return c(t)}catch{return"Object"}}},19869:function(s,c,t){"use strict";var r=t(50008),o=t(2241),a=t(88139),n=t(87650),e=t(5775),i=t(9610),u=t(82708),l=t(42201),f=t(87670),d=t(1537),v=t(90973),p=t(44664),h=t(63858),y=t(96311),g=t(30859),m=t(8103),M=t(19453),E=t(22796),O=t(13555),I=t(598),S=t(86275),x=t(79309),T=t(81602).f,N=t(98705),A=t(68999).forEach,D=t(57935),B=t(65519),H=t(47661),Y=t(80359),z=t(92929),P=Y.get,b=Y.set,R=Y.enforce,L=B.f,C=H.f,j=Math.round,U=o.RangeError,w=u.ArrayBuffer,X=w.prototype,K=u.DataView,ut=i.NATIVE_ARRAY_BUFFER_VIEWS,it=i.TYPED_ARRAY_TAG,ct=i.TypedArray,at=i.TypedArrayPrototype,_=i.aTypedArrayConstructor,vt=i.isTypedArray,dt="BYTES_PER_ELEMENT",ht="Wrong length",Ot=function(Nt,It){_(Nt);for(var Tt=0,J=It.length,lt=new Nt(J);J>Tt;)lt[Tt]=It[Tt++];return lt},St=function(Nt,It){L(Nt,It,{get:function(){return P(this)[It]}})},Pt=function(Nt){var It;return S(X,Nt)||(It=M(Nt))=="ArrayBuffer"||It=="SharedArrayBuffer"},Mt=function(Nt,It){return vt(Nt)&&!O(It)&&It in Nt&&v(+It)&&It>=0},Et=function(It,Tt){return Tt=g(Tt),Mt(It,Tt)?f(2,It[Tt]):C(It,Tt)},Ct=function(It,Tt,J){return Tt=g(Tt),Mt(It,Tt)&&E(J)&&m(J,"value")&&!m(J,"get")&&!m(J,"set")&&!J.configurable&&(!m(J,"writable")||J.writable)&&(!m(J,"enumerable")||J.enumerable)?(It[Tt]=J.value,It):L(It,Tt,J)};n?(ut||(H.f=Et,B.f=Ct,St(at,"buffer"),St(at,"byteOffset"),St(at,"byteLength"),St(at,"length")),r({target:"Object",stat:!0,forced:!ut},{getOwnPropertyDescriptor:Et,defineProperty:Ct}),s.exports=function(Nt,It,Tt){var J=Nt.match(/\d+$/)[0]/8,lt=Nt+(Tt?"Clamped":"")+"Array",F="get"+Nt,Z="set"+Nt,et=o[lt],k=et,ft=k&&k.prototype,mt={},yt=function(W,Q){var nt=P(W);return nt.view[F](Q*J+nt.byteOffset,!0)},pt=function(W,Q,nt){var gt=P(W);Tt&&(nt=(nt=j(nt))<0?0:nt>255?255:nt&255),gt.view[Z](Q*J+gt.byteOffset,nt,!0)},st=function(W,Q){L(W,Q,{get:function(){return yt(this,Q)},set:function(nt){return pt(this,Q,nt)},enumerable:!0})};ut?e&&(k=It(function(W,Q,nt,gt){return l(W,ft),z(function(){return E(Q)?Pt(Q)?gt!==void 0?new et(Q,y(nt,J),gt):nt!==void 0?new et(Q,y(nt,J)):new et(Q):vt(Q)?Ot(k,Q):a(N,k,Q):new et(h(Q))}(),W,k)}),x&&x(k,ct),A(T(et),function(W){W in k||d(k,W,et[W])}),k.prototype=ft):(k=It(function(W,Q,nt,gt){l(W,ft);var Rt=0,jt=0,zt,Dt,Lt;if(!E(Q))Lt=h(Q),Dt=Lt*J,zt=new w(Dt);else if(Pt(Q)){zt=Q,jt=y(nt,J);var $t=Q.byteLength;if(gt===void 0){if($t%J||(Dt=$t-jt,Dt<0))throw U(ht)}else if(Dt=p(gt)*J,Dt+jt>$t)throw U(ht);Lt=Dt/J}else return vt(Q)?Ot(k,Q):a(N,k,Q);for(b(W,{buffer:zt,byteOffset:jt,byteLength:Dt,length:Lt,view:new K(zt)});Rt1?arguments[1]:void 0,E=M!==void 0,O=u(g),I,S,x,T,N,A,D,B;if(O&&!l(O))for(D=i(g,O),B=D.next,g=[];!(A=o(B,D)).done;)g.push(A.value);for(E&&m>2&&(M=r(M,arguments[2])),S=e(g),x=new(d(y))(S),T=f(x),I=0;S>I;I++)N=E?M(g[I],I):g[I],x[I]=T?v(N):+N;return x}},89198:function(s,c,t){var r=t(17310),o=0,a=Math.random(),n=r(1 .toString);s.exports=function(e){return"Symbol("+(e===void 0?"":e)+")_"+n(++o+a,36)}},59970:function(s,c,t){var r=t(49993);s.exports=r&&!Symbol.sham&&typeof Symbol.iterator=="symbol"},41628:function(s,c,t){var r=t(87650),o=t(9805);s.exports=r&&o(function(){return Object.defineProperty(function(){},"prototype",{value:42,writable:!1}).prototype!=42})},70518:function(s){var c=TypeError;s.exports=function(t,r){if(t=51||!o(function(){var E=[];return E[h]=!1,E.concat()[0]!==E}),g=d("concat"),m=function(E){if(!n(E))return!1;var O=E[h];return O!==void 0?!!O:a(E)},M=!y||!g;r({target:"Array",proto:!0,arity:1,forced:M},{concat:function(O){var I=e(this),S=f(I,0),x=0,T,N,A,D,B;for(T=-1,A=arguments.length;T1?arguments[1]:void 0;return i?e(this,f,d)||0:a(this,f,d)}})},37206:function(s,c,t){"use strict";var r=t(83043),o=t(14395),a=t(53787),n=t(80359),e=t(65519).f,i=t(48994),u=t(87707),l=t(43937),f=t(87650),d="Array Iterator",v=n.set,p=n.getterFor(d);s.exports=i(Array,"Array",function(y,g){v(this,{type:d,target:r(y),index:0,kind:g})},function(){var y=p(this),g=y.target,m=y.kind,M=y.index++;return!g||M>=g.length?(y.target=void 0,u(void 0,!0)):m=="keys"?u(M,!1):m=="values"?u(g[M],!1):u([M,g[M]],!1)},"values");var h=a.Arguments=a.Array;if(o("keys"),o("values"),o("entries"),!l&&f&&h.name!=="values")try{e(h,"name",{value:"values"})}catch{}},6580:function(s,c,t){"use strict";var r=t(50008),o=t(50006),a=t(70003),n=t(22796),e=t(73908),i=t(98732),u=t(83043),l=t(36906),f=t(56045),d=t(66783),v=t(4158),p=d("slice"),h=f("species"),y=Array,g=Math.max;r({target:"Array",proto:!0,forced:!p},{slice:function(M,E){var O=u(this),I=i(O),S=e(M,I),x=e(E===void 0?I:E,I),T,N,A;if(o(O)&&(T=O.constructor,a(T)&&(T===y||o(T.prototype))?T=void 0:n(T)&&(T=T[h],T===null&&(T=void 0)),T===y||T===void 0))return v(O,S,x);for(N=new(T===void 0?y:T)(g(x-S,0)),A=0;SO-T+x;A--)d(E,A-1)}else if(x>T)for(A=O-T;A>I;A--)D=A+T-1,B=A+x-1,D in E?E[B]=E[D]:d(E,B);for(A=0;A@^][^\s!#%&*+<=>@^]*>/,b=/a/g,R=/a/g,L=new T(b)!==b,C=p.MISSED_STICKY,j=p.UNSUPPORTED_Y,U=r&&(!L||C||I||S||g(function(){return R[x]=!1,T(b)!=b||T(R)==R||T(b,"i")!="/a/i"})),w=function(ct){for(var at=ct.length,_=0,vt="",dt=!1,ht;_<=at;_++){if(ht=B(ct,_),ht==="\\"){vt+=ht+B(ct,++_);continue}!dt&&ht==="."?vt+="[\\s\\S]":(ht==="["?dt=!0:ht==="]"&&(dt=!1),vt+=ht)}return vt},X=function(ct){for(var at=ct.length,_=0,vt="",dt=[],ht={},Ot=!1,St=!1,Pt=0,Mt="",Et;_<=at;_++){if(Et=B(ct,_),Et==="\\")Et=Et+B(ct,++_);else if(Et==="]")Ot=!1;else if(!Ot)switch(!0){case Et==="[":Ot=!0;break;case Et==="(":D(P,z(ct,_+1))&&(_+=2,St=!0),vt+=Et,Pt++;continue;case(Et===">"&&St):if(Mt===""||m(ht,Mt))throw new A("Invalid capture group name");ht[Mt]=!0,dt[dt.length]=[Mt,Pt],St=!1,Mt="";continue}St?Mt+=Et:vt+=Et}return[vt,dt]};if(n("RegExp",U)){for(var K=function(at,_){var vt=l(N,this),dt=f(at),ht=_===void 0,Ot=[],St=at,Pt,Mt,Et,Ct,Nt,It;if(!vt&&dt&&ht&&at.constructor===K)return at;if((dt||l(N,at))&&(at=at.source,ht&&(_=v(St))),at=at===void 0?"":d(at),_=_===void 0?"":d(_),St=at,I&&"dotAll"in b&&(Mt=!!_&&Y(_,"s")>-1,Mt&&(_=H(_,/s/g,""))),Pt=_,C&&"sticky"in b&&(Et=!!_&&Y(_,"y")>-1,Et&&j&&(_=H(_,/y/g,""))),S&&(Ct=X(at),at=Ct[0],Ot=Ct[1]),Nt=e(T(at,_),vt?this:N,K),(Mt||Et||Ot.length)&&(It=M(Nt),Mt&&(It.dotAll=!0,It.raw=K(w(at),Pt)),Et&&(It.sticky=!0),Ot.length&&(It.groups=Ot)),at!==St)try{i(Nt,"source",St===""?"(?:)":St)}catch{}return Nt},ut=u(T),it=0;ut.length>it;)h(K,T,ut[it++]);N.constructor=K,K.prototype=N,y(o,"RegExp",K,{constructor:!0})}E("RegExp")},85297:function(s,c,t){"use strict";var r=t(50008),o=t(88981);r({target:"RegExp",proto:!0,forced:/./.exec!==o},{exec:o})},15251:function(s,c,t){"use strict";var r=t(26164).PROPER,o=t(31478),a=t(23825),n=t(32025),e=t(9805),i=t(64492),u="toString",l=RegExp.prototype,f=l[u],d=e(function(){return f.call({source:"a",flags:"b"})!="/a/b"}),v=r&&f.name!=u;(d||v)&&o(RegExp.prototype,u,function(){var h=a(this),y=n(h.source),g=n(i(h));return"/"+y+"/"+g},{unsafe:!0})},30023:function(s,c,t){"use strict";var r=t(50008),o=t(17310),a=t(47661).f,n=t(44664),e=t(32025),i=t(26745),u=t(62924),l=t(17742),f=t(43937),d=o("".endsWith),v=o("".slice),p=Math.min,h=l("endsWith"),y=!f&&!h&&!!function(){var g=a(String.prototype,"endsWith");return g&&!g.writable}();r({target:"String",proto:!0,forced:!y&&!h},{endsWith:function(m){var M=e(u(this));i(m);var E=arguments.length>1?arguments[1]:void 0,O=M.length,I=E===void 0?O:p(n(E),O),S=e(m);return d?d(M,S,I):v(M,I-S.length,I)===S}})},51943:function(s,c,t){"use strict";var r=t(88139),o=t(6018),a=t(23825),n=t(59899),e=t(44664),i=t(32025),u=t(62924),l=t(27624),f=t(2911),d=t(89536);o("match",function(v,p,h){return[function(g){var m=u(this),M=n(g)?void 0:l(g,v);return M?r(M,g,m):new RegExp(g)[v](i(m))},function(y){var g=a(this),m=i(y),M=h(p,g,m);if(M.done)return M.value;if(!g.global)return d(g,m);var E=g.unicode;g.lastIndex=0;for(var O=[],I=0,S;(S=d(g,m))!==null;){var x=i(S[0]);O[I]=x,x===""&&(g.lastIndex=f(m,e(g.lastIndex),E)),I++}return I===0?null:O}]})},5706:function(s,c,t){"use strict";var r=t(19191),o=t(88139),a=t(17310),n=t(6018),e=t(9805),i=t(23825),u=t(53687),l=t(59899),f=t(19633),d=t(44664),v=t(32025),p=t(62924),h=t(2911),y=t(27624),g=t(22536),m=t(89536),M=t(56045),E=M("replace"),O=Math.max,I=Math.min,S=a([].concat),x=a([].push),T=a("".indexOf),N=a("".slice),A=function(Y){return Y===void 0?Y:String(Y)},D=function(){return"a".replace(/./,"$0")==="$0"}(),B=function(){return/./[E]?/./[E]("a","$0")==="":!1}(),H=!e(function(){var Y=/./;return Y.exec=function(){var z=[];return z.groups={a:"7"},z},"".replace(Y,"$")!=="7"});n("replace",function(Y,z,P){var b=B?"$":"$0";return[function(L,C){var j=p(this),U=l(L)?void 0:y(L,E);return U?o(U,L,j,C):o(z,v(j),L,C)},function(R,L){var C=i(this),j=v(R);if(typeof L=="string"&&T(L,b)===-1&&T(L,"$<")===-1){var U=P(z,C,j,L);if(U.done)return U.value}var w=u(L);w||(L=v(L));var X=C.global;if(X){var K=C.unicode;C.lastIndex=0}for(var ut=[];;){var it=m(C,j);if(it===null||(x(ut,it),!X))break;var ct=v(it[0]);ct===""&&(C.lastIndex=h(j,d(C.lastIndex),K))}for(var at="",_=0,vt=0;vt=_&&(at+=N(j,_,ht)+Et,_=ht+dt.length)}return at+N(j,_)}]},!H||!D||B)},34300:function(s,c,t){"use strict";var r=t(88139),o=t(6018),a=t(23825),n=t(59899),e=t(62924),i=t(20288),u=t(32025),l=t(27624),f=t(89536);o("search",function(d,v,p){return[function(y){var g=e(this),m=n(y)?void 0:l(y,d);return m?r(m,y,g):new RegExp(y)[d](u(g))},function(h){var y=a(this),g=u(h),m=p(v,y,g);if(m.done)return m.value;var M=y.lastIndex;i(M,0)||(y.lastIndex=0);var E=f(y,g);return i(y.lastIndex,M)||(y.lastIndex=M),E===null?-1:E.index}]})},27308:function(s,c,t){"use strict";var r=t(50008),o=t(1188).trim,a=t(93464);r({target:"String",proto:!0,forced:a("trim")},{trim:function(){return o(this)}})},82431:function(s,c,t){"use strict";var r=t(50008),o=t(2241),a=t(88139),n=t(17310),e=t(43937),i=t(87650),u=t(49993),l=t(9805),f=t(8103),d=t(86275),v=t(23825),p=t(83043),h=t(30859),y=t(32025),g=t(87670),m=t(598),M=t(27814),E=t(81602),O=t(95496),I=t(71351),S=t(47661),x=t(65519),T=t(60355),N=t(73311),A=t(31478),D=t(25059),B=t(48189),H=t(743),Y=t(89198),z=t(56045),P=t(98761),b=t(71629),R=t(78772),L=t(5961),C=t(80359),j=t(68999).forEach,U=B("hidden"),w="Symbol",X="prototype",K=C.set,ut=C.getterFor(w),it=Object[X],ct=o.Symbol,at=ct&&ct[X],_=o.TypeError,vt=o.QObject,dt=S.f,ht=x.f,Ot=O.f,St=N.f,Pt=n([].push),Mt=D("symbols"),Et=D("op-symbols"),Ct=D("wks"),Nt=!vt||!vt[X]||!vt[X].findChild,It=i&&l(function(){return m(ht({},"a",{get:function(){return ht(this,"a",{value:7}).a}})).a!=7})?function(mt,yt,pt){var st=dt(it,yt);st&&delete it[yt],ht(mt,yt,pt),st&&mt!==it&&ht(it,yt,st)}:ht,Tt=function(mt,yt){var pt=Mt[mt]=m(at);return K(pt,{type:w,tag:mt,description:yt}),i||(pt.description=yt),pt},J=function(yt,pt,st){yt===it&&J(Et,pt,st),v(yt);var ot=h(pt);return v(st),f(Mt,ot)?(st.enumerable?(f(yt,U)&&yt[U][ot]&&(yt[U][ot]=!1),st=m(st,{enumerable:g(0,!1)})):(f(yt,U)||ht(yt,U,g(1,{})),yt[U][ot]=!0),It(yt,ot,st)):ht(yt,ot,st)},lt=function(yt,pt){v(yt);var st=p(pt),ot=M(st).concat(ft(st));return j(ot,function(W){(!i||a(Z,st,W))&&J(yt,W,st[W])}),yt},F=function(yt,pt){return pt===void 0?m(yt):lt(m(yt),pt)},Z=function(yt){var pt=h(yt),st=a(St,this,pt);return this===it&&f(Mt,pt)&&!f(Et,pt)?!1:st||!f(this,pt)||!f(Mt,pt)||f(this,U)&&this[U][pt]?st:!0},et=function(yt,pt){var st=p(yt),ot=h(pt);if(!(st===it&&f(Mt,ot)&&!f(Et,ot))){var W=dt(st,ot);return W&&f(Mt,ot)&&!(f(st,U)&&st[U][ot])&&(W.enumerable=!0),W}},k=function(yt){var pt=Ot(p(yt)),st=[];return j(pt,function(ot){!f(Mt,ot)&&!f(H,ot)&&Pt(st,ot)}),st},ft=function(mt){var yt=mt===it,pt=Ot(yt?Et:p(mt)),st=[];return j(pt,function(ot){f(Mt,ot)&&(!yt||f(it,ot))&&Pt(st,Mt[ot])}),st};u||(ct=function(){if(d(at,this))throw _("Symbol is not a constructor");var yt=!arguments.length||arguments[0]===void 0?void 0:y(arguments[0]),pt=Y(yt),st=function(ot){this===it&&a(st,Et,ot),f(this,U)&&f(this[U],pt)&&(this[U][pt]=!1),It(this,pt,g(1,ot))};return i&&Nt&&It(it,pt,{configurable:!0,set:st}),Tt(pt,yt)},at=ct[X],A(at,"toString",function(){return ut(this).tag}),A(ct,"withoutSetter",function(mt){return Tt(Y(mt),mt)}),N.f=Z,x.f=J,T.f=lt,S.f=et,E.f=O.f=k,I.f=ft,P.f=function(mt){return Tt(z(mt),mt)},i&&(ht(at,"description",{configurable:!0,get:function(){return ut(this).description}}),e||A(it,"propertyIsEnumerable",Z,{unsafe:!0}))),r({global:!0,constructor:!0,wrap:!0,forced:!u,sham:!u},{Symbol:ct}),j(M(Ct),function(mt){b(mt)}),r({target:w,stat:!0,forced:!u},{useSetter:function(){Nt=!0},useSimple:function(){Nt=!1}}),r({target:"Object",stat:!0,forced:!u,sham:!i},{create:F,defineProperty:J,defineProperties:lt,getOwnPropertyDescriptor:et}),r({target:"Object",stat:!0,forced:!u},{getOwnPropertyNames:k}),R(),L(ct,w),H[U]=!0},30945:function(s,c,t){"use strict";var r=t(50008),o=t(87650),a=t(2241),n=t(17310),e=t(8103),i=t(53687),u=t(86275),l=t(32025),f=t(65519).f,d=t(51810),v=a.Symbol,p=v&&v.prototype;if(o&&i(v)&&(!("description"in p)||v().description!==void 0)){var h={},y=function(){var x=arguments.length<1||arguments[0]===void 0?void 0:l(arguments[0]),T=u(p,this)?new v(x):x===void 0?v():v(x);return x===""&&(h[T]=!0),T};d(y,v),y.prototype=p,p.constructor=y;var g=String(v("test"))=="Symbol(test)",m=n(p.valueOf),M=n(p.toString),E=/^Symbol\((.*)\)[^)]+$/,O=n("".replace),I=n("".slice);f(p,"description",{configurable:!0,get:function(){var x=m(this);if(e(h,x))return"";var T=M(x),N=g?I(T,7,-1):O(T,E,"$1");return N===""?void 0:N}}),r({global:!0,constructor:!0,forced:!0},{Symbol:y})}},76304:function(s,c,t){var r=t(50008),o=t(23893),a=t(8103),n=t(32025),e=t(25059),i=t(31262),u=e("string-to-symbol-registry"),l=e("symbol-to-string-registry");r({target:"Symbol",stat:!0,forced:!i},{for:function(f){var d=n(f);if(a(u,d))return u[d];var v=o("Symbol")(d);return u[d]=v,l[v]=d,v}})},45981:function(s,c,t){t(82431),t(76304),t(17186),t(41676),t(13471)},17186:function(s,c,t){var r=t(50008),o=t(8103),a=t(13555),n=t(72317),e=t(25059),i=t(31262),u=e("symbol-to-string-registry");r({target:"Symbol",stat:!0,forced:!i},{keyFor:function(f){if(!a(f))throw TypeError(n(f)+" is not a symbol");if(o(u,f))return u[f]}})},7482:function(s,c,t){"use strict";var r=t(9610),o=t(41931),a=t(86696),n=t(19453),e=t(88139),i=t(17310),u=t(9805),l=r.aTypedArray,f=r.exportTypedArrayMethod,d=i("".slice),v=u(function(){var p=0;return new Int8Array(2).fill({valueOf:function(){return p++}}),p!==1});f("fill",function(h){var y=arguments.length;l(this);var g=d(n(this),0,3)==="Big"?a(h):+h;return e(o,this,g,y>1?arguments[1]:void 0,y>2?arguments[2]:void 0)},v)},11878:function(s,c,t){"use strict";var r=t(9610),o=t(97783).includes,a=r.aTypedArray,n=r.exportTypedArrayMethod;n("includes",function(i){return o(a(this),i,arguments.length>1?arguments[1]:void 0)})},83717:function(s,c,t){"use strict";var r=t(2241),o=t(9805),a=t(17310),n=t(9610),e=t(37206),i=t(56045),u=i("iterator"),l=r.Uint8Array,f=a(e.values),d=a(e.keys),v=a(e.entries),p=n.aTypedArray,h=n.exportTypedArrayMethod,y=l&&l.prototype,g=!o(function(){y[u].call([1])}),m=!!y&&y.values&&y[u]===y.values&&y.values.name==="values",M=function(){return f(p(this))};h("entries",function(){return v(p(this))},g),h("keys",function(){return d(p(this))},g),h("values",M,g||!m,{name:"values"}),h(u,M,g||!m,{name:"values"})},23343:function(s,c,t){"use strict";var r=t(2241),o=t(88139),a=t(9610),n=t(98732),e=t(96311),i=t(98479),u=t(9805),l=r.RangeError,f=r.Int8Array,d=f&&f.prototype,v=d&&d.set,p=a.aTypedArray,h=a.exportTypedArrayMethod,y=!u(function(){var m=new Uint8ClampedArray(2);return o(v,m,{length:1,0:3},1),m[1]!==3}),g=y&&a.NATIVE_ARRAY_BUFFER_VIEWS&&u(function(){var m=new f(2);return m.set(1),m.set("2",1),m[0]!==0||m[1]!==2});h("set",function(M){p(this);var E=e(arguments.length>1?arguments[1]:void 0,1),O=i(M);if(y)return o(v,this,O,E);var I=this.length,S=n(O),x=0;if(S+E>I)throw l("Wrong length");for(;x0&&1/I<0?1:-1:O>I}};p("sort",function(O){return O!==void 0&&n(O),m?y(this,O):e(v(this),M(O))},!m||g)},45203:function(s,c,t){"use strict";var r=t(2241),o=t(19191),a=t(9610),n=t(9805),e=t(4158),i=r.Int8Array,u=a.aTypedArray,l=a.exportTypedArrayMethod,f=[].toLocaleString,d=!!i&&n(function(){f.call(new i(1))}),v=n(function(){return[1,2].toLocaleString()!=new i([1,2]).toLocaleString()})||!n(function(){i.prototype.toLocaleString.call([1,2])});l("toLocaleString",function(){return o(f,d?e(u(this)):u(this),e(arguments))},v)},46558:function(s,c,t){"use strict";var r=t(9610).exportTypedArrayMethod,o=t(9805),a=t(2241),n=t(17310),e=a.Uint8Array,i=e&&e.prototype||{},u=[].toString,l=n([].join);o(function(){u.call({})})&&(u=function(){return l(this)});var f=i.toString!=u;r("toString",u,f)},51811:function(s,c,t){var r=t(19869);r("Uint8",function(o){return function(n,e,i){return o(this,n,e,i)}})},56394:function(s,c,t){var r=t(2241),o=t(95438),a=t(91474),n=t(59693),e=t(1537),i=function(l){if(l&&l.forEach!==n)try{e(l,"forEach",n)}catch{l.forEach=n}};for(var u in o)o[u]&&i(r[u]&&r[u].prototype);i(a)},30491:function(s,c,t){var r=t(2241),o=t(95438),a=t(91474),n=t(37206),e=t(1537),i=t(56045),u=i("iterator"),l=i("toStringTag"),f=n.values,d=function(p,h){if(p){if(p[u]!==f)try{e(p,u,f)}catch{p[u]=f}if(p[l]||e(p,l,h),o[h]){for(var y in n)if(p[y]!==n[y])try{e(p,y,n[y])}catch{p[y]=n[y]}}}};for(var v in o)d(r[v]&&r[v].prototype,v);d(a,"DOMTokenList")},54611:function(s,c,t){"use strict";t.r(c)},92355:function(s,c,t){"use strict";t.r(c)},19873:function(s,c,t){"use strict";var r=t(13523);Object.defineProperty(c,"B",{value:!0}),c.A=void 0,t(24281),t(41568),t(68147),t(1002);var o=r(t(83866)),a=t(22771),n=c.A={mixins:[a.localeMixins],props:{hasPermission:{type:Boolean},resourceType:{type:String,default:""},resourceCode:{type:String,default:""},projectCode:{type:String,default:""},ajaxPrefix:{type:String,default:""}},emits:["open-manage"],data(){return{isOpenManageLoading:!1}},computed:{title(){var e={pipeline:this.t("\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD"),pipeline_group:this.t("\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650")};return e[this.resourceType]}},methods:{openManage(){var e=this;return this.isOpenManageLoading=!0,o.default.put("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/enable")).then(function(){e.$emit("open-manage")}).finally(function(){e.isOpenManageLoading=!1})}}}},91029:function(s,c,t){"use strict";var r=t(13523);Object.defineProperty(c,"B",{value:!0}),c.A=void 0,t(24281),t(52399),t(50361),t(67875),t(41568),t(66713),t(68147),t(1002),t(91438);var o=r(t(83866)),a=t(22771),n=c.A={mixins:[a.localeMixins],props:{isShow:{type:Boolean},groupName:{type:String},groupId:{type:String},expiredDisplay:{type:String},title:{type:String},type:{type:String,default:"apply"},resourceType:{type:String},ajaxPrefix:{type:String,default:""},projectCode:{type:String,default:""}},emits:["update:show"],data(){var e=this,i=this;return{isLoading:!1,pagination:{page:1,pageSize:20,projectName:""},customTime:1,formData:{expireTime:0,reason:""},currentActive:2592e3,timeFilters:{2592e3:i.t("1\u4E2A\u6708"),7776e3:i.t("3\u4E2A\u6708"),15552e3:i.t("6\u4E2A\u6708"),31104e3:i.t("12\u4E2A\u6708")},rules:{expireTime:[{validator:function(){return e.currentActive==="custom"&&e.customTime?!0:e.currentActive!=="custom"},message:i.t("\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650"),trigger:"blur"}],reason:[{required:!0,message:i.t("\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531"),trigger:"blur"}]}}},computed:{userName(){return this.$userInfo&&this.$userInfo.username?this.$userInfo.username:""},projectId(){return this.$route.params.projectId},newExpiredDisplay(){var e={2592e3:30,7776e3:90,15552e3:180,31104e3:360};return this.currentActive==="custom"?Number(this.expiredDisplay)+Number(this.customTime):Number(this.expiredDisplay)+e[this.currentActive]}},created(){this.formData.expireTime=this.formatTimes(2592e3),this.projectCode&&(this.formData.englishName=this.projectCode),this.type==="apply"&&(this.formData.reason="")},methods:{handleConfirm(){if(this.currentActive==="custom"){var e=this.customTime*24*3600;this.formData.expireTime=this.formatTimes(e)}if(this.type==="renewal"){var i=this.newExpiredDisplay*24*3600,u=this.formatTimes(i);this.formData.expireTime=u,this.handleRenewalGroup()}else this.handleApplyGroup()},handleCancel(){var e=this;this.$emit("cancel"),this.customTime=1,this.formData.expireTime=this.formatTimes(2592e3),this.formData.reason="",this.currentActive=2592e3,setTimeout(function(){e.$refs.applyFrom.clearError()},500)},handleChangeCustomTime(e){var i=this;/^[0-9]*$/.test(e)?this.customTime>365&&this.$nextTick(function(){i.customTime=365}):this.$nextTick(function(){i.customTime=1})},handleChangeTime(e){this.$refs.applyFrom.clearError(),this.currentActive=Number(e),this.formData.expireTime=this.formatTimes(e)},handleChangCustom(){this.currentActive="custom"},formatTimes(e){var i=+new Date/1e3,u=String(i).split(""),l=u.findIndex(function(d){return d==="."}),f=parseInt(u.splice(0,l).join(""),10);return Number(e)+f},handleApplyGroup(){var e=this;this.$refs.applyFrom.validate().then(function(){e.isLoading=!0,o.default.post("".concat(e.ajaxPrefix,"/auth/api/user/auth/apply/applyToJoinGroup"),{groupIds:[e.groupId],expiredAt:e.formData.expireTime,reason:e.formData.reason,applicant:e.userName,projectCode:e.projectCode}).then(function(){e.$bkMessage({theme:"success",message:e.t("\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279")})}).catch(function(i){e.$bkMessage({theme:"error",message:i.message})}).finally(function(){e.isLoading=!1,e.handleCancel()})})},handleRenewalGroup(){var e=this;this.isLoading=!0,o.default.put("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.groupId,"/member/renewal"),{expiredAt:this.formData.expireTime,projectId:this.projectId,resourceType:this.resourceType}).then(function(){e.$bkMessage({theme:"success",message:e.t("\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279")})}).catch(function(i){e.$bkMessage({theme:"error",message:i.message})}).finally(function(){e.isLoading=!1,e.handleCancel()})}}}},25820:function(s,c,t){"use strict";var r=t(13523);Object.defineProperty(c,"B",{value:!0}),c.A=void 0,t(24281),t(41568),t(68147),t(1002);var o=r(t(83866)),a=r(t(2334)),n=r(t(41651)),e=r(t(1117)),i=r(t(17263)),u=t(22771),l=function(){return{isShow:!1,groupName:"",groupId:"",expiredDisplay:"",title:"",type:""}},f=c.A={components:{ApplyDialog:a.default},mixins:[u.localeMixins],props:{resourceType:{type:String,default:""},resourceCode:{type:String,default:""},projectCode:{type:String,default:""},ajaxPrefix:{type:String,default:""}},data(){return{showDetail:!1,logout:{loading:!1,isShow:!1,groupId:"",name:""},apply:l(),memberList:[],isLoading:!1,isDetailLoading:!1,groupPolicies:[],groupName:""}},computed:{permissionTitle(){var d={pipeline:this.t("\u6D41\u6C34\u7EBF\u7BA1\u7406"),pipeline_template:this.t("\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406"),pipeline_group:this.t("\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406")};return d[this.resourceType]}},mounted(){this.getMemberList()},methods:{handleHidden(){this.showDetail=!1},getMemberList(){var d=this;return this.isLoading=!0,o.default.get("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/groupMember")).then(function(v){d.memberList=v.data}).catch(function(v){d.$bkMessage({theme:"error",message:v.message||v})}).finally(function(){d.isLoading=!1})},handleViewDetail(d){var v=this,p=d.groupId,h=d.groupName;this.groupName=h,this.showDetail=!0,this.isDetailLoading=!0,o.default.get("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(p,"/groupPolicies")).then(function(y){var g=y.data;v.groupPolicies=g}).catch(function(y){v.$bkMessage({theme:"error",message:y.message||y})}).finally(function(){v.isDetailLoading=!1})},statusFormatter(d){var v={NOT_JOINED:this.t("\u672A\u52A0\u5165"),NORMAL:this.t("\u6B63\u5E38"),EXPIRED:this.t("\u5DF2\u8FC7\u671F")};return v[d]},statusIcon(d){var v={NOT_JOINED:n.default,NORMAL:e.default,EXPIRED:i.default};return v[d]},handleRenewal(d){this.apply.isShow=!0,this.apply.groupName=d.groupName,this.apply.groupId=d.groupId,this.apply.expiredDisplay=d.expiredDisplay,this.apply.title=this.t("\u7EED\u671F"),this.apply.type="renewal"},handleApply(d){this.apply.isShow=!0,this.apply.groupName=d.groupName,this.apply.groupId=d.groupId,this.apply.title=this.t("\u7533\u8BF7\u52A0\u5165"),this.apply.type="apply"},handleShowLogout(d){this.logout.isShow=!0,this.logout.groupId=d.groupId,this.logout.name=d.groupName},handleCancelLogout(){this.logout.isShow=!1},handleLogout(){var d=this;return this.logout.loading=!0,o.default.delete("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.logout.groupId,"/member")).then(function(){d.handleCancelLogout(),d.getMemberList()}).catch(function(v){d.$bkMessage({theme:"error",message:v.message||v})}).finally(function(){d.logout.loading=!1})}}}},6453:function(s,c,t){"use strict";var r=t(13523);Object.defineProperty(c,"B",{value:!0}),c.A=void 0;var o=r(t(27382)),a=r(t(49130)),n=c.A={props:{title:{type:String,default:""},resourceType:{type:String,default:""},resourceCode:{type:String,default:""},projectCode:{type:String,default:""},ajaxPrefix:{type:String,default:""}},computed:{renderComponent(){return this.resourceType==="project"?a.default:o.default}}}},5882:function(s,c,t){"use strict";Object.defineProperty(c,"B",{value:!0}),c.A=void 0;var r=t(22771),o=c.A={mixins:[r.localeMixins]}},78776:function(s,c,t){"use strict";var r=t(13523);Object.defineProperty(c,"B",{value:!0}),c.A=void 0,t(24281),t(68215),t(94362),t(52399),t(18091),t(41568),t(68147),t(1002),t(91438),t(66483),t(94216),t(81993);var o=r(t(11546)),a=r(t(3870)),n=r(t(83866)),e=t(22771),i=c.A={components:{ScrollLoadList:a.default},mixins:[e.localeMixins],props:{activeIndex:{type:Boolean,default:0},resourceType:{type:String,default:""},resourceCode:{type:String,default:""},resourceName:{type:String,default:""},projectCode:{type:String,default:""},showCreateGroup:{type:Boolean,default:!0},ajaxPrefix:{type:String,default:""}},emits:["choose-group","create-group","close-manage"],data(){return{page:1,activeTab:"",deleteObj:{group:{},isShow:!1,isLoading:!1},closeObj:{isShow:!1,isLoading:!1},groupList:[],hasLoadEnd:!1,isClosing:!1,curGroupIndex:-1}},watch:{activeIndex(u){var l;this.activeTab=((l=this.groupList[u])===null||l===void 0?void 0:l.groupId)||""}},created(){var u=this;return(0,o.default)(regeneratorRuntime.mark(function l(){return regeneratorRuntime.wrap(function(d){for(;;)switch(d.prev=d.next){case 0:window.addEventListener("message",u.handleMessage);case 1:case"end":return d.stop()}},l)}))()},beforeUnmount(){window.removeEventListener("message",this.handleMessage)},methods:{handleGetData(u){var l=this;return n.default.get("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/listGroup?page=").concat(this.page,"&pageSize=").concat(u)).then(function(f){var d=f.data;if(l.hasLoadEnd=!d.hasNext,l.groupList.push(...d.records),l.page===1){var v=l.groupList.find(function(p){var h;return+p.groupId==+((h=l.$route.query)===null||h===void 0?void 0:h.groupId)})||l.groupList[0];l.handleChooseGroup(v)}l.page+=1})},refreshList(){return this.groupList=[],this.hasLoadEnd=!1,this.page=1,this.handleGetData(100)},handleShowDeleteGroup(u){this.deleteObj.group=u,this.deleteObj.isShow=!0},handleHiddenDeleteGroup(){this.deleteObj.isShow=!1,this.deleteObj.group={}},handleDeleteGroup(){var u=this;return this.deleteObj.isLoading=!0,n.default.delete("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/group/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.deleteObj.group.groupId)).then(function(){u.handleHiddenDeleteGroup(),u.refreshList()}).finally(function(){u.deleteObj.isLoading=!1})},handleChooseGroup(u){this.$router.replace({query:{groupId:u.groupId}}),this.activeTab=u.groupId,this.curGroupIndex=this.groupList.findIndex(function(l){return l.groupId===u.groupId}),this.$emit("choose-group",u)},handleCreateGroup(){this.activeTab="",this.$emit("create-group")},handleCloseManage(){var u=this;return this.isClosing=!0,n.default.put("".concat(this.ajaxPrefix,"/auth/api/user/auth/resource/").concat(this.projectCode,"/").concat(this.resourceType,"/").concat(this.resourceCode,"/disable")).then(function(){u.$emit("close-manage")}).finally(function(){u.isClosing=!1})},showCloseManageDialog(){this.closeObj.isShow=!0},handleHiddenCloseManage(){this.closeObj.isShow=!1},handleMessage(u){var l=this,f=u.data;if(f.type==="IAM")switch(f.code){case"create_user_group_submit":this.refreshList().then(function(){var p=l.groupList.find(function(h){var y;return h.groupId===(f==null||(y=f.data)===null||y===void 0?void 0:y.id)})||l.groupList[0];l.handleChooseGroup(p)});break;case"create_user_group_cancel":this.handleChooseGroup(this.groupList[0]);break;case"add_user_confirm":this.groupList[this.curGroupIndex].departmentCount+=f.data.departments.length,this.groupList[this.curGroupIndex].userCount+=f.data.users.length;break;case"remove_user_confirm":var d=f.data.members.filter(function(p){return p.type==="department"}),v=f.data.members.filter(function(p){return p.type==="user"});this.groupList[this.curGroupIndex].departmentCount-=d.length,this.groupList[this.curGroupIndex].userCount-=v.length;break;case"change_group_detail_tab":this.$emit("change-group-detail-tab",f.data.tab)}}}}},10680:function(s,c,t){"use strict";t(74780),t(68215),t(50939);var r=t(13523);Object.defineProperty(c,"B",{value:!0}),c.A=void 0;var o=r(t(18122));t(24281),t(18091),t(41568),t(43477),t(94216),t(63879),t(14583),t(21363);function a(i,u){var l=Object.keys(i);if(Object.getOwnPropertySymbols){var f=Object.getOwnPropertySymbols(i);u&&(f=f.filter(function(d){return Object.getOwnPropertyDescriptor(i,d).enumerable})),l.push.apply(l,f)}return l}function n(i){for(var u=1;ut.length)&&(r=t.length);for(var o=0,a=new Array(r);o=0)&&(!Object.prototype.propertyIsEnumerable.call(a,i)||(e[i]=a[i]))}return e}s.exports=o,s.exports.__esModule=!0,s.exports.default=s.exports},24350:function(s,c,t){t(60687);function r(o,a){if(o==null)return{};var n={},e=Object.keys(o),i,u;for(u=0;u=0)&&(n[i]=o[i]);return n}s.exports=r,s.exports.__esModule=!0,s.exports.default=s.exports},9194:function(s,c,t){var r=t(4456),o=t(91971),a=t(31249),n=t(74525);function e(i,u){return r(i)||o(i,u)||a(i,u)||n()}s.exports=e,s.exports.__esModule=!0,s.exports.default=s.exports},25072:function(s,c,t){t(10029),t(75153),t(67875);var r=t(30249).default;function o(a,n){if(r(a)!="object"||!a)return a;var e=a[Symbol.toPrimitive];if(e!==void 0){var i=e.call(a,n||"default");if(r(i)!="object")return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return(n==="string"?String:Number)(a)}s.exports=o,s.exports.__esModule=!0,s.exports.default=s.exports},17677:function(s,c,t){var r=t(30249).default,o=t(25072);function a(n){var e=o(n,"string");return r(e)=="symbol"?e:e+""}s.exports=a,s.exports.__esModule=!0,s.exports.default=s.exports},30249:function(s,c,t){t(74780),t(48932),t(18091),t(41568),t(94216);function r(o){return s.exports=r=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(a){return typeof a}:function(a){return a&&typeof Symbol=="function"&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a},s.exports.__esModule=!0,s.exports.default=s.exports,r(o)}s.exports=r,s.exports.__esModule=!0,s.exports.default=s.exports},31249:function(s,c,t){t(67845),t(80555),t(41568),t(91438),t(91402);var r=t(25708);function o(a,n){if(!!a){if(typeof a=="string")return r(a,n);var e=Object.prototype.toString.call(a).slice(8,-1);if(e==="Object"&&a.constructor&&(e=a.constructor.name),e==="Map"||e==="Set")return Array.from(a);if(e==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e))return r(a,n)}}s.exports=o,s.exports.__esModule=!0,s.exports.default=s.exports},62759:function(s,c,t){"use strict";var r=t(46050),o=t(81800),a=TypeError;s.exports=function(n){if(r(n))return n;throw new a(o(n)+" is not a function")}},56419:function(s,c,t){"use strict";var r=t(72868),o=t(81800),a=TypeError;s.exports=function(n){if(r(n))return n;throw new a(o(n)+" is not a constructor")}},97875:function(s,c,t){"use strict";var r=t(77850),o=String,a=TypeError;s.exports=function(n){if(r(n))return n;throw new a("Can't set "+o(n)+" as a prototype")}},73892:function(s,c,t){"use strict";var r=t(34800),o=t(42451),a=t(56516).f,n=r("unscopables"),e=Array.prototype;e[n]===void 0&&a(e,n,{configurable:!0,value:o(null)}),s.exports=function(i){e[n][i]=!0}},48528:function(s,c,t){"use strict";var r=t(19574).charAt;s.exports=function(o,a,n){return a+(n?r(o,a).length:1)}},31076:function(s,c,t){"use strict";var r=t(69808),o=TypeError;s.exports=function(a,n){if(r(n,a))return a;throw new o("Incorrect invocation")}},67800:function(s,c,t){"use strict";var r=t(33013),o=String,a=TypeError;s.exports=function(n){if(r(n))return n;throw new a(o(n)+" is not an object")}},11583:function(s,c,t){"use strict";var r=t(43316);s.exports=r(function(){if(typeof ArrayBuffer=="function"){var o=new ArrayBuffer(8);Object.isExtensible(o)&&Object.defineProperty(o,"a",{value:8})}})},19594:function(s,c,t){"use strict";var r=t(73614).forEach,o=t(14943),a=o("forEach");s.exports=a?[].forEach:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0)}},67189:function(s,c,t){"use strict";var r=t(38223),o=t(61186),a=t(28714),n=t(15354),e=t(48588),i=t(72868),u=t(42887),l=t(80639),f=t(21220),d=t(14496),v=Array;s.exports=function(h){var y=a(h),g=i(this),m=arguments.length,M=m>1?arguments[1]:void 0,E=M!==void 0;E&&(M=r(M,m>2?arguments[2]:void 0));var O=d(y),I=0,S,x,T,N,A,D;if(O&&!(this===v&&e(O)))for(x=g?new this:[],N=f(y,O),A=N.next;!(T=o(A,N)).done;I++)D=E?n(N,M,[T.value,I],!0):T.value,l(x,I,D);else for(S=u(y),x=g?new this(S):v(S);S>I;I++)D=E?M(y[I],I):y[I],l(x,I,D);return x.length=I,x}},42828:function(s,c,t){"use strict";var r=t(7222),o=t(32649),a=t(42887),n=function(e){return function(i,u,l){var f=r(i),d=a(f);if(d===0)return!e&&-1;var v=o(l,d),p;if(e&&u!==u){for(;d>v;)if(p=f[v++],p!==p)return!0}else for(;d>v;v++)if((e||v in f)&&f[v]===u)return e||v||0;return!e&&-1}};s.exports={includes:n(!0),indexOf:n(!1)}},73614:function(s,c,t){"use strict";var r=t(38223),o=t(26875),a=t(73034),n=t(28714),e=t(42887),i=t(16480),u=o([].push),l=function(f){var d=f===1,v=f===2,p=f===3,h=f===4,y=f===6,g=f===7,m=f===5||y;return function(M,E,O,I){for(var S=n(M),x=a(S),T=e(x),N=r(E,O),A=0,D=I||i,B=d?D(M,T):v||g?D(M,0):void 0,H,Y;T>A;A++)if((m||A in x)&&(H=x[A],Y=N(H,A,S),f))if(d)B[A]=Y;else if(Y)switch(f){case 3:return!0;case 5:return H;case 6:return A;case 2:u(B,H)}else switch(f){case 4:return!1;case 7:u(B,H)}return y?-1:p||h?h:B}};s.exports={forEach:l(0),map:l(1),filter:l(2),some:l(3),every:l(4),find:l(5),findIndex:l(6),filterReject:l(7)}},67240:function(s,c,t){"use strict";var r=t(43316),o=t(34800),a=t(5531),n=o("species");s.exports=function(e){return a>=51||!r(function(){var i=[],u=i.constructor={};return u[n]=function(){return{foo:1}},i[e](Boolean).foo!==1})}},14943:function(s,c,t){"use strict";var r=t(43316);s.exports=function(o,a){var n=[][o];return!!n&&r(function(){n.call(null,a||function(){return 1},1)})}},3803:function(s,c,t){"use strict";var r=t(62759),o=t(28714),a=t(73034),n=t(42887),e=TypeError,i="Reduce of empty array with no initial value",u=function(l){return function(f,d,v,p){var h=o(f),y=a(h),g=n(h);if(r(d),g===0&&v<2)throw new e(i);var m=l?g-1:0,M=l?-1:1;if(v<2)for(;;){if(m in y){p=y[m],m+=M;break}if(m+=M,l?m<0:g<=m)throw new e(i)}for(;l?m>=0:g>m;m+=M)m in y&&(p=d(p,y[m],m,h));return p}};s.exports={left:u(!1),right:u(!0)}},38802:function(s,c,t){"use strict";var r=t(80863),o=t(64921),a=TypeError,n=Object.getOwnPropertyDescriptor,e=r&&!function(){if(this!==void 0)return!0;try{Object.defineProperty([],"length",{writable:!1}).length=1}catch(i){return i instanceof TypeError}}();s.exports=e?function(i,u){if(o(i)&&!n(i,"length").writable)throw new a("Cannot set read only .length");return i.length=u}:function(i,u){return i.length=u}},63003:function(s,c,t){"use strict";var r=t(26875);s.exports=r([].slice)},10585:function(s,c,t){"use strict";var r=t(63003),o=Math.floor,a=function(n,e){var i=n.length;if(i<8)for(var u=1,l,f;u0;)n[f]=n[--f];f!==u++&&(n[f]=l)}else for(var d=o(i/2),v=a(r(n,0,d),e),p=a(r(n,d),e),h=v.length,y=p.length,g=0,m=0;gt)throw c("Maximum allowed index exceeded");return r}},2223:function(s){"use strict";s.exports={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}},77637:function(s,c,t){"use strict";var r=t(46008),o=r("span").classList,a=o&&o.constructor&&o.constructor.prototype;s.exports=a===Object.prototype?void 0:a},94533:function(s,c,t){"use strict";var r=t(45185),o=t(29597);s.exports=!r&&!o&&typeof window=="object"&&typeof document=="object"},45185:function(s){"use strict";s.exports=typeof Deno=="object"&&Deno&&typeof Deno.version=="object"},85373:function(s,c,t){"use strict";var r=t(79419);s.exports=/ipad|iphone|ipod/i.test(r)&&typeof Pebble<"u"},48996:function(s,c,t){"use strict";var r=t(79419);s.exports=/(?:ipad|iphone|ipod).*applewebkit/i.test(r)},29597:function(s,c,t){"use strict";var r=t(40410),o=t(37031);s.exports=o(r.process)==="process"},87208:function(s,c,t){"use strict";var r=t(79419);s.exports=/web0s(?!.*chrome)/i.test(r)},79419:function(s){"use strict";s.exports=typeof navigator<"u"&&String(navigator.userAgent)||""},5531:function(s,c,t){"use strict";var r=t(40410),o=t(79419),a=r.process,n=r.Deno,e=a&&a.versions||n&&n.version,i=e&&e.v8,u,l;i&&(u=i.split("."),l=u[0]>0&&u[0]<4?1:+(u[0]+u[1])),!l&&o&&(u=o.match(/Edge\/(\d+)/),(!u||u[1]>=74)&&(u=o.match(/Chrome\/(\d+)/),u&&(l=+u[1]))),s.exports=l},6656:function(s){"use strict";s.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},24491:function(s,c,t){"use strict";var r=t(40410),o=t(66478).f,a=t(29954),n=t(51551),e=t(75980),i=t(74371),u=t(2271);s.exports=function(l,f){var d=l.target,v=l.global,p=l.stat,h,y,g,m,M,E;if(v?y=r:p?y=r[d]||e(d,{}):y=r[d]&&r[d].prototype,y)for(g in f){if(M=f[g],l.dontCallGetSet?(E=o(y,g),m=E&&E.value):m=y[g],h=u(v?g:d+(p?".":"#")+g,l.forced),!h&&m!==void 0){if(typeof M==typeof m)continue;i(M,m)}(l.sham||m&&m.sham)&&a(M,"sham",!0),n(y,g,M,l)}}},43316:function(s){"use strict";s.exports=function(c){try{return!!c()}catch{return!0}}},4853:function(s,c,t){"use strict";t(91438);var r=t(61186),o=t(51551),a=t(92524),n=t(43316),e=t(34800),i=t(29954),u=e("species"),l=RegExp.prototype;s.exports=function(f,d,v,p){var h=e(f),y=!n(function(){var E={};return E[h]=function(){return 7},""[f](E)!==7}),g=y&&!n(function(){var E=!1,O=/a/;return f==="split"&&(O={},O.constructor={},O.constructor[u]=function(){return O},O.flags="",O[h]=/./[h]),O.exec=function(){return E=!0,null},O[h](""),!E});if(!y||!g||v){var m=/./[h],M=d(h,""[f],function(E,O,I,S,x){var T=O.exec;return T===a||T===l.exec?y&&!x?{done:!0,value:r(m,O,I,S)}:{done:!0,value:r(E,I,O,S)}:{done:!1}});o(String.prototype,f,M[0]),o(l,h,M[1])}p&&i(l[h],"sham",!0)}},91433:function(s,c,t){"use strict";var r=t(43316);s.exports=!r(function(){return Object.isExtensible(Object.preventExtensions({}))})},88320:function(s,c,t){"use strict";var r=t(83545),o=Function.prototype,a=o.apply,n=o.call;s.exports=typeof Reflect=="object"&&Reflect.apply||(r?n.bind(a):function(){return n.apply(a,arguments)})},38223:function(s,c,t){"use strict";var r=t(42049),o=t(62759),a=t(83545),n=r(r.bind);s.exports=function(e,i){return o(e),i===void 0?e:a?n(e,i):function(){return e.apply(i,arguments)}}},83545:function(s,c,t){"use strict";var r=t(43316);s.exports=!r(function(){var o=function(){}.bind();return typeof o!="function"||o.hasOwnProperty("prototype")})},61186:function(s,c,t){"use strict";var r=t(83545),o=Function.prototype.call;s.exports=r?o.bind(o):function(){return o.apply(o,arguments)}},38681:function(s,c,t){"use strict";var r=t(80863),o=t(38340),a=Function.prototype,n=r&&Object.getOwnPropertyDescriptor,e=o(a,"name"),i=e&&function(){}.name==="something",u=e&&(!r||r&&n(a,"name").configurable);s.exports={EXISTS:e,PROPER:i,CONFIGURABLE:u}},47159:function(s,c,t){"use strict";var r=t(26875),o=t(62759);s.exports=function(a,n,e){try{return r(o(Object.getOwnPropertyDescriptor(a,n)[e]))}catch{}}},42049:function(s,c,t){"use strict";var r=t(37031),o=t(26875);s.exports=function(a){if(r(a)==="Function")return o(a)}},26875:function(s,c,t){"use strict";var r=t(83545),o=Function.prototype,a=o.call,n=r&&o.bind.bind(a,a);s.exports=r?n:function(e){return function(){return a.apply(e,arguments)}}},57574:function(s,c,t){"use strict";var r=t(40410),o=t(46050),a=function(n){return o(n)?n:void 0};s.exports=function(n,e){return arguments.length<2?a(r[n]):r[n]&&r[n][e]}},14496:function(s,c,t){"use strict";var r=t(15076),o=t(42319),a=t(4488),n=t(50806),e=t(34800),i=e("iterator");s.exports=function(u){if(!a(u))return o(u,i)||o(u,"@@iterator")||n[r(u)]}},21220:function(s,c,t){"use strict";var r=t(61186),o=t(62759),a=t(67800),n=t(81800),e=t(14496),i=TypeError;s.exports=function(u,l){var f=arguments.length<2?e(u):l;if(o(f))return a(r(f,u));throw new i(n(u)+" is not iterable")}},85464:function(s,c,t){"use strict";var r=t(26875),o=t(64921),a=t(46050),n=t(37031),e=t(10968),i=r([].push);s.exports=function(u){if(a(u))return u;if(!!o(u)){for(var l=u.length,f=[],d=0;d]*>)/g,l=/\$([$&'`]|\d{1,2})/g;s.exports=function(f,d,v,p,h,y){var g=v+f.length,m=p.length,M=l;return h!==void 0&&(h=o(h),M=u),e(y,M,function(E,O){var I;switch(n(O,0)){case"$":return"$";case"&":return f;case"`":return i(d,0,v);case"'":return i(d,g);case"<":I=h[i(O,1,-1)];break;default:var S=+O;if(S===0)return E;if(S>m){var x=a(S/10);return x===0?E:x<=m?p[x-1]===void 0?n(O,1):p[x-1]+n(O,1):E}I=p[S-1]}return I===void 0?"":I})}},40410:function(s,c,t){"use strict";var r=function(o){return o&&o.Math===Math&&o};s.exports=r(typeof globalThis=="object"&&globalThis)||r(typeof window=="object"&&window)||r(typeof self=="object"&&self)||r(typeof t.g=="object"&&t.g)||r(typeof this=="object"&&this)||function(){return this}()||Function("return this")()},38340:function(s,c,t){"use strict";var r=t(26875),o=t(28714),a=r({}.hasOwnProperty);s.exports=Object.hasOwn||function(e,i){return a(o(e),i)}},64458:function(s){"use strict";s.exports={}},27400:function(s){"use strict";s.exports=function(c,t){try{arguments.length===1?console.error(c):console.error(c,t)}catch{}}},35352:function(s,c,t){"use strict";var r=t(57574);s.exports=r("document","documentElement")},47912:function(s,c,t){"use strict";var r=t(80863),o=t(43316),a=t(46008);s.exports=!r&&!o(function(){return Object.defineProperty(a("div"),"a",{get:function(){return 7}}).a!==7})},73034:function(s,c,t){"use strict";var r=t(26875),o=t(43316),a=t(37031),n=Object,e=r("".split);s.exports=o(function(){return!n("z").propertyIsEnumerable(0)})?function(i){return a(i)==="String"?e(i,""):n(i)}:n},7020:function(s,c,t){"use strict";var r=t(46050),o=t(33013),a=t(13712);s.exports=function(n,e,i){var u,l;return a&&r(u=e.constructor)&&u!==i&&o(l=u.prototype)&&l!==i.prototype&&a(n,l),n}},33375:function(s,c,t){"use strict";var r=t(26875),o=t(46050),a=t(66088),n=r(Function.toString);o(a.inspectSource)||(a.inspectSource=function(e){return n(e)}),s.exports=a.inspectSource},8948:function(s,c,t){"use strict";var r=t(24491),o=t(26875),a=t(64458),n=t(33013),e=t(38340),i=t(56516).f,u=t(40611),l=t(12343),f=t(94837),d=t(14523),v=t(91433),p=!1,h=d("meta"),y=0,g=function(S){i(S,h,{value:{objectID:"O"+y++,weakData:{}}})},m=function(S,x){if(!n(S))return typeof S=="symbol"?S:(typeof S=="string"?"S":"P")+S;if(!e(S,h)){if(!f(S))return"F";if(!x)return"E";g(S)}return S[h].objectID},M=function(S,x){if(!e(S,h)){if(!f(S))return!0;if(!x)return!1;g(S)}return S[h].weakData},E=function(S){return v&&p&&f(S)&&!e(S,h)&&g(S),S},O=function(){I.enable=function(){},p=!0;var S=u.f,x=o([].splice),T={};T[h]=1,S(T).length&&(u.f=function(N){for(var A=S(N),D=0,B=A.length;D"u"&&c!==void 0?function(t){return typeof t=="function"||t===c}:function(t){return typeof t=="function"}},72868:function(s,c,t){"use strict";var r=t(26875),o=t(43316),a=t(46050),n=t(15076),e=t(57574),i=t(33375),u=function(){},l=e("Reflect","construct"),f=/^\s*(?:class|function)\b/,d=r(f.exec),v=!f.test(u),p=function(g){if(!a(g))return!1;try{return l(u,[],g),!0}catch{return!1}},h=function(g){if(!a(g))return!1;switch(n(g)){case"AsyncFunction":case"GeneratorFunction":case"AsyncGeneratorFunction":return!1}try{return v||!!d(f,i(g))}catch{return!0}};h.sham=!0,s.exports=!l||o(function(){var y;return p(p.call)||!p(Object)||!p(function(){y=!0})||y})?h:p},2271:function(s,c,t){"use strict";var r=t(43316),o=t(46050),a=/#|\.prototype\./,n=function(f,d){var v=i[e(f)];return v===l?!0:v===u?!1:o(d)?r(d):!!d},e=n.normalize=function(f){return String(f).replace(a,".").toLowerCase()},i=n.data={},u=n.NATIVE="N",l=n.POLYFILL="P";s.exports=n},4488:function(s){"use strict";s.exports=function(c){return c==null}},33013:function(s,c,t){"use strict";var r=t(46050);s.exports=function(o){return typeof o=="object"?o!==null:r(o)}},77850:function(s,c,t){"use strict";var r=t(33013);s.exports=function(o){return r(o)||o===null}},28344:function(s){"use strict";s.exports=!1},10127:function(s,c,t){"use strict";var r=t(33013),o=t(37031),a=t(34800),n=a("match");s.exports=function(e){var i;return r(e)&&((i=e[n])!==void 0?!!i:o(e)==="RegExp")}},44162:function(s,c,t){"use strict";var r=t(57574),o=t(46050),a=t(69808),n=t(4559),e=Object;s.exports=n?function(i){return typeof i=="symbol"}:function(i){var u=r("Symbol");return o(u)&&a(u.prototype,e(i))}},41935:function(s,c,t){"use strict";var r=t(38223),o=t(61186),a=t(67800),n=t(81800),e=t(48588),i=t(42887),u=t(69808),l=t(21220),f=t(14496),d=t(95714),v=TypeError,p=function(y,g){this.stopped=y,this.result=g},h=p.prototype;s.exports=function(y,g,m){var M=m&&m.that,E=!!(m&&m.AS_ENTRIES),O=!!(m&&m.IS_RECORD),I=!!(m&&m.IS_ITERATOR),S=!!(m&&m.INTERRUPTED),x=r(g,M),T,N,A,D,B,H,Y,z=function(b){return T&&d(T,"normal",b),new p(!0,b)},P=function(b){return E?(a(b),S?x(b[0],b[1],z):x(b[0],b[1])):S?x(b,z):x(b)};if(O)T=y.iterator;else if(I)T=y;else{if(N=f(y),!N)throw new v(n(y)+" is not iterable");if(e(N)){for(A=0,D=i(y);D>A;A++)if(B=P(y[A]),B&&u(h,B))return B;return new p(!1)}T=l(y,N)}for(H=O?y.next:T.next;!(Y=o(H,T)).done;){try{B=P(Y.value)}catch(b){d(T,"throw",b)}if(typeof B=="object"&&B&&u(h,B))return B}return new p(!1)}},95714:function(s,c,t){"use strict";var r=t(61186),o=t(67800),a=t(42319);s.exports=function(n,e,i){var u,l;o(n);try{if(u=a(n,"return"),!u){if(e==="throw")throw i;return i}u=r(u,n)}catch(f){l=!0,u=f}if(e==="throw")throw i;if(l)throw u;return o(u),i}},20965:function(s,c,t){"use strict";var r=t(81796).IteratorPrototype,o=t(42451),a=t(52033),n=t(78976),e=t(50806),i=function(){return this};s.exports=function(u,l,f,d){var v=l+" Iterator";return u.prototype=o(r,{next:a(+!d,f)}),n(u,v,!1,!0),e[v]=i,u}},50415:function(s,c,t){"use strict";var r=t(24491),o=t(61186),a=t(28344),n=t(38681),e=t(46050),i=t(20965),u=t(99868),l=t(13712),f=t(78976),d=t(29954),v=t(51551),p=t(34800),h=t(50806),y=t(81796),g=n.PROPER,m=n.CONFIGURABLE,M=y.IteratorPrototype,E=y.BUGGY_SAFARI_ITERATORS,O=p("iterator"),I="keys",S="values",x="entries",T=function(){return this};s.exports=function(N,A,D,B,H,Y,z){i(D,A,B);var P=function(ut){if(ut===H&&j)return j;if(!E&&ut&&ut in L)return L[ut];switch(ut){case I:return function(){return new D(this,ut)};case S:return function(){return new D(this,ut)};case x:return function(){return new D(this,ut)}}return function(){return new D(this)}},b=A+" Iterator",R=!1,L=N.prototype,C=L[O]||L["@@iterator"]||H&&L[H],j=!E&&C||P(H),U=A==="Array"&&L.entries||C,w,X,K;if(U&&(w=u(U.call(new N)),w!==Object.prototype&&w.next&&(!a&&u(w)!==M&&(l?l(w,M):e(w[O])||v(w,O,T)),f(w,b,!0,!0),a&&(h[b]=T))),g&&H===S&&C&&C.name!==S&&(!a&&m?d(L,"name",S):(R=!0,j=function(){return o(C,this)})),H)if(X={values:P(S),keys:Y?j:P(I),entries:P(x)},z)for(K in X)(E||R||!(K in L))&&v(L,K,X[K]);else r({target:A,proto:!0,forced:E||R},X);return(!a||z)&&L[O]!==j&&v(L,O,j,{name:H}),h[A]=j,X}},81796:function(s,c,t){"use strict";var r=t(43316),o=t(46050),a=t(33013),n=t(42451),e=t(99868),i=t(51551),u=t(34800),l=t(28344),f=u("iterator"),d=!1,v,p,h;[].keys&&(h=[].keys(),"next"in h?(p=e(e(h)),p!==Object.prototype&&(v=p)):d=!0);var y=!a(v)||r(function(){var g={};return v[f].call(g)!==g});y?v={}:l&&(v=n(v)),o(v[f])||i(v,f,function(){return this}),s.exports={IteratorPrototype:v,BUGGY_SAFARI_ITERATORS:d}},50806:function(s){"use strict";s.exports={}},42887:function(s,c,t){"use strict";var r=t(90793);s.exports=function(o){return r(o.length)}},90752:function(s,c,t){"use strict";var r=t(26875),o=t(43316),a=t(46050),n=t(38340),e=t(80863),i=t(38681).CONFIGURABLE,u=t(33375),l=t(54284),f=l.enforce,d=l.get,v=String,p=Object.defineProperty,h=r("".slice),y=r("".replace),g=r([].join),m=e&&!o(function(){return p(function(){},"length",{value:8}).length!==8}),M=String(String).split("String"),E=s.exports=function(O,I,S){h(v(I),0,7)==="Symbol("&&(I="["+y(v(I),/^Symbol\(([^)]*)\).*$/,"$1")+"]"),S&&S.getter&&(I="get "+I),S&&S.setter&&(I="set "+I),(!n(O,"name")||i&&O.name!==I)&&(e?p(O,"name",{value:I,configurable:!0}):O.name=I),m&&S&&n(S,"arity")&&O.length!==S.arity&&p(O,"length",{value:S.arity});try{S&&n(S,"constructor")&&S.constructor?e&&p(O,"prototype",{writable:!1}):O.prototype&&(O.prototype=void 0)}catch{}var x=f(O);return n(x,"source")||(x.source=g(M,typeof I=="string"?I:"")),O};Function.prototype.toString=E(function(){return a(this)&&d(this).source||u(this)},"toString")},34512:function(s){"use strict";var c=Math.ceil,t=Math.floor;s.exports=Math.trunc||function(o){var a=+o;return(a>0?t:c)(a)}},36396:function(s,c,t){"use strict";var r=t(40410),o=t(20410),a=t(38223),n=t(67560).set,e=t(98082),i=t(48996),u=t(85373),l=t(87208),f=t(29597),d=r.MutationObserver||r.WebKitMutationObserver,v=r.document,p=r.process,h=r.Promise,y=o("queueMicrotask"),g,m,M,E,O;if(!y){var I=new e,S=function(){var x,T;for(f&&(x=p.domain)&&x.exit();T=I.get();)try{T()}catch(N){throw I.head&&g(),N}x&&x.enter()};!i&&!f&&!l&&d&&v?(m=!0,M=v.createTextNode(""),new d(S).observe(M,{characterData:!0}),g=function(){M.data=m=!m}):!u&&h&&h.resolve?(E=h.resolve(void 0),E.constructor=h,O=a(E.then,E),g=function(){O(S)}):f?g=function(){p.nextTick(S)}:(n=a(n,r),g=function(){n(S)}),y=function(x){I.head||g(),I.add(x)}}s.exports=y},42326:function(s,c,t){"use strict";var r=t(62759),o=TypeError,a=function(n){var e,i;this.promise=new n(function(u,l){if(e!==void 0||i!==void 0)throw new o("Bad Promise constructor");e=u,i=l}),this.resolve=r(e),this.reject=r(i)};s.exports.f=function(n){return new a(n)}},19986:function(s,c,t){"use strict";var r=t(10127),o=TypeError;s.exports=function(a){if(r(a))throw new o("The method doesn't accept regular expressions");return a}},38370:function(s,c,t){"use strict";var r=t(40410),o=t(43316),a=t(26875),n=t(10968),e=t(46977).trim,i=t(29379),u=r.parseInt,l=r.Symbol,f=l&&l.iterator,d=/^[+-]?0x/i,v=a(d.exec),p=u(i+"08")!==8||u(i+"0x16")!==22||f&&!o(function(){u(Object(f))});s.exports=p?function(y,g){var m=e(n(y));return u(m,g>>>0||(v(d,m)?16:10))}:u},47034:function(s,c,t){"use strict";var r=t(80863),o=t(26875),a=t(61186),n=t(43316),e=t(22867),i=t(88458),u=t(77382),l=t(28714),f=t(73034),d=Object.assign,v=Object.defineProperty,p=o([].concat);s.exports=!d||n(function(){if(r&&d({b:1},d(v({},"a",{enumerable:!0,get:function(){v(this,"b",{value:3,enumerable:!1})}}),{b:2})).b!==1)return!0;var h={},y={},g=Symbol("assign detection"),m="abcdefghijklmnopqrst";return h[g]=7,m.split("").forEach(function(M){y[M]=M}),d({},h)[g]!==7||e(d({},y)).join("")!==m})?function(y,g){for(var m=l(y),M=arguments.length,E=1,O=i.f,I=u.f;M>E;)for(var S=f(arguments[E++]),x=O?p(e(S),O(S)):e(S),T=x.length,N=0,A;T>N;)A=x[N++],(!r||a(I,S,A))&&(m[A]=S[A]);return m}:d},42451:function(s,c,t){"use strict";var r=t(67800),o=t(87492),a=t(6656),n=t(64458),e=t(35352),i=t(46008),u=t(86178),l=">",f="<",d="prototype",v="script",p=u("IE_PROTO"),h=function(){},y=function(O){return f+v+l+O+f+"/"+v+l},g=function(O){O.write(y("")),O.close();var I=O.parentWindow.Object;return O=null,I},m=function(){var O=i("iframe"),I="java"+v+":",S;return O.style.display="none",e.appendChild(O),O.src=String(I),S=O.contentWindow.document,S.open(),S.write(y("document.F=Object")),S.close(),S.F},M,E=function(){try{M=new ActiveXObject("htmlfile")}catch{}E=typeof document<"u"?document.domain&&M?g(M):m():g(M);for(var O=a.length;O--;)delete E[d][a[O]];return E()};n[p]=!0,s.exports=Object.create||function(I,S){var x;return I!==null?(h[d]=r(I),x=new h,h[d]=null,x[p]=I):x=E(),S===void 0?x:o.f(x,S)}},87492:function(s,c,t){"use strict";var r=t(80863),o=t(13501),a=t(56516),n=t(67800),e=t(7222),i=t(22867);c.f=r&&!o?Object.defineProperties:function(l,f){n(l);for(var d=e(f),v=i(f),p=v.length,h=0,y;p>h;)a.f(l,y=v[h++],d[y]);return l}},56516:function(s,c,t){"use strict";var r=t(80863),o=t(47912),a=t(13501),n=t(67800),e=t(59326),i=TypeError,u=Object.defineProperty,l=Object.getOwnPropertyDescriptor,f="enumerable",d="configurable",v="writable";c.f=r?a?function(h,y,g){if(n(h),y=e(y),n(g),typeof h=="function"&&y==="prototype"&&"value"in g&&v in g&&!g[v]){var m=l(h,y);m&&m[v]&&(h[y]=g.value,g={configurable:d in g?g[d]:m[d],enumerable:f in g?g[f]:m[f],writable:!1})}return u(h,y,g)}:u:function(h,y,g){if(n(h),y=e(y),n(g),o)try{return u(h,y,g)}catch{}if("get"in g||"set"in g)throw new i("Accessors not supported");return"value"in g&&(h[y]=g.value),h}},66478:function(s,c,t){"use strict";var r=t(80863),o=t(61186),a=t(77382),n=t(52033),e=t(7222),i=t(59326),u=t(38340),l=t(47912),f=Object.getOwnPropertyDescriptor;c.f=r?f:function(v,p){if(v=e(v),p=i(p),l)try{return f(v,p)}catch{}if(u(v,p))return n(!o(a.f,v,p),v[p])}},12343:function(s,c,t){"use strict";var r=t(37031),o=t(7222),a=t(40611).f,n=t(63003),e=typeof window=="object"&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],i=function(u){try{return a(u)}catch{return n(e)}};s.exports.f=function(l){return e&&r(l)==="Window"?i(l):a(o(l))}},40611:function(s,c,t){"use strict";var r=t(11709),o=t(6656),a=o.concat("length","prototype");c.f=Object.getOwnPropertyNames||function(e){return r(e,a)}},88458:function(s,c){"use strict";c.f=Object.getOwnPropertySymbols},99868:function(s,c,t){"use strict";var r=t(38340),o=t(46050),a=t(28714),n=t(86178),e=t(49694),i=n("IE_PROTO"),u=Object,l=u.prototype;s.exports=e?u.getPrototypeOf:function(f){var d=a(f);if(r(d,i))return d[i];var v=d.constructor;return o(v)&&d instanceof v?v.prototype:d instanceof u?l:null}},94837:function(s,c,t){"use strict";var r=t(43316),o=t(33013),a=t(37031),n=t(11583),e=Object.isExtensible,i=r(function(){e(1)});s.exports=i||n?function(l){return!o(l)||n&&a(l)==="ArrayBuffer"?!1:e?e(l):!0}:e},69808:function(s,c,t){"use strict";var r=t(26875);s.exports=r({}.isPrototypeOf)},11709:function(s,c,t){"use strict";var r=t(26875),o=t(38340),a=t(7222),n=t(42828).indexOf,e=t(64458),i=r([].push);s.exports=function(u,l){var f=a(u),d=0,v=[],p;for(p in f)!o(e,p)&&o(f,p)&&i(v,p);for(;l.length>d;)o(f,p=l[d++])&&(~n(v,p)||i(v,p));return v}},22867:function(s,c,t){"use strict";var r=t(11709),o=t(6656);s.exports=Object.keys||function(n){return r(n,o)}},77382:function(s,c){"use strict";var t={}.propertyIsEnumerable,r=Object.getOwnPropertyDescriptor,o=r&&!t.call({1:2},1);c.f=o?function(n){var e=r(this,n);return!!e&&e.enumerable}:t},13712:function(s,c,t){"use strict";var r=t(47159),o=t(33013),a=t(89207),n=t(97875);s.exports=Object.setPrototypeOf||("__proto__"in{}?function(){var e=!1,i={},u;try{u=r(Object.prototype,"__proto__","set"),u(i,[]),e=i instanceof Array}catch{}return function(f,d){return a(f),n(d),o(f)&&(e?u(f,d):f.__proto__=d),f}}():void 0)},75494:function(s,c,t){"use strict";var r=t(583),o=t(15076);s.exports=r?{}.toString:function(){return"[object "+o(this)+"]"}},31677:function(s,c,t){"use strict";var r=t(61186),o=t(46050),a=t(33013),n=TypeError;s.exports=function(e,i){var u,l;if(i==="string"&&o(u=e.toString)&&!a(l=r(u,e))||o(u=e.valueOf)&&!a(l=r(u,e))||i!=="string"&&o(u=e.toString)&&!a(l=r(u,e)))return l;throw new n("Can't convert object to primitive value")}},3050:function(s,c,t){"use strict";var r=t(57574),o=t(26875),a=t(40611),n=t(88458),e=t(67800),i=o([].concat);s.exports=r("Reflect","ownKeys")||function(l){var f=a.f(e(l)),d=n.f;return d?i(f,d(l)):f}},77398:function(s,c,t){"use strict";var r=t(40410);s.exports=r},62588:function(s){"use strict";s.exports=function(c){try{return{error:!1,value:c()}}catch(t){return{error:!0,value:t}}}},64855:function(s,c,t){"use strict";var r=t(40410),o=t(64671),a=t(46050),n=t(2271),e=t(33375),i=t(34800),u=t(94533),l=t(45185),f=t(28344),d=t(5531),v=o&&o.prototype,p=i("species"),h=!1,y=a(r.PromiseRejectionEvent),g=n("Promise",function(){var m=e(o),M=m!==String(o);if(!M&&d===66||f&&!(v.catch&&v.finally))return!0;if(!d||d<51||!/native code/.test(m)){var E=new o(function(S){S(1)}),O=function(S){S(function(){},function(){})},I=E.constructor={};if(I[p]=O,h=E.then(function(){})instanceof O,!h)return!0}return!M&&(u||l)&&!y});s.exports={CONSTRUCTOR:g,REJECTION_EVENT:y,SUBCLASSING:h}},64671:function(s,c,t){"use strict";var r=t(40410);s.exports=r.Promise},85337:function(s,c,t){"use strict";var r=t(67800),o=t(33013),a=t(42326);s.exports=function(n,e){if(r(n),o(e)&&e.constructor===n)return e;var i=a.f(n),u=i.resolve;return u(e),i.promise}},65722:function(s,c,t){"use strict";var r=t(64671),o=t(13313),a=t(64855).CONSTRUCTOR;s.exports=a||!o(function(n){r.all(n).then(void 0,function(){})})},98082:function(s){"use strict";var c=function(){this.head=null,this.tail=null};c.prototype={add:function(t){var r={item:t,next:null},o=this.tail;o?o.next=r:this.head=r,this.tail=r},get:function(){var t=this.head;if(t){var r=this.head=t.next;return r===null&&(this.tail=null),t.item}}},s.exports=c},92403:function(s,c,t){"use strict";var r=t(61186),o=t(67800),a=t(46050),n=t(37031),e=t(92524),i=TypeError;s.exports=function(u,l){var f=u.exec;if(a(f)){var d=r(f,u,l);return d!==null&&o(d),d}if(n(u)==="RegExp")return r(e,u,l);throw new i("RegExp#exec called on incompatible receiver")}},92524:function(s,c,t){"use strict";var r=t(61186),o=t(26875),a=t(10968),n=t(89934),e=t(32366),i=t(22240),u=t(42451),l=t(54284).get,f=t(8782),d=t(82491),v=i("native-string-replace",String.prototype.replace),p=RegExp.prototype.exec,h=p,y=o("".charAt),g=o("".indexOf),m=o("".replace),M=o("".slice),E=function(){var x=/a/,T=/b*/g;return r(p,x,"a"),r(p,T,"a"),x.lastIndex!==0||T.lastIndex!==0}(),O=e.BROKEN_CARET,I=/()??/.exec("")[1]!==void 0,S=E||I||O||f||d;S&&(h=function(T){var N=this,A=l(N),D=a(T),B=A.raw,H,Y,z,P,b,R,L;if(B)return B.lastIndex=N.lastIndex,H=r(h,B,D),N.lastIndex=B.lastIndex,H;var C=A.groups,j=O&&N.sticky,U=r(n,N),w=N.source,X=0,K=D;if(j&&(U=m(U,"y",""),g(U,"g")===-1&&(U+="g"),K=M(D,N.lastIndex),N.lastIndex>0&&(!N.multiline||N.multiline&&y(D,N.lastIndex-1)!==` -`)&&(w="(?: "+w+")",K=" "+K,X++),Y=new RegExp("^(?:"+w+")",U)),I&&(Y=new RegExp("^"+w+"$(?!\\s)",U)),E&&(z=N.lastIndex),P=r(p,j?Y:N,K),j?P?(P.input=M(P.input,X),P[0]=M(P[0],X),P.index=N.lastIndex,N.lastIndex+=P[0].length):N.lastIndex=0:E&&P&&(N.lastIndex=N.global?P.index+P[0].length:z),I&&P&&P.length>1&&r(v,P[0],Y,function(){for(b=1;bb)","g");return n.exec("b").groups.a!=="b"||"b".replace(n,"$c")!=="bc"})},89207:function(s,c,t){"use strict";var r=t(4488),o=TypeError;s.exports=function(a){if(r(a))throw new o("Can't call method on "+a);return a}},20410:function(s,c,t){"use strict";var r=t(40410),o=t(80863),a=Object.getOwnPropertyDescriptor;s.exports=function(n){if(!o)return r[n];var e=a(r,n);return e&&e.value}},26038:function(s,c,t){"use strict";var r=t(57574),o=t(22011),a=t(34800),n=t(80863),e=a("species");s.exports=function(i){var u=r(i);n&&u&&!u[e]&&o(u,e,{configurable:!0,get:function(){return this}})}},78976:function(s,c,t){"use strict";var r=t(56516).f,o=t(38340),a=t(34800),n=a("toStringTag");s.exports=function(e,i,u){e&&!u&&(e=e.prototype),e&&!o(e,n)&&r(e,n,{configurable:!0,value:i})}},86178:function(s,c,t){"use strict";var r=t(22240),o=t(14523),a=r("keys");s.exports=function(n){return a[n]||(a[n]=o(n))}},66088:function(s,c,t){"use strict";var r=t(28344),o=t(40410),a=t(75980),n="__core-js_shared__",e=s.exports=o[n]||a(n,{});(e.versions||(e.versions=[])).push({version:"3.37.0",mode:r?"pure":"global",copyright:"\xA9 2014-2024 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.37.0/LICENSE",source:"https://github.com/zloirock/core-js"})},22240:function(s,c,t){"use strict";var r=t(66088);s.exports=function(o,a){return r[o]||(r[o]=a||{})}},29114:function(s,c,t){"use strict";var r=t(67800),o=t(56419),a=t(4488),n=t(34800),e=n("species");s.exports=function(i,u){var l=r(i).constructor,f;return l===void 0||a(f=r(l)[e])?u:o(f)}},19574:function(s,c,t){"use strict";var r=t(26875),o=t(7058),a=t(10968),n=t(89207),e=r("".charAt),i=r("".charCodeAt),u=r("".slice),l=function(f){return function(d,v){var p=a(n(d)),h=o(v),y=p.length,g,m;return h<0||h>=y?f?"":void 0:(g=i(p,h),g<55296||g>56319||h+1===y||(m=i(p,h+1))<56320||m>57343?f?e(p,h):g:f?u(p,h,h+2):(g-55296<<10)+(m-56320)+65536)}};s.exports={codeAt:l(!1),charAt:l(!0)}},15708:function(s,c,t){"use strict";var r=t(26875),o=2147483647,a=36,n=1,e=26,i=38,u=700,l=72,f=128,d="-",v=/[^\0-\u007E]/,p=/[.\u3002\uFF0E\uFF61]/g,h="Overflow: input needs wider integers to process",y=a-n,g=RangeError,m=r(p.exec),M=Math.floor,E=String.fromCharCode,O=r("".charCodeAt),I=r([].join),S=r([].push),x=r("".replace),T=r("".split),N=r("".toLowerCase),A=function(Y){for(var z=[],P=0,b=Y.length;P=55296&&R<=56319&&P>1,Y+=M(Y/z);Y>y*e>>1;)Y=M(Y/y),b+=a;return M(b+(y+1)*Y/(Y+i))},H=function(Y){var z=[];Y=A(Y);var P=Y.length,b=f,R=0,L=l,C,j;for(C=0;C=b&&jM((o-R)/K))throw new g(h);for(R+=(X-b)*K,b=X,C=0;Co)throw new g(h);if(j===b){for(var ut=R,it=a;;){var ct=it<=L?n:it>=L+e?e:it-L;if(ut0?o(n,9007199254740991):0}},28714:function(s,c,t){"use strict";var r=t(89207),o=Object;s.exports=function(a){return o(r(a))}},99524:function(s,c,t){"use strict";var r=t(61186),o=t(33013),a=t(44162),n=t(42319),e=t(31677),i=t(34800),u=TypeError,l=i("toPrimitive");s.exports=function(f,d){if(!o(f)||a(f))return f;var v=n(f,l),p;if(v){if(d===void 0&&(d="default"),p=r(v,f,d),!o(p)||a(p))return p;throw new u("Can't convert object to primitive value")}return d===void 0&&(d="number"),e(f,d)}},59326:function(s,c,t){"use strict";var r=t(99524),o=t(44162);s.exports=function(a){var n=r(a,"string");return o(n)?n:n+""}},583:function(s,c,t){"use strict";var r=t(34800),o=r("toStringTag"),a={};a[o]="z",s.exports=String(a)==="[object z]"},10968:function(s,c,t){"use strict";var r=t(15076),o=String;s.exports=function(a){if(r(a)==="Symbol")throw new TypeError("Cannot convert a Symbol value to a string");return o(a)}},81800:function(s){"use strict";var c=String;s.exports=function(t){try{return c(t)}catch{return"Object"}}},14523:function(s,c,t){"use strict";var r=t(26875),o=0,a=Math.random(),n=r(1 .toString);s.exports=function(e){return"Symbol("+(e===void 0?"":e)+")_"+n(++o+a,36)}},17439:function(s,c,t){"use strict";var r=t(43316),o=t(34800),a=t(80863),n=t(28344),e=o("iterator");s.exports=!r(function(){var i=new URL("b?a=1&b=2&c=3","http://a"),u=i.searchParams,l=new URLSearchParams("a=1&a=2&b=3"),f="";return i.pathname="c%20d",u.forEach(function(d,v){u.delete("b"),f+=v+d}),l.delete("a",2),l.delete("b",void 0),n&&(!i.toJSON||!l.has("a",1)||l.has("a",2)||!l.has("a",void 0)||l.has("b"))||!u.size&&(n||!a)||!u.sort||i.href!=="http://a/c%20d?a=1&c=3"||u.get("c")!=="3"||String(new URLSearchParams("?a=1"))!=="a=1"||!u[e]||new URL("https://a@b").username!=="a"||new URLSearchParams(new URLSearchParams("a=b")).get("a")!=="b"||new URL("http://\u0442\u0435\u0441\u0442").host!=="xn--e1aybc"||new URL("http://a#\u0431").hash!=="#%D0%B1"||f!=="a1c3"||new URL("http://x",void 0).host!=="x"})},4559:function(s,c,t){"use strict";var r=t(74334);s.exports=r&&!Symbol.sham&&typeof Symbol.iterator=="symbol"},13501:function(s,c,t){"use strict";var r=t(80863),o=t(43316);s.exports=r&&o(function(){return Object.defineProperty(function(){},"prototype",{value:42,writable:!1}).prototype!==42})},11467:function(s){"use strict";var c=TypeError;s.exports=function(t,r){if(t=51||!o(function(){var M=[];return M[h]=!1,M.concat()[0]!==M}),g=function(M){if(!n(M))return!1;var E=M[h];return E!==void 0?!!E:a(M)},m=!y||!d("concat");r({target:"Array",proto:!0,arity:1,forced:m},{concat:function(E){var O=e(this),I=f(O,0),S=0,x,T,N,A,D;for(x=-1,N=arguments.length;x1?arguments[1]:void 0)}})},52399:function(s,c,t){"use strict";var r=t(24491),o=t(73614).findIndex,a=t(73892),n="findIndex",e=!0;n in[]&&Array(1)[n](function(){e=!1}),r({target:"Array",proto:!0,forced:e},{findIndex:function(u){return o(this,u,arguments.length>1?arguments[1]:void 0)}}),a(n)},94362:function(s,c,t){"use strict";var r=t(24491),o=t(73614).find,a=t(73892),n="find",e=!0;n in[]&&Array(1)[n](function(){e=!1}),r({target:"Array",proto:!0,forced:e},{find:function(u){return o(this,u,arguments.length>1?arguments[1]:void 0)}}),a(n)},67845:function(s,c,t){"use strict";var r=t(24491),o=t(67189),a=t(13313),n=!a(function(e){Array.from(e)});r({target:"Array",stat:!0,forced:n},{from:o})},72028:function(s,c,t){"use strict";var r=t(24491),o=t(42828).includes,a=t(43316),n=t(73892),e=a(function(){return!Array(1).includes()});r({target:"Array",proto:!0,forced:e},{includes:function(u){return o(this,u,arguments.length>1?arguments[1]:void 0)}}),n("includes")},60687:function(s,c,t){"use strict";var r=t(24491),o=t(42049),a=t(42828).indexOf,n=t(14943),e=o([].indexOf),i=!!e&&1/e([1],1,-0)<0,u=i||!n("indexOf");r({target:"Array",proto:!0,forced:u},{indexOf:function(f){var d=arguments.length>1?arguments[1]:void 0;return i?e(this,f,d)||0:a(this,f,d)}})},18091:function(s,c,t){"use strict";var r=t(7222),o=t(73892),a=t(50806),n=t(54284),e=t(56516).f,i=t(50415),u=t(69494),l=t(28344),f=t(80863),d="Array Iterator",v=n.set,p=n.getterFor(d);s.exports=i(Array,"Array",function(y,g){v(this,{type:d,target:r(y),index:0,kind:g})},function(){var y=p(this),g=y.target,m=y.index++;if(!g||m>=g.length)return y.target=void 0,u(void 0,!0);switch(y.kind){case"keys":return u(m,!1);case"values":return u(g[m],!1)}return u([m,g[m]],!1)},"values");var h=a.Arguments=a.Array;if(o("keys"),o("values"),o("entries"),!l&&f&&h.name!=="values")try{e(h,"name",{value:"values"})}catch{}},63335:function(s,c,t){"use strict";var r=t(24491),o=t(73614).map,a=t(67240),n=a("map");r({target:"Array",proto:!0,forced:!n},{map:function(i){return o(this,i,arguments.length>1?arguments[1]:void 0)}})},23467:function(s,c,t){"use strict";var r=t(24491),o=t(3803).left,a=t(14943),n=t(5531),e=t(29597),i=!e&&n>79&&n<83,u=i||!a("reduce");r({target:"Array",proto:!0,forced:u},{reduce:function(f){var d=arguments.length;return o(this,f,d,d>1?arguments[1]:void 0)}})},26407:function(s,c,t){"use strict";var r=t(24491),o=t(26875),a=t(64921),n=o([].reverse),e=[1,2];r({target:"Array",proto:!0,forced:String(e)===String(e.reverse())},{reverse:function(){return a(this)&&(this.length=this.length),n(this)}})},80555:function(s,c,t){"use strict";var r=t(24491),o=t(64921),a=t(72868),n=t(33013),e=t(32649),i=t(42887),u=t(7222),l=t(80639),f=t(34800),d=t(67240),v=t(63003),p=d("slice"),h=f("species"),y=Array,g=Math.max;r({target:"Array",proto:!0,forced:!p},{slice:function(M,E){var O=u(this),I=i(O),S=e(M,I),x=e(E===void 0?I:E,I),T,N,A;if(o(O)&&(T=O.constructor,a(T)&&(T===y||o(T.prototype))?T=void 0:n(T)&&(T=T[h],T===null&&(T=void 0)),T===y||T===void 0))return v(O,S,x);for(N=new(T===void 0?y:T)(g(x-S,0)),A=0;SO-T+x;A--)d(E,A-1)}else if(x>T)for(A=O-T;A>I;A--)D=A+T-1,B=A+x-1,D in E?E[B]=E[D]:d(E,B);for(A=0;A2){if(R=E(R),L=A(R,0),L===43||L===45){if(C=A(R,2),C===88||C===120)return NaN}else if(L===48){switch(A(R,1)){case 66:case 98:j=2,U=49;break;case 79:case 111:j=8,U=55;break;default:return+R}for(w=N(R,2),X=w.length,K=0;KU)return NaN;return parseInt(w,j)}}return+R},H=u(O,!I(" 0o1")||!I("0b1")||I("+0x1")),Y=function(b){return d(x,b)&&h(function(){M(b)})},z=function(R){var L=arguments.length<1?0:I(D(R));return Y(this)?f(Object(L),this,z):L};z.prototype=x,H&&!o&&(x.constructor=z),r({global:!0,constructor:!0,wrap:!0,forced:H},{Number:z});var P=function(b,R){for(var L=a?y(R):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,isFinite,isInteger,isNaN,isSafeInteger,parseFloat,parseInt,fromString,range".split(","),C=0,j;L.length>C;C++)l(R,j=L[C])&&!l(b,j)&&m(b,j,g(R,j))};o&&S&&P(e[O],S),(H||o)&&P(e[O],I)},49844:function(s,c,t){"use strict";var r=t(24491),o=t(47034);r({target:"Object",stat:!0,arity:2,forced:Object.assign!==o},{assign:o})},50939:function(s,c,t){"use strict";var r=t(24491),o=t(80863),a=t(3050),n=t(7222),e=t(66478),i=t(80639);r({target:"Object",stat:!0,sham:!o},{getOwnPropertyDescriptors:function(l){for(var f=n(l),d=e.f,v=a(f),p={},h=0,y,g;v.length>h;)g=d(f,y=v[h++]),g!==void 0&&i(p,y,g);return p}})},11608:function(s,c,t){"use strict";var r=t(24491),o=t(74334),a=t(43316),n=t(88458),e=t(28714),i=!o||a(function(){n.f(1)});r({target:"Object",stat:!0,forced:i},{getOwnPropertySymbols:function(l){var f=n.f;return f?f(e(l)):[]}})},41568:function(s,c,t){"use strict";var r=t(583),o=t(51551),a=t(75494);r||o(Object.prototype,"toString",a,{unsafe:!0})},66713:function(s,c,t){"use strict";var r=t(24491),o=t(38370);r({global:!0,forced:parseInt!==o},{parseInt:o})},2558:function(s,c,t){"use strict";var r=t(24491),o=t(61186),a=t(62759),n=t(42326),e=t(62588),i=t(41935),u=t(65722);r({target:"Promise",stat:!0,forced:u},{all:function(f){var d=this,v=n.f(d),p=v.resolve,h=v.reject,y=e(function(){var g=a(d.resolve),m=[],M=0,E=1;i(f,function(O){var I=M++,S=!1;E++,o(g,d,O).then(function(x){S||(S=!0,m[I]=x,--E||p(m))},h)}),--E||p(m)});return y.error&&h(y.value),v.promise}})},17762:function(s,c,t){"use strict";var r=t(24491),o=t(28344),a=t(64855).CONSTRUCTOR,n=t(64671),e=t(57574),i=t(46050),u=t(51551),l=n&&n.prototype;if(r({target:"Promise",proto:!0,forced:a,real:!0},{catch:function(d){return this.then(void 0,d)}}),!o&&i(n)){var f=e("Promise").prototype.catch;l.catch!==f&&u(l,"catch",f,{unsafe:!0})}},5145:function(s,c,t){"use strict";var r=t(24491),o=t(28344),a=t(29597),n=t(40410),e=t(61186),i=t(51551),u=t(13712),l=t(78976),f=t(26038),d=t(62759),v=t(46050),p=t(33013),h=t(31076),y=t(29114),g=t(67560).set,m=t(36396),M=t(27400),E=t(62588),O=t(98082),I=t(54284),S=t(64671),x=t(64855),T=t(42326),N="Promise",A=x.CONSTRUCTOR,D=x.REJECTION_EVENT,B=x.SUBCLASSING,H=I.getterFor(N),Y=I.set,z=S&&S.prototype,P=S,b=z,R=n.TypeError,L=n.document,C=n.process,j=T.f,U=j,w=!!(L&&L.createEvent&&n.dispatchEvent),X="unhandledrejection",K="rejectionhandled",ut=0,it=1,ct=2,at=1,_=2,vt,dt,ht,Ot,St=function(F){var Z;return p(F)&&v(Z=F.then)?Z:!1},Pt=function(F,Z){var et=Z.value,k=Z.state===it,ft=k?F.ok:F.fail,mt=F.resolve,yt=F.reject,pt=F.domain,st,ot,W;try{ft?(k||(Z.rejection===_&&It(Z),Z.rejection=at),ft===!0?st=et:(pt&&pt.enter(),st=ft(et),pt&&(pt.exit(),W=!0)),st===F.promise?yt(new R("Promise-chain cycle")):(ot=St(st))?e(ot,st,mt,yt):mt(st)):yt(et)}catch(Q){pt&&!W&&pt.exit(),yt(Q)}},Mt=function(F,Z){F.notified||(F.notified=!0,m(function(){for(var et=F.reactions,k;k=et.get();)Pt(k,F);F.notified=!1,Z&&!F.rejection&&Ct(F)}))},Et=function(F,Z,et){var k,ft;w?(k=L.createEvent("Event"),k.promise=Z,k.reason=et,k.initEvent(F,!1,!0),n.dispatchEvent(k)):k={promise:Z,reason:et},!D&&(ft=n["on"+F])?ft(k):F===X&&M("Unhandled promise rejection",et)},Ct=function(F){e(g,n,function(){var Z=F.facade,et=F.value,k=Nt(F),ft;if(k&&(ft=E(function(){a?C.emit("unhandledRejection",et,Z):Et(X,Z,et)}),F.rejection=a||Nt(F)?_:at,ft.error))throw ft.value})},Nt=function(F){return F.rejection!==at&&!F.parent},It=function(F){e(g,n,function(){var Z=F.facade;a?C.emit("rejectionHandled",Z):Et(K,Z,F.value)})},Tt=function(F,Z,et){return function(k){F(Z,k,et)}},J=function(F,Z,et){F.done||(F.done=!0,et&&(F=et),F.value=Z,F.state=ct,Mt(F,!0))},lt=function(F,Z,et){if(!F.done){F.done=!0,et&&(F=et);try{if(F.facade===Z)throw new R("Promise can't be resolved itself");var k=St(Z);k?m(function(){var ft={done:!1};try{e(k,Z,Tt(lt,ft,F),Tt(J,ft,F))}catch(mt){J(ft,mt,F)}}):(F.value=Z,F.state=it,Mt(F,!1))}catch(ft){J({done:!1},ft,F)}}};if(A&&(P=function(Z){h(this,b),d(Z),e(vt,this);var et=H(this);try{Z(Tt(lt,et),Tt(J,et))}catch(k){J(et,k)}},b=P.prototype,vt=function(Z){Y(this,{type:N,done:!1,notified:!1,parent:!1,reactions:new O,rejection:!1,state:ut,value:void 0})},vt.prototype=i(b,"then",function(Z,et){var k=H(this),ft=j(y(this,P));return k.parent=!0,ft.ok=v(Z)?Z:!0,ft.fail=v(et)&&et,ft.domain=a?C.domain:void 0,k.state===ut?k.reactions.add(ft):m(function(){Pt(ft,k)}),ft.promise}),dt=function(){var F=new vt,Z=H(F);this.promise=F,this.resolve=Tt(lt,Z),this.reject=Tt(J,Z)},T.f=j=function(F){return F===P||F===ht?new dt(F):U(F)},!o&&v(S)&&z!==Object.prototype)){Ot=z.then,B||i(z,"then",function(Z,et){var k=this;return new P(function(ft,mt){e(Ot,k,ft,mt)}).then(Z,et)},{unsafe:!0});try{delete z.constructor}catch{}u&&u(z,b)}r({global:!0,constructor:!0,wrap:!0,forced:A},{Promise:P}),l(P,N,!1,!0),f(N)},1002:function(s,c,t){"use strict";var r=t(24491),o=t(28344),a=t(64671),n=t(43316),e=t(57574),i=t(46050),u=t(29114),l=t(85337),f=t(51551),d=a&&a.prototype,v=!!a&&n(function(){d.finally.call({then:function(){}},function(){})});if(r({target:"Promise",proto:!0,real:!0,forced:v},{finally:function(h){var y=u(this,e("Promise")),g=i(h);return this.then(g?function(m){return l(y,h()).then(function(){return m})}:h,g?function(m){return l(y,h()).then(function(){throw m})}:h)}}),!o&&i(a)){var p=e("Promise").prototype.finally;d.finally!==p&&f(d,"finally",p,{unsafe:!0})}},68147:function(s,c,t){"use strict";t(5145),t(2558),t(17762),t(8520),t(74398),t(70065)},8520:function(s,c,t){"use strict";var r=t(24491),o=t(61186),a=t(62759),n=t(42326),e=t(62588),i=t(41935),u=t(65722);r({target:"Promise",stat:!0,forced:u},{race:function(f){var d=this,v=n.f(d),p=v.reject,h=e(function(){var y=a(d.resolve);i(f,function(g){o(y,d,g).then(v.resolve,p)})});return h.error&&p(h.value),v.promise}})},74398:function(s,c,t){"use strict";var r=t(24491),o=t(42326),a=t(64855).CONSTRUCTOR;r({target:"Promise",stat:!0,forced:a},{reject:function(e){var i=o.f(this),u=i.reject;return u(e),i.promise}})},70065:function(s,c,t){"use strict";var r=t(24491),o=t(57574),a=t(28344),n=t(64671),e=t(64855).CONSTRUCTOR,i=t(85337),u=o("Promise"),l=a&&!e;r({target:"Promise",stat:!0,forced:a||e},{resolve:function(d){return i(l&&this===u?n:this,d)}})},3945:function(s,c,t){"use strict";var r=t(24491);r({target:"Reflect",stat:!0},{has:function(a,n){return n in a}})},91438:function(s,c,t){"use strict";var r=t(24491),o=t(92524);r({target:"RegExp",proto:!0,forced:/./.exec!==o},{exec:o})},91402:function(s,c,t){"use strict";var r=t(38681).PROPER,o=t(51551),a=t(67800),n=t(10968),e=t(43316),i=t(80079),u="toString",l=RegExp.prototype,f=l[u],d=e(function(){return f.call({source:"a",flags:"b"})!=="/a/b"}),v=r&&f.name!==u;(d||v)&&o(l,u,function(){var h=a(this),y=n(h.source),g=n(i(h));return"/"+y+"/"+g},{unsafe:!0})},88242:function(s,c,t){"use strict";var r=t(24491),o=t(26875),a=t(19986),n=t(89207),e=t(10968),i=t(86143),u=o("".indexOf);r({target:"String",proto:!0,forced:!i("includes")},{includes:function(f){return!!~u(e(n(this)),e(a(f)),arguments.length>1?arguments[1]:void 0)}})},84217:function(s,c,t){"use strict";var r=t(19574).charAt,o=t(10968),a=t(54284),n=t(50415),e=t(69494),i="String Iterator",u=a.set,l=a.getterFor(i);n(String,"String",function(f){u(this,{type:i,string:o(f),index:0})},function(){var d=l(this),v=d.string,p=d.index,h;return p>=v.length?e(void 0,!0):(h=r(v,p),d.index+=h.length,e(h,!1))})},65286:function(s,c,t){"use strict";var r=t(61186),o=t(4853),a=t(67800),n=t(4488),e=t(90793),i=t(10968),u=t(89207),l=t(42319),f=t(48528),d=t(92403);o("match",function(v,p,h){return[function(g){var m=u(this),M=n(g)?void 0:l(g,v);return M?r(M,g,m):new RegExp(g)[v](i(m))},function(y){var g=a(this),m=i(y),M=h(p,g,m);if(M.done)return M.value;if(!g.global)return d(g,m);var E=g.unicode;g.lastIndex=0;for(var O=[],I=0,S;(S=d(g,m))!==null;){var x=i(S[0]);O[I]=x,x===""&&(g.lastIndex=f(m,e(g.lastIndex),E)),I++}return I===0?null:O}]})},66483:function(s,c,t){"use strict";var r=t(88320),o=t(61186),a=t(26875),n=t(4853),e=t(43316),i=t(67800),u=t(46050),l=t(4488),f=t(7058),d=t(90793),v=t(10968),p=t(89207),h=t(48528),y=t(42319),g=t(48383),m=t(92403),M=t(34800),E=M("replace"),O=Math.max,I=Math.min,S=a([].concat),x=a([].push),T=a("".indexOf),N=a("".slice),A=function(Y){return Y===void 0?Y:String(Y)},D=function(){return"a".replace(/./,"$0")==="$0"}(),B=function(){return/./[E]?/./[E]("a","$0")==="":!1}(),H=!e(function(){var Y=/./;return Y.exec=function(){var z=[];return z.groups={a:"7"},z},"".replace(Y,"$")!=="7"});n("replace",function(Y,z,P){var b=B?"$":"$0";return[function(L,C){var j=p(this),U=l(L)?void 0:y(L,E);return U?o(U,L,j,C):o(z,v(j),L,C)},function(R,L){var C=i(this),j=v(R);if(typeof L=="string"&&T(L,b)===-1&&T(L,"$<")===-1){var U=P(z,C,j,L);if(U.done)return U.value}var w=u(L);w||(L=v(L));var X=C.global,K;X&&(K=C.unicode,C.lastIndex=0);for(var ut=[],it;it=m(C,j),!(it===null||(x(ut,it),!X));){var ct=v(it[0]);ct===""&&(C.lastIndex=h(j,d(C.lastIndex),K))}for(var at="",_=0,vt=0;vt=_&&(at+=N(j,_,ht)+St,_=ht+dt.length)}return at+N(j,_)}]},!H||!D||B)},23701:function(s,c,t){"use strict";var r=t(27510);r("asyncIterator")},4002:function(s,c,t){"use strict";var r=t(24491),o=t(40410),a=t(61186),n=t(26875),e=t(28344),i=t(80863),u=t(74334),l=t(43316),f=t(38340),d=t(69808),v=t(67800),p=t(7222),h=t(59326),y=t(10968),g=t(52033),m=t(42451),M=t(22867),E=t(40611),O=t(12343),I=t(88458),S=t(66478),x=t(56516),T=t(87492),N=t(77382),A=t(51551),D=t(22011),B=t(22240),H=t(86178),Y=t(64458),z=t(14523),P=t(34800),b=t(95176),R=t(27510),L=t(55139),C=t(78976),j=t(54284),U=t(73614).forEach,w=H("hidden"),X="Symbol",K="prototype",ut=j.set,it=j.getterFor(X),ct=Object[K],at=o.Symbol,_=at&&at[K],vt=o.RangeError,dt=o.TypeError,ht=o.QObject,Ot=S.f,St=x.f,Pt=O.f,Mt=N.f,Et=n([].push),Ct=B("symbols"),Nt=B("op-symbols"),It=B("wks"),Tt=!ht||!ht[K]||!ht[K].findChild,J=function(st,ot,W){var Q=Ot(ct,ot);Q&&delete ct[ot],St(st,ot,W),Q&&st!==ct&&St(ct,ot,Q)},lt=i&&l(function(){return m(St({},"a",{get:function(){return St(this,"a",{value:7}).a}})).a!==7})?J:St,F=function(st,ot){var W=Ct[st]=m(_);return ut(W,{type:X,tag:st,description:ot}),i||(W.description=ot),W},Z=function(ot,W,Q){ot===ct&&Z(Nt,W,Q),v(ot);var nt=h(W);return v(Q),f(Ct,nt)?(Q.enumerable?(f(ot,w)&&ot[w][nt]&&(ot[w][nt]=!1),Q=m(Q,{enumerable:g(0,!1)})):(f(ot,w)||St(ot,w,g(1,m(null))),ot[w][nt]=!0),lt(ot,nt,Q)):St(ot,nt,Q)},et=function(ot,W){v(ot);var Q=p(W),nt=M(Q).concat(pt(Q));return U(nt,function(gt){(!i||a(ft,Q,gt))&&Z(ot,gt,Q[gt])}),ot},k=function(ot,W){return W===void 0?m(ot):et(m(ot),W)},ft=function(ot){var W=h(ot),Q=a(Mt,this,W);return this===ct&&f(Ct,W)&&!f(Nt,W)?!1:Q||!f(this,W)||!f(Ct,W)||f(this,w)&&this[w][W]?Q:!0},mt=function(ot,W){var Q=p(ot),nt=h(W);if(!(Q===ct&&f(Ct,nt)&&!f(Nt,nt))){var gt=Ot(Q,nt);return gt&&f(Ct,nt)&&!(f(Q,w)&&Q[w][nt])&&(gt.enumerable=!0),gt}},yt=function(ot){var W=Pt(p(ot)),Q=[];return U(W,function(nt){!f(Ct,nt)&&!f(Y,nt)&&Et(Q,nt)}),Q},pt=function(st){var ot=st===ct,W=Pt(ot?Nt:p(st)),Q=[];return U(W,function(nt){f(Ct,nt)&&(!ot||f(ct,nt))&&Et(Q,Ct[nt])}),Q};u||(at=function(){if(d(_,this))throw new dt("Symbol is not a constructor");var ot=!arguments.length||arguments[0]===void 0?void 0:y(arguments[0]),W=z(ot),Q=function(nt){var gt=this===void 0?o:this;gt===ct&&a(Q,Nt,nt),f(gt,w)&&f(gt[w],W)&&(gt[w][W]=!1);var Rt=g(1,nt);try{lt(gt,W,Rt)}catch(jt){if(!(jt instanceof vt))throw jt;J(gt,W,Rt)}};return i&&Tt&<(ct,W,{configurable:!0,set:Q}),F(W,ot)},_=at[K],A(_,"toString",function(){return it(this).tag}),A(at,"withoutSetter",function(st){return F(z(st),st)}),N.f=ft,x.f=Z,T.f=et,S.f=mt,E.f=O.f=yt,I.f=pt,b.f=function(st){return F(P(st),st)},i&&(D(_,"description",{configurable:!0,get:function(){return it(this).description}}),e||A(ct,"propertyIsEnumerable",ft,{unsafe:!0}))),r({global:!0,constructor:!0,wrap:!0,forced:!u,sham:!u},{Symbol:at}),U(M(It),function(st){R(st)}),r({target:X,stat:!0,forced:!u},{useSetter:function(){Tt=!0},useSimple:function(){Tt=!1}}),r({target:"Object",stat:!0,forced:!u,sham:!i},{create:k,defineProperty:Z,defineProperties:et,getOwnPropertyDescriptor:mt}),r({target:"Object",stat:!0,forced:!u},{getOwnPropertyNames:yt}),L(),C(at,X),Y[w]=!0},48932:function(s,c,t){"use strict";var r=t(24491),o=t(80863),a=t(40410),n=t(26875),e=t(38340),i=t(46050),u=t(69808),l=t(10968),f=t(22011),d=t(74371),v=a.Symbol,p=v&&v.prototype;if(o&&i(v)&&(!("description"in p)||v().description!==void 0)){var h={},y=function(){var x=arguments.length<1||arguments[0]===void 0?void 0:l(arguments[0]),T=u(p,this)?new v(x):x===void 0?v():v(x);return x===""&&(h[T]=!0),T};d(y,v),y.prototype=p,p.constructor=y;var g=String(v("description detection"))==="Symbol(description detection)",m=n(p.valueOf),M=n(p.toString),E=/^Symbol\((.*)\)[^)]+$/,O=n("".replace),I=n("".slice);f(p,"description",{configurable:!0,get:function(){var x=m(this);if(e(h,x))return"";var T=M(x),N=g?I(T,7,-1):O(T,E,"$1");return N===""?void 0:N}}),r({global:!0,constructor:!0,forced:!0},{Symbol:y})}},70921:function(s,c,t){"use strict";var r=t(24491),o=t(57574),a=t(38340),n=t(10968),e=t(22240),i=t(92275),u=e("string-to-symbol-registry"),l=e("symbol-to-string-registry");r({target:"Symbol",stat:!0,forced:!i},{for:function(f){var d=n(f);if(a(u,d))return u[d];var v=o("Symbol")(d);return u[d]=v,l[v]=d,v}})},74780:function(s,c,t){"use strict";t(4002),t(70921),t(72503),t(23809),t(11608)},72503:function(s,c,t){"use strict";var r=t(24491),o=t(38340),a=t(44162),n=t(81800),e=t(22240),i=t(92275),u=e("symbol-to-string-registry");r({target:"Symbol",stat:!0,forced:!i},{keyFor:function(f){if(!a(f))throw new TypeError(n(f)+" is not a symbol");if(o(u,f))return u[f]}})},10029:function(s,c,t){"use strict";var r=t(27510),o=t(55139);r("toPrimitive"),o()},70258:function(s,c,t){"use strict";var r=t(57574),o=t(27510),a=t(78976);o("toStringTag"),a(r("Symbol"),"Symbol")},8553:function(s,c,t){"use strict";var r=t(91433),o=t(40410),a=t(26875),n=t(34810),e=t(8948),i=t(99089),u=t(24950),l=t(33013),f=t(54284).enforce,d=t(43316),v=t(38159),p=Object,h=Array.isArray,y=p.isExtensible,g=p.isFrozen,m=p.isSealed,M=p.freeze,E=p.seal,O=!o.ActiveXObject&&"ActiveXObject"in o,I,S=function(Y){return function(){return Y(this,arguments.length?arguments[0]:void 0)}},x=i("WeakMap",S,u),T=x.prototype,N=a(T.set),A=function(){return r&&d(function(){var Y=M([]);return N(new x,Y,1),!g(Y)})};if(v)if(O){I=u.getConstructor(S,"WeakMap",!0),e.enable();var D=a(T.delete),B=a(T.has),H=a(T.get);n(T,{delete:function(Y){if(l(Y)&&!y(Y)){var z=f(this);return z.frozen||(z.frozen=new I),D(this,Y)||z.frozen.delete(Y)}return D(this,Y)},has:function(z){if(l(z)&&!y(z)){var P=f(this);return P.frozen||(P.frozen=new I),B(this,z)||P.frozen.has(z)}return B(this,z)},get:function(z){if(l(z)&&!y(z)){var P=f(this);return P.frozen||(P.frozen=new I),B(this,z)?H(this,z):P.frozen.get(z)}return H(this,z)},set:function(z,P){if(l(z)&&!y(z)){var b=f(this);b.frozen||(b.frozen=new I),B(this,z)?N(this,z,P):b.frozen.set(z,P)}else N(this,z,P);return this}})}else A()&&n(T,{set:function(z,P){var b;return h(z)&&(g(z)?b=M:m(z)&&(b=E)),N(this,z,P),b&&b(z),this}})},92995:function(s,c,t){"use strict";t(8553)},99333:function(s,c,t){"use strict";t(9680)},43477:function(s,c,t){"use strict";var r=t(40410),o=t(2223),a=t(77637),n=t(19594),e=t(29954),i=function(l){if(l&&l.forEach!==n)try{e(l,"forEach",n)}catch{l.forEach=n}};for(var u in o)o[u]&&i(r[u]&&r[u].prototype);i(a)},94216:function(s,c,t){"use strict";var r=t(40410),o=t(2223),a=t(77637),n=t(18091),e=t(29954),i=t(78976),u=t(34800),l=u("iterator"),f=n.values,d=function(p,h){if(p){if(p[l]!==f)try{e(p,l,f)}catch{p[l]=f}if(i(p,h,!0),o[h]){for(var y in n)if(p[y]!==n[y])try{e(p,y,n[y])}catch{p[y]=n[y]}}}};for(var v in o)d(r[v]&&r[v].prototype,v);d(a,"DOMTokenList")},29177:function(s,c,t){"use strict";t(18091);var r=t(24491),o=t(40410),a=t(20410),n=t(61186),e=t(26875),i=t(80863),u=t(17439),l=t(51551),f=t(22011),d=t(34810),v=t(78976),p=t(20965),h=t(54284),y=t(31076),g=t(46050),m=t(38340),M=t(38223),E=t(15076),O=t(67800),I=t(33013),S=t(10968),x=t(42451),T=t(52033),N=t(21220),A=t(14496),D=t(69494),B=t(11467),H=t(34800),Y=t(10585),z=H("iterator"),P="URLSearchParams",b=P+"Iterator",R=h.set,L=h.getterFor(P),C=h.getterFor(b),j=a("fetch"),U=a("Request"),w=a("Headers"),X=U&&U.prototype,K=w&&w.prototype,ut=o.RegExp,it=o.TypeError,ct=o.decodeURIComponent,at=o.encodeURIComponent,_=e("".charAt),vt=e([].join),dt=e([].push),ht=e("".replace),Ot=e([].shift),St=e([].splice),Pt=e("".split),Mt=e("".slice),Et=/\+/g,Ct=Array(4),Nt=function(W){return Ct[W-1]||(Ct[W-1]=ut("((?:%[\\da-f]{2}){"+W+"})","gi"))},It=function(W){try{return ct(W)}catch{return W}},Tt=function(W){var Q=ht(W,Et," "),nt=4;try{return ct(Q)}catch{for(;nt;)Q=ht(Q,Nt(nt--),It);return Q}},J=/[!'()~]|%20/g,lt={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+"},F=function(W){return lt[W]},Z=function(W){return ht(at(W),J,F)},et=p(function(Q,nt){R(this,{type:b,target:L(Q).entries,index:0,kind:nt})},P,function(){var Q=C(this),nt=Q.target,gt=Q.index++;if(!nt||gt>=nt.length)return Q.target=void 0,D(void 0,!0);var Rt=nt[gt];switch(Q.kind){case"keys":return D(Rt.key,!1);case"values":return D(Rt.value,!1)}return D([Rt.key,Rt.value],!1)},!0),k=function(W){this.entries=[],this.url=null,W!==void 0&&(I(W)?this.parseObject(W):this.parseQuery(typeof W=="string"?_(W,0)==="?"?Mt(W,1):W:S(W)))};k.prototype={type:P,bindURL:function(W){this.url=W,this.update()},parseObject:function(W){var Q=this.entries,nt=A(W),gt,Rt,jt,zt,Dt,Lt,$t;if(nt)for(gt=N(W,nt),Rt=gt.next;!(jt=n(Rt,gt)).done;){if(zt=N(O(jt.value)),Dt=zt.next,(Lt=n(Dt,zt)).done||($t=n(Dt,zt)).done||!n(Dt,zt).done)throw new it("Expected sequence with length 2");dt(Q,{key:S(Lt.value),value:S($t.value)})}else for(var Jt in W)m(W,Jt)&&dt(Q,{key:Jt,value:S(W[Jt])})},parseQuery:function(W){if(W)for(var Q=this.entries,nt=Pt(W,"&"),gt=0,Rt,jt;gt0?arguments[0]:void 0,nt=R(this,new k(Q));i||(this.size=nt.entries.length)},mt=ft.prototype;if(d(mt,{append:function(Q,nt){var gt=L(this);B(arguments.length,2),dt(gt.entries,{key:S(Q),value:S(nt)}),i||this.length++,gt.updateURL()},delete:function(W){for(var Q=L(this),nt=B(arguments.length,1),gt=Q.entries,Rt=S(W),jt=nt<2?void 0:arguments[1],zt=jt===void 0?jt:S(jt),Dt=0;Dtgt.key?1:-1}),Q.updateURL()},forEach:function(Q){for(var nt=L(this).entries,gt=M(Q,arguments.length>1?arguments[1]:void 0),Rt=0,jt;Rt1?st(arguments[1]):{})}}),g(U)){var ot=function(Q){return y(this,X),new U(Q,arguments.length>1?st(arguments[1]):{})};X.constructor=ot,ot.prototype=X,r({global:!0,constructor:!0,dontCallGetSet:!0,forced:!0},{Request:ot})}}s.exports={URLSearchParams:ft,getState:L}},21363:function(s,c,t){"use strict";t(29177)},18085:function(s,c,t){"use strict";t(84217);var r=t(24491),o=t(80863),a=t(17439),n=t(40410),e=t(38223),i=t(26875),u=t(51551),l=t(22011),f=t(31076),d=t(38340),v=t(47034),p=t(67189),h=t(63003),y=t(19574).codeAt,g=t(15708),m=t(10968),M=t(78976),E=t(11467),O=t(29177),I=t(54284),S=I.set,x=I.getterFor("URL"),T=O.URLSearchParams,N=O.getState,A=n.URL,D=n.TypeError,B=n.parseInt,H=Math.floor,Y=Math.pow,z=i("".charAt),P=i(/./.exec),b=i([].join),R=i(1 .toString),L=i([].pop),C=i([].push),j=i("".replace),U=i([].shift),w=i("".split),X=i("".slice),K=i("".toLowerCase),ut=i([].unshift),it="Invalid authority",ct="Invalid scheme",at="Invalid host",_="Invalid port",vt=/[a-z]/i,dt=/[\d+-.a-z]/i,ht=/\d/,Ot=/^0x/i,St=/^[0-7]+$/,Pt=/^\d+$/,Mt=/^[\da-f]+$/i,Et=/[\0\t\n\r #%/:<>?@[\\\]^|]/,Ct=/[\0\t\n\r #/:<>?@[\\\]^|]/,Nt=/^[\u0000-\u0020]+/,It=/(^|[^\u0000-\u0020])[\u0000-\u0020]+$/,Tt=/[\t\n\r]/g,J,lt=function(G){var tt=w(G,"."),V,$,q,At,xt,bt,Ut;if(tt.length&&tt[tt.length-1]===""&&tt.length--,V=tt.length,V>4)return G;for($=[],q=0;q1&&z(At,0)==="0"&&(xt=P(Ot,At)?16:8,At=X(At,xt===8?1:2)),At==="")bt=0;else{if(!P(xt===10?Pt:xt===8?St:Mt,At))return G;bt=B(At,xt)}C($,bt)}for(q=0;q=Y(256,5-V))return null}else if(bt>255)return null;for(Ut=L($),q=0;q<$.length;q++)Ut+=$[q]*Y(256,3-q);return Ut},F=function(G){var tt=[0,0,0,0,0,0,0,0],V=0,$=null,q=0,At,xt,bt,Ut,Ft,Gt,rt,Bt=function(){return z(G,q)};if(Bt()===":"){if(z(G,1)!==":")return;q+=2,V++,$=V}for(;Bt();){if(V===8)return;if(Bt()===":"){if($!==null)return;q++,V++,$=V;continue}for(At=xt=0;xt<4&&P(Mt,Bt());)At=At*16+B(Bt(),16),q++,xt++;if(Bt()==="."){if(xt===0||(q-=xt,V>6))return;for(bt=0;Bt();){if(Ut=null,bt>0)if(Bt()==="."&&bt<4)q++;else return;if(!P(ht,Bt()))return;for(;P(ht,Bt());){if(Ft=B(Bt(),10),Ut===null)Ut=Ft;else{if(Ut===0)return;Ut=Ut*10+Ft}if(Ut>255)return;q++}tt[V]=tt[V]*256+Ut,bt++,(bt===2||bt===4)&&V++}if(bt!==4)return;break}else if(Bt()===":"){if(q++,!Bt())return}else if(Bt())return;tt[V++]=At}if($!==null)for(Gt=V-$,V=7;V!==0&&Gt>0;)rt=tt[V],tt[V--]=tt[$+Gt-1],tt[$+--Gt]=rt;else if(V!==8)return;return tt},Z=function(G){for(var tt=null,V=1,$=null,q=0,At=0;At<8;At++)G[At]!==0?(q>V&&(tt=$,V=q),$=null,q=0):($===null&&($=At),++q);return q>V&&(tt=$,V=q),tt},et=function(G){var tt,V,$,q;if(typeof G=="number"){for(tt=[],V=0;V<4;V++)ut(tt,G%256),G=H(G/256);return b(tt,".")}else if(typeof G=="object"){for(tt="",$=Z(G),V=0;V<8;V++)q&&G[V]===0||(q&&(q=!1),$===V?(tt+=V?":":"::",q=!0):(tt+=R(G[V],16),V<7&&(tt+=":")));return"["+tt+"]"}return G},k={},ft=v({},k,{" ":1,'"':1,"<":1,">":1,"`":1}),mt=v({},ft,{"#":1,"?":1,"{":1,"}":1}),yt=v({},mt,{"/":1,":":1,";":1,"=":1,"@":1,"[":1,"\\":1,"]":1,"^":1,"|":1}),pt=function(G,tt){var V=y(G,0);return V>32&&V<127&&!d(tt,G)?G:encodeURIComponent(G)},st={ftp:21,file:null,http:80,https:443,ws:80,wss:443},ot=function(G,tt){var V;return G.length===2&&P(vt,z(G,0))&&((V=z(G,1))===":"||!tt&&V==="|")},W=function(G){var tt;return G.length>1&&ot(X(G,0,2))&&(G.length===2||(tt=z(G,2))==="/"||tt==="\\"||tt==="?"||tt==="#")},Q=function(G){return G==="."||K(G)==="%2e"},nt=function(G){return G=K(G),G===".."||G==="%2e."||G===".%2e"||G==="%2e%2e"},gt={},Rt={},jt={},zt={},Dt={},Lt={},$t={},Jt={},_t={},tr={},rr={},er={},nr={},or={},fr={},ar={},Zt={},Ht={},cr={},Xt={},Wt={},sr=function(G,tt,V){var $=m(G),q,At,xt;if(tt){if(At=this.parse($),At)throw new D(At);this.searchParams=null}else{if(V!==void 0&&(q=new sr(V,!0)),At=this.parse($,null,q),At)throw new D(At);xt=N(new T),xt.bindURL(this),this.searchParams=xt}};sr.prototype={type:"URL",parse:function(G,tt,V){var $=this,q=tt||gt,At=0,xt="",bt=!1,Ut=!1,Ft=!1,Gt,rt,Bt,Kt;for(G=m(G),tt||($.scheme="",$.username="",$.password="",$.host=null,$.port=null,$.path=[],$.query=null,$.fragment=null,$.cannotBeABaseURL=!1,G=j(G,Nt,""),G=j(G,It,"$1")),G=j(G,Tt,""),Gt=p(G);At<=Gt.length;){switch(rt=Gt[At],q){case gt:if(rt&&P(vt,rt))xt+=K(rt),q=Rt;else{if(tt)return ct;q=jt;continue}break;case Rt:if(rt&&(P(dt,rt)||rt==="+"||rt==="-"||rt==="."))xt+=K(rt);else if(rt===":"){if(tt&&($.isSpecial()!==d(st,xt)||xt==="file"&&($.includesCredentials()||$.port!==null)||$.scheme==="file"&&!$.host))return;if($.scheme=xt,tt){$.isSpecial()&&st[$.scheme]===$.port&&($.port=null);return}xt="",$.scheme==="file"?q=or:$.isSpecial()&&V&&V.scheme===$.scheme?q=zt:$.isSpecial()?q=Jt:Gt[At+1]==="/"?(q=Dt,At++):($.cannotBeABaseURL=!0,C($.path,""),q=cr)}else{if(tt)return ct;xt="",q=jt,At=0;continue}break;case jt:if(!V||V.cannotBeABaseURL&&rt!=="#")return ct;if(V.cannotBeABaseURL&&rt==="#"){$.scheme=V.scheme,$.path=h(V.path),$.query=V.query,$.fragment="",$.cannotBeABaseURL=!0,q=Wt;break}q=V.scheme==="file"?or:Lt;continue;case zt:if(rt==="/"&&Gt[At+1]==="/")q=_t,At++;else{q=Lt;continue}break;case Dt:if(rt==="/"){q=tr;break}else{q=Ht;continue}case Lt:if($.scheme=V.scheme,rt===J)$.username=V.username,$.password=V.password,$.host=V.host,$.port=V.port,$.path=h(V.path),$.query=V.query;else if(rt==="/"||rt==="\\"&&$.isSpecial())q=$t;else if(rt==="?")$.username=V.username,$.password=V.password,$.host=V.host,$.port=V.port,$.path=h(V.path),$.query="",q=Xt;else if(rt==="#")$.username=V.username,$.password=V.password,$.host=V.host,$.port=V.port,$.path=h(V.path),$.query=V.query,$.fragment="",q=Wt;else{$.username=V.username,$.password=V.password,$.host=V.host,$.port=V.port,$.path=h(V.path),$.path.length--,q=Ht;continue}break;case $t:if($.isSpecial()&&(rt==="/"||rt==="\\"))q=_t;else if(rt==="/")q=tr;else{$.username=V.username,$.password=V.password,$.host=V.host,$.port=V.port,q=Ht;continue}break;case Jt:if(q=_t,rt!=="/"||z(xt,At+1)!=="/")continue;At++;break;case _t:if(rt!=="/"&&rt!=="\\"){q=tr;continue}break;case tr:if(rt==="@"){bt&&(xt="%40"+xt),bt=!0,Bt=p(xt);for(var ir=0;ir65535)return _;$.port=$.isSpecial()&&ur===st[$.scheme]?null:ur,xt=""}if(tt)return;q=Zt;continue}else return _;break;case or:if($.scheme="file",rt==="/"||rt==="\\")q=fr;else if(V&&V.scheme==="file")switch(rt){case J:$.host=V.host,$.path=h(V.path),$.query=V.query;break;case"?":$.host=V.host,$.path=h(V.path),$.query="",q=Xt;break;case"#":$.host=V.host,$.path=h(V.path),$.query=V.query,$.fragment="",q=Wt;break;default:W(b(h(Gt,At),""))||($.host=V.host,$.path=h(V.path),$.shortenPath()),q=Ht;continue}else{q=Ht;continue}break;case fr:if(rt==="/"||rt==="\\"){q=ar;break}V&&V.scheme==="file"&&!W(b(h(Gt,At),""))&&(ot(V.path[0],!0)?C($.path,V.path[0]):$.host=V.host),q=Ht;continue;case ar:if(rt===J||rt==="/"||rt==="\\"||rt==="?"||rt==="#"){if(!tt&&ot(xt))q=Ht;else if(xt===""){if($.host="",tt)return;q=Zt}else{if(Kt=$.parseHost(xt),Kt)return Kt;if($.host==="localhost"&&($.host=""),tt)return;xt="",q=Zt}continue}else xt+=rt;break;case Zt:if($.isSpecial()){if(q=Ht,rt!=="/"&&rt!=="\\")continue}else if(!tt&&rt==="?")$.query="",q=Xt;else if(!tt&&rt==="#")$.fragment="",q=Wt;else if(rt!==J&&(q=Ht,rt!=="/"))continue;break;case Ht:if(rt===J||rt==="/"||rt==="\\"&&$.isSpecial()||!tt&&(rt==="?"||rt==="#")){if(nt(xt)?($.shortenPath(),rt!=="/"&&!(rt==="\\"&&$.isSpecial())&&C($.path,"")):Q(xt)?rt!=="/"&&!(rt==="\\"&&$.isSpecial())&&C($.path,""):($.scheme==="file"&&!$.path.length&&ot(xt)&&($.host&&($.host=""),xt=z(xt,0)+":"),C($.path,xt)),xt="",$.scheme==="file"&&(rt===J||rt==="?"||rt==="#"))for(;$.path.length>1&&$.path[0]==="";)U($.path);rt==="?"?($.query="",q=Xt):rt==="#"&&($.fragment="",q=Wt)}else xt+=pt(rt,mt);break;case cr:rt==="?"?($.query="",q=Xt):rt==="#"?($.fragment="",q=Wt):rt!==J&&($.path[0]+=pt(rt,k));break;case Xt:!tt&&rt==="#"?($.fragment="",q=Wt):rt!==J&&(rt==="'"&&$.isSpecial()?$.query+="%27":rt==="#"?$.query+="%23":$.query+=pt(rt,k));break;case Wt:rt!==J&&($.fragment+=pt(rt,ft));break}At++}},parseHost:function(G){var tt,V,$;if(z(G,0)==="["){if(z(G,G.length-1)!=="]"||(tt=F(X(G,1,-1)),!tt))return at;this.host=tt}else if(this.isSpecial()){if(G=g(G),P(Et,G)||(tt=lt(G),tt===null))return at;this.host=tt}else{if(P(Ct,G))return at;for(tt="",V=p(G),$=0;$1?arguments[1]:void 0,q=S(V,new sr(tt,!1,$));o||(V.href=q.serialize(),V.origin=q.getOrigin(),V.protocol=q.getProtocol(),V.username=q.getUsername(),V.password=q.getPassword(),V.host=q.getHost(),V.hostname=q.getHostname(),V.port=q.getPort(),V.pathname=q.getPathname(),V.search=q.getSearch(),V.searchParams=q.getSearchParams(),V.hash=q.getHash())},Yt=kt.prototype,wt=function(G,tt){return{get:function(){return x(this)[G]()},set:tt&&function(V){return x(this)[tt](V)},configurable:!0,enumerable:!0}};if(o&&(l(Yt,"href",wt("serialize","setHref")),l(Yt,"origin",wt("getOrigin")),l(Yt,"protocol",wt("getProtocol","setProtocol")),l(Yt,"username",wt("getUsername","setUsername")),l(Yt,"password",wt("getPassword","setPassword")),l(Yt,"host",wt("getHost","setHost")),l(Yt,"hostname",wt("getHostname","setHostname")),l(Yt,"port",wt("getPort","setPort")),l(Yt,"pathname",wt("getPathname","setPathname")),l(Yt,"search",wt("getSearch","setSearch")),l(Yt,"searchParams",wt("getSearchParams")),l(Yt,"hash",wt("getHash","setHash"))),u(Yt,"toJSON",function(){return x(this).serialize()},{enumerable:!0}),u(Yt,"toString",function(){return x(this).serialize()},{enumerable:!0}),A){var vr=A.createObjectURL,dr=A.revokeObjectURL;vr&&u(kt,"createObjectURL",e(vr,A)),dr&&u(kt,"revokeObjectURL",e(dr,A))}M(kt,"URL"),r({global:!0,constructor:!0,forced:!a,sham:!o},{URL:kt})},63879:function(s,c,t){"use strict";t(18085)},14583:function(s,c,t){"use strict";var r=t(24491),o=t(61186);r({target:"URL",proto:!0,enumerable:!0},{toJSON:function(){return o(URL.prototype.toString,this)}})},53079:function(s){"use strict";s.exports=JSON.parse('{"zh-CN":{"\u5F00\u542F\u6743\u9650\u7BA1\u7406":"\u5F00\u542F\u6743\u9650\u7BA1\u7406","\u7528\u6237\u7EC4\u540D":"\u7528\u6237\u7EC4\u540D","\u6388\u6743\u671F\u9650":"\u6388\u6743\u671F\u9650","\u81EA\u5B9A\u4E49":"\u81EA\u5B9A\u4E49","\u5929":"\u5929","\u5230\u671F\u65F6\u95F4":"\u5230\u671F\u65F6\u95F4","\u7406\u7531":"\u7406\u7531","\u786E\u5B9A":"\u786E\u5B9A","\u53D6\u6D88":"\u53D6\u6D88","1\u4E2A\u6708":"1\u4E2A\u6708","3\u4E2A\u6708":"3\u4E2A\u6708","6\u4E2A\u6708":"6\u4E2A\u6708","12\u4E2A\u6708":"12\u4E2A\u6708","\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650":"\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650","\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531":"\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531","\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279":"\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279","\u7528\u6237\u7EC4":"\u7528\u6237\u7EC4","\u6DFB\u52A0\u65F6\u95F4":"\u6DFB\u52A0\u65F6\u95F4","\u6709\u6548\u671F":"\u6709\u6548\u671F","\u72B6\u6001":"\u72B6\u6001","\u64CD\u4F5C":"\u64CD\u4F5C","\u6743\u9650\u8BE6\u60C5":"\u6743\u9650\u8BE6\u60C5","\u7533\u8BF7\u52A0\u5165":"\u7533\u8BF7\u52A0\u5165","\u7EED\u671F":"\u7EED\u671F","\u9000\u51FA":"\u9000\u51FA","\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4":"\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4","\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002":"\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u3010{0}\u3011\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002","\u672A\u52A0\u5165":"\u672A\u52A0\u5165","\u6B63\u5E38":"\u6B63\u5E38","\u5DF2\u8FC7\u671F":"\u5DF2\u8FC7\u671F","\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650":"\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650","\u6743\u9650\u89D2\u8272":"\u6743\u9650\u89D2\u8272","\u5220\u9664":"\u5220\u9664","\u65B0\u5EFA\u7528\u6237\u7EC4":"\u65B0\u5EFA\u7528\u6237\u7EC4","\u5173\u95ED\u6743\u9650\u7BA1\u7406":"\u5173\u95ED\u6743\u9650\u7BA1\u7406","\u662F\u5426\u5220\u9664\u7528\u6237\u7EC4":"\u662F\u5426\u5220\u9664\u7528\u6237\u7EC4","\u786E\u8BA4\u5173\u95ED\u3010\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F":"\u786E\u8BA4\u5173\u95ED\u3010{0}\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F","\u5173\u95ED\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"\u5173\u95ED{0}\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A","\u6D41\u6C34\u7EBF":"\u6D41\u6C34\u7EBF","\u6D41\u6C34\u7EBF\u7EC4":"\u6D41\u6C34\u7EBF\u7EC4","\u6D41\u6C34\u7EBF\u6A21\u677F":"\u6D41\u6C34\u7EBF\u6A21\u677F","\u5173\u95ED\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"\u5173\u95ED{0}\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A","\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664","\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664","\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650":"\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650","\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650":"\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650","\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!":"\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!","\u4E0D\u80FD\u6062\u590D":"\u4E0D\u80FD\u6062\u590D","\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650":"\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650","\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B":"\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B","\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B":"\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B","\u6CA1\u6709\u64CD\u4F5C\u6743\u9650":"\u6CA1\u6709\u64CD\u4F5C\u6743\u9650","\u53BB\u7533\u8BF7":"\u53BB\u7533\u8BF7","\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762":"\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762","\u5237\u65B0\u9875\u9762":"\u5237\u65B0\u9875\u9762","\u5173\u95ED":"\u5173\u95ED","\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4":"\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4","\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650":"\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650","\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD":"\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD","\u6D41\u6C34\u7EBF\u7BA1\u7406":"\u6D41\u6C34\u7EBF\u7BA1\u7406","\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406":"\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406","\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406":"\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4":"\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u9000\u51FA\u5148\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u9000\u51FA\u7528\u6237\u7EC4":"\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u9000\u51FA\u5148\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u9000\u51FA\u7528\u6237\u7EC4"},"en-US":{"\u5F00\u542F\u6743\u9650\u7BA1\u7406":"Turn on permission management","\u7528\u6237\u7EC4\u540D":"User Group Name","\u6388\u6743\u671F\u9650":"Authorization Term","\u81EA\u5B9A\u4E49":"Custom","\u5929":"day","\u5230\u671F\u65F6\u95F4":"Expire at","\u7406\u7531":"Reason","\u786E\u5B9A":"Confirm","\u53D6\u6D88":"Cancel","1\u4E2A\u6708":"1 Month","3\u4E2A\u6708":"3 Month","6\u4E2A\u6708":"6 Month","12\u4E2A\u6708":"12 Month","\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650":"Please select the application period","\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531":"Please fill in the reason for application","\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279":"Application successful, please wait for approval","\u7528\u6237\u7EC4":"User Group","\u6DFB\u52A0\u65F6\u95F4":"Add Time","\u6709\u6548\u671F":"Validity","\u72B6\u6001":"Status","\u64CD\u4F5C":"Actions","\u6743\u9650\u8BE6\u60C5":"Permission Details","\u7533\u8BF7\u52A0\u5165":"Apply to join","\u7EED\u671F":"Renewal","\u9000\u51FA":"Exit","\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4":"Confirm exit user group","\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002":"After logging out, you will no longer be able to use the permissions granted by {0}.","\u672A\u52A0\u5165":"Not Joined","\u6B63\u5E38":"Normal","\u5DF2\u8FC7\u671F":"Expired","\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650":"No user group management permission for this project","\u6743\u9650\u89D2\u8272":"Permission Roles","\u5220\u9664":"Delete","\u65B0\u5EFA\u7528\u6237\u7EC4":"Create new user group","\u5173\u95ED\u6743\u9650\u7BA1\u7406":"Close Permission Manage","\u786E\u8BA4\u5173\u95ED\u3010\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F":"Are you sure to close \u3010{0}\u3011 permission management?","\u5173\u95ED\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"Turning off {0} permission management will perform the following actions:","\u6D41\u6C34\u7EBF":"pipeline","\u6D41\u6C34\u7EBF\u7EC4":"pipeline group","\u6D41\u6C34\u7EBF\u6A21\u677F":"pipeline template","\u5173\u95ED\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"To close {0} permission management, the following operations will be performed:","\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"Remove users from editors","\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"Remove users from editors, executors, and viewers","\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650":"Delete the permissions inherited by users in the corresponding group","\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650":"Delete the corresponding group information and group permissions","\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!":"After submission, group members who have been removed from the corresponding permissions will not be able to recover them when permission management is reopened. Please proceed with caution !","\u4E0D\u80FD\u6062\u590D":"not be able to recover","\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650":"Operation","\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B":"Related Resource Type","\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B":"Related Resource","\u6CA1\u6709\u64CD\u4F5C\u6743\u9650":"No operation permissions","\u53BB\u7533\u8BF7":"Apply","\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762":"Please fill in the permission application form on the permission management page, and refresh the page after submission","\u5237\u65B0\u9875\u9762":"Refresh","\u5173\u95ED":"Close","\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4":"Permission application has been submitted","\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650":"Pipeline group permission management is not yet enabled. Once enabled, it will be possible to add editors, executors, or viewers permissions in bulk to pipelines within the group.","\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD":"The permission management function of this pipeline has not been enabled","\u6D41\u6C34\u7EBF\u7BA1\u7406":"Pipeline Management","\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406":"Pipeline Template Management","\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406":"Pipeline Group Management","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4":"Obtained permissions through user group, if you need to renew, please contact the project administrator to renew the user group","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u9000\u51FA\u5148\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u9000\u51FA\u7528\u6237\u7EC4":"Obtained permissions through user group, if you need to exit, please contact the project administrator to exit the user group first"}}')}},Qt={};function Vt(s){var c=Qt[s];if(c!==void 0)return c.exports;var t=Qt[s]={exports:{}};return qt[s].call(t.exports,t,t.exports,Vt),t.exports}(function(){Vt.d=function(s,c){for(var t in c)Vt.o(c,t)&&!Vt.o(s,t)&&Object.defineProperty(s,t,{enumerable:!0,get:c[t]})}})(),function(){Vt.g=function(){if(typeof globalThis=="object")return globalThis;try{return this||new Function("return this")()}catch{if(typeof window=="object")return window}}()}(),function(){Vt.o=function(s,c){return Object.prototype.hasOwnProperty.call(s,c)}}(),function(){Vt.r=function(s){typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(s,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(s,"__esModule",{value:!0})}}(),function(){Vt.p=""}();var yr=Vt(21383);return yr}()}); + }`}]},[["EXPIRED","NORMAL"].includes(m.status)?l("bk-button",{staticClass:"btn",attrs:{theme:"primary",text:"",disabled:!m.directAdded},on:{click:function(y){return e.handleShowLogout(m)}}},[e._v(e._s(e.t("\u9000\u51FA")))]):e._e()],1)]}}])})],1),l("bk-sideslider",{attrs:{"quick-close":"","is-show":e.showDetail,width:640},on:{"update:isShow":function(h){e.showDetail=h},"update:is-show":function(h){e.showDetail=h}},scopedSlots:e._u([{key:"header",fn:function(){return[l("div",{staticClass:"detail-title"},[e._v(" "+e._s(e.t("\u6743\u9650\u8BE6\u60C5"))+" "),l("span",{staticClass:"group-name"},[e._v(e._s(e.groupName))])])]},proxy:!0},{key:"content",fn:function(){return[l("div",{directives:[{name:"bkloading",rawName:"v-bkloading",value:{isLoading:e.isDetailLoading},expression:"{ isLoading: isDetailLoading }"}],staticClass:"detail-content"},[l("div",{staticClass:"title"},[e._v(e._s(e.permissionTitle))]),l("div",{staticClass:"content"},e._l(e.groupPolicies,function(h,m){return l("bk-checkbox",{key:m,staticClass:"permission-item",attrs:{disabled:""},model:{value:h.permission,callback:function(y){e.$set(h,"permission",y)},expression:"item.permission"}},[e._v(" "+e._s(h.actionName)+" ")])}),1)])]},proxy:!0}])}),l("bk-dialog",{attrs:{value:e.logout.isShow,title:e.t("\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4"),loading:e.logout.loading},on:{confirm:e.handleLogout,cancel:e.handleCancelLogout}},[e._v(" "+e._s(e.t("\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002",[e.logout.name]))+" ")]),l("apply-dialog",e._b({attrs:{"is-show":e.apply.isShow,"ajax-prefix":e.ajaxPrefix,"project-code":e.projectCode,"resource-type":e.resourceType},on:{cancel:function(){return e.apply.isShow=!1}}},"apply-dialog",e.apply,!1))],1)},o=[],n=t(9564),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,"a13c2f58",null),c=u.exports},420:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l(e.renderComponent,{tag:"component",attrs:{"resource-type":e.resourceType,"resource-code":e.resourceCode,"project-code":e.projectCode,"ajax-prefix":e.ajaxPrefix,title:e.title}})},o=[],n=t(1093),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,null,null),c=u.exports},2272:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l("article",{staticClass:"group-manage"},[l("div",{staticClass:"content-wrapper"},[l("bk-exception",{staticClass:"exception-wrap-item exception-part",attrs:{type:"403",scene:"part",title:e.t("\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650")}})],1)])},o=[],n=t(1306),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,"0ce31da9",null),c=u.exports},2956:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l("article",{directives:[{name:"bkloading",rawName:"v-bkloading",value:{isLoading:!e.groupList.length},expression:"{ isLoading: !groupList.length }"}],staticClass:"group-aside"},[l("span",{staticClass:"group-title"},[e._v(e._s(e.t("\u6743\u9650\u89D2\u8272")))]),l("scroll-load-list",{ref:"loadList",staticClass:"group-list",attrs:{list:e.groupList,"has-load-end":e.hasLoadEnd,page:e.page,"get-data-method":e.handleGetData},scopedSlots:e._u([{key:"default",fn:function(h){var m=h.data;return[l("div",{class:{"group-item":!0,"group-active":e.activeTab===m.groupId},on:{click:function(y){return e.handleChooseGroup(m)}}},[l("span",{staticClass:"group-name",attrs:{title:m.name}},[e._v(e._s(m.name))]),e._l(e.groupCountField,function(y){return l("div",{key:y,staticClass:"num-box"},[l("i",{class:["group-icon","manage-icon",{"manage-icon-user-shape":y==="userCount","manage-icon-user-template":y==="templateCount","manage-icon-organization":y==="departmentCount",active:e.activeTab===m.groupId}]}),l("div",{staticClass:"group-num"},[e._v(e._s(m[y]))])])}),e.resourceType==="project"?l("bk-popover",{staticClass:"group-more-option",attrs:{placement:"bottom",theme:"dot-menu light",arrow:!1,offset:"15",distance:0},scopedSlots:e._u([{key:"content",fn:function(){return[l("bk-button",{staticClass:"btn",attrs:{disabled:[1,2].includes(m.id),text:""},on:{click:function(y){return e.handleShowDeleteGroup(m)}}},[e._v(" "+e._s(e.t("\u5220\u9664"))+" ")])]},proxy:!0}],null,!0)},[l("i",{staticClass:"more-icon manage-icon manage-icon-more-fill",on:{click:function(y){y.stopPropagation()}}})]):e._e()],2)]}}])}),l("div",{staticClass:"line-split"}),e.showCreateGroup?l("div",{class:{"group-item":!0,"group-active":e.activeTab===""},on:{click:e.handleCreateGroup}},[l("span",{staticClass:"add-group-btn"},[l("i",{staticClass:"bk-icon bk-icon-add-fill add-icon"}),e._v(" "+e._s(e.t("\u65B0\u5EFA\u7528\u6237\u7EC4"))+" ")])]):e._e(),l("div",{staticClass:"close-btn"},[l("bk-button",{attrs:{loading:e.isClosing},on:{click:e.showCloseManageDialog}},[e._v(e._s(e.t("\u5173\u95ED\u6743\u9650\u7BA1\u7406")))])],1),l("bk-dialog",{attrs:{"header-align":"center",theme:"danger","ext-cls":"close-manage-dialog",width:"500","quick-close":!1,"show-footer":!1,value:e.closeObj.isShow},on:{cancel:e.handleHiddenCloseManage},scopedSlots:e._u([{key:"header",fn:function(){return[l("img",{staticStyle:{width:"42px"},attrs:{src:t(9689)}}),l("p",{staticClass:"close-title"},[e._v(e._s(e.t("\u786E\u8BA4\u5173\u95ED\u3010\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F",[e.resourceName])))])]},proxy:!0}])},[e.resourceType==="pipeline_template"?[l("div",{staticClass:"close-tips"},[l("p",[e._v(e._s(e.t("\u5173\u95ED\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A",[e.t("\u6D41\u6C34\u7EBF\u6A21\u677F")])))]),l("p",[l("img",{staticStyle:{width:"14px"},attrs:{src:t(9689)}}),e._v(" "+e._s(e.t("\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664"))+" ")]),l("p",[l("img",{staticStyle:{width:"14px"},attrs:{src:t(9689)}}),e._v(" "+e._s(e.t("\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650"))+" ")]),l("p",[l("img",{staticStyle:{width:"14px"},attrs:{src:t(9689)}}),e._v(" "+e._s(e.t("\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650"))+" ")])])]:[l("div",{staticClass:"close-tips"},[l("p",[e._v(e._s(e.t("\u5173\u95ED\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A",[e.resourceType==="pipeline"?e.t("\u6D41\u6C34\u7EBF"):e.t("\u6D41\u6C34\u7EBF\u7EC4")])))]),l("p",[l("img",{staticStyle:{width:"14px"},attrs:{src:t(9689)}}),e._v(" "+e._s(e.t("\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664"))+" ")]),l("p",[l("img",{staticStyle:{width:"14px"},attrs:{src:t(9689)}}),e._v(" "+e._s(e.t("\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650"))+" ")]),l("p",[l("img",{staticStyle:{width:"14px"},attrs:{src:t(9689)}}),e._v(" "+e._s(e.t("\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650"))+" ")])])],l("div",{staticClass:"confirm-close"},[l("span",{staticStyle:{color:"#737987","font-size":"14px"}},[e._v(" "+e._s(e.t("\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!"))+" ")])]),l("div",{staticClass:"option-btns"},[l("bk-button",{staticClass:"close-btn",attrs:{theme:"danger"},on:{click:e.handleCloseManage}},[e._v(" "+e._s(e.t("\u5173\u95ED\u6743\u9650\u7BA1\u7406"))+" ")]),l("bk-button",{staticClass:"btn",on:{click:e.handleHiddenCloseManage}},[e._v(" "+e._s(e.t("\u53D6\u6D88"))+" ")])],1)],2)],1)},o=[],n=t(6872),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,"26870bee",null),c=u.exports},9733:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l("iframe",{attrs:{width:"100%",height:"100%",frameborder:0,src:e.iframeUrl}})},o=[],n=t(9496),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,null,null),c=u.exports},6827:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l("section",{staticClass:"permission-manage"},[l("group-aside",{attrs:{"show-create-group":e.showCreateGroup,"resource-type":e.resourceType,"resource-code":e.resourceCode,"resource-name":e.resourceName,"project-code":e.projectCode,"ajax-prefix":e.ajaxPrefix},on:{"choose-group":e.handleChooseGroup,"create-group":e.handleCreateGroup,"close-manage":e.handleCloseManage,"change-group-detail-tab":e.handleChangeGroupDetailTab}}),e.path?l("iam-iframe",{attrs:{path:e.path}}):e._e()],1)},o=[],n=t(1165),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,"8efa30a2",null),c=u.exports},1780:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l("article",{directives:[{name:"bkloading",rawName:"v-bkloading",value:{isLoading:e.isLoading},expression:"{ isLoading }"}],staticClass:"permission-wrapper"},[e.isEnablePermission&&!e.isLoading?[e.hasPermission?l("permission-manage",{attrs:{"show-create-group":e.showCreateGroup,"resource-type":e.resourceType,"resource-code":e.resourceCode,"resource-name":e.resourceName,"project-code":e.projectCode,"ajax-prefix":e.ajaxPrefix},on:{"close-manage":e.initStatus}}):l("no-permission",{attrs:{"resource-type":e.resourceType,"resource-code":e.resourceCode,"project-code":e.projectCode,"ajax-prefix":e.ajaxPrefix}})]:[e.isApprover?l("no-permission",{attrs:{"resource-type":e.resourceType,"resource-code":e.resourceCode,"project-code":e.projectCode,"ajax-prefix":e.ajaxPrefix,"error-code":e.errorCode}}):l("no-enable-permission",{attrs:{"resource-type":e.resourceType,"resource-code":e.resourceCode,"project-code":e.projectCode,"ajax-prefix":e.ajaxPrefix,"has-permission":e.hasPermission},on:{"open-manage":e.initStatus}})]],2)},o=[],n=t(9599),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,"05c80676",null),c=u.exports},4939:function(s,d,t){"use strict";t.r(d),t.d(d,{__esModule:function(){return n.B},default:function(){return c}});var r=function(){var e=this,v=e.$createElement,l=e._self._c||v;return l("ul",{staticClass:"bk-scroll-load-list",on:{"&scroll":function(h){return e.handleScroll(h)}}},e._l(e.list,function(h,m){return l("li",{key:m},[e._t("default",null,{data:h})],2)}),0)},o=[],n=t(5241),a=n.A,i=t(7658),u=(0,i.A)(a,r,o,!1,null,"fce37e0c",null),c=u.exports},7658:function(s,d,t){"use strict";t.d(d,{A:function(){return r}});function r(o,n,a,i,u,c,e,v){var l=typeof o=="function"?o.options:o;n&&(l.render=n,l.staticRenderFns=a,l._compiled=!0),i&&(l.functional=!0),c&&(l._scopeId="data-v-"+c);var h;if(e?(h=function(x){x=x||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext,!x&&typeof __VUE_SSR_CONTEXT__<"u"&&(x=__VUE_SSR_CONTEXT__),u&&u.call(this,x),x&&x._registeredComponents&&x._registeredComponents.add(e)},l._ssrRegister=h):u&&(h=v?function(){u.call(this,(l.functional?this.parent:this).$root.$options.shadowRoot)}:u),h)if(l.functional){l._injectStyles=h;var m=l.render;l.render=function(O,R){return h.call(R),m(O,R)}}else{var y=l.beforeCreate;l.beforeCreate=y?[].concat(y,h):[h]}return{exports:o,options:l}}},1233:function(s){"use strict";s.exports="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMzIgMzIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBzdHlsZT0iZmlsbDogIzNhODRmZjsiPjxwYXRoIGQ9Ik0yNy45MiAxNi4zOGMwLjA0MC0wLjEyIDAuMDgwLTAuMjQgMC4wODAtMC4zNiAwIDAgMC0wLjAyMCAwLTAuMDIwczAtMC4wMjAgMC0wLjAyMGMwLTAuMTItMC4wMjAtMC4yNC0wLjA2MC0wLjM0LTAuMDIwLTAuMDYwLTAuMDYwLTAuMS0wLjA4MC0wLjE0LTAuMDQwLTAuMDYwLTAuMDYwLTAuMTItMC4xLTAuMTZsLTguNDgtOS4zMmMtMC4zOC0wLjQtMS0wLjQ0LTEuNDItMC4wNjAtMC40IDAuMzgtMC40NCAxLTAuMDYwIDEuNDJsNi45NCA3LjY0aC0xOS43NGMtMC41Ni0wLjAyMC0xIDAuNDItMSAwLjk4czAuNDQgMSAxIDFoMTkuNzRsLTYuOTQgNy42NGMtMC4zOCAwLjQtMC4zNCAxLjA0MCAwLjA2MCAxLjQyIDAuMiAwLjE4IDAuNDQgMC4yNiAwLjY4IDAuMjYgMC4yOCAwIDAuNTQtMC4xIDAuNzQtMC4zMmw4LjQ2LTkuM2MwLjA0MC0wLjA0MCAwLjA2MC0wLjEgMC4xLTAuMTYgMC4wMjAtMC4wODAgMC4wNjAtMC4xMiAwLjA4MC0wLjE2eiI+PC9wYXRoPjwvc3ZnPg=="},1651:function(s){"use strict";s.exports="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0iI2YwZjFmNSIgZD0iTTc2OCA1MTJjMCAxNDEuNC0xMTQuNiAyNTYtMjU2IDI1NlMyNTYgNjUzLjQgMjU2IDUxMnMxMTQuNi0yNTYgMjU2LTI1NlM3NjggMzcwLjYgNzY4IDUxMnoiLz48cGF0aCBmaWxsPSIjYzRjNmNjIiBkPSJNNTEyIDMyMGMxMDguOCAwIDE5MiA4My4yIDE5MiAxOTJzLTgzLjIgMTkyLTE5MiAxOTItMTkyLTgzLjItMTkyLTE5MlM0MDMuMiAzMjAgNTEyIDMyME01MTIgMjU2Yy0xNDAuOCAwLTI1NiAxMTUuMi0yNTYgMjU2czExNS4yIDI1NiAyNTYgMjU2IDI1Ni0xMTUuMiAyNTYtMjU2UzY1Mi44IDI1NiA1MTIgMjU2TDUxMiAyNTZ6Ii8+PC9zdmc+"},7263:function(s){"use strict";s.exports="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0iI2ZmZTZlNiIgZD0iTTc2OCA1MTJBMjU2IDI1NiAwIDAgMSA1MTIgNzY4IDI1NiAyNTYgMCAwIDEgMjU2IDUxMiAyNTYgMjU2IDAgMCAxIDc2OCA1MTJ6Ii8+PHBhdGggZmlsbD0iI2VhMzYzNiIgZD0iTTUxMiAzMjBjMTA4LjggMCAxOTIgODMuMiAxOTIgMTkycy04My4yIDE5Mi0xOTIgMTkyUzMyMCA2MjAuOCAzMjAgNTEyIDQwMy4yIDMyMCA1MTIgMzIwTTUxMiAyNTZDMzcxLjIgMjU2IDI1NiAzNzEuMiAyNTYgNTEyczExNS4yIDI1NiAyNTYgMjU2IDI1Ni0xMTUuMiAyNTYtMjU2UzY1Mi44IDI1NiA1MTIgMjU2TDUxMiAyNTZ6Ii8+PC9zdmc+"},1117:function(s){"use strict";s.exports="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0iI2U1ZjZlYSIgZD0iTTc2OCA1MTJBMjU2IDI1NiAwIDAgMSA1MTIgNzY4IDI1NiAyNTYgMCAwIDEgMjU2IDUxMiAyNTYgMjU2IDAgMCAxIDc2OCA1MTJ6Ii8+PHBhdGggZmlsbD0iIzNmYzA2ZCIgZD0iTTUxMiAzMjBjMTA4LjggMCAxOTIgODMuMiAxOTIgMTkycy04My4yIDE5Mi0xOTIgMTkyUzMyMCA2MjAuOCAzMjAgNTEyIDQwMy4yIDMyMCA1MTIgMzIwTTUxMiAyNTZDMzcxLjIgMjU2IDI1NiAzNzEuMiAyNTYgNTEyczExNS4yIDI1NiAyNTYgMjU2IDI1Ni0xMTUuMiAyNTYtMjU2UzY1Mi44IDI1NiA1MTIgMjU2TDUxMiAyNTZ6Ii8+PC9zdmc+"},9689:function(s){"use strict";s.exports="data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3R5bGU9ImZpbGw6ICNmZjljMDE7Ij48cGF0aCBkPSJNNTEyIDY0QzI2NC42IDY0IDY0IDI2NC42IDY0IDUxMnMyMDAuNiA0NDggNDQ4IDQ0OCA0NDgtMjAwLjYgNDQ4LTQ0OFM3NTkuNCA2NCA1MTIgNjR6TTU0NCA3MDRoLTY0di02NGg2NFY3MDR6TTU0NCA1NzZoLTY0VjMyMGg2NFY1NzZ6Ij48L3BhdGg+PC9zdmc+"},2380:function(s){"use strict";s.exports=qe},3139:function(s,d,t){"use strict";function r(f,p){return function(){return f.apply(p,arguments)}}const{toString:o}=Object.prototype,{getPrototypeOf:n}=Object,a=(f=>p=>{const g=o.call(p);return f[g]||(f[g]=g.slice(8,-1).toLowerCase())})(Object.create(null)),i=f=>(f=f.toLowerCase(),p=>a(p)===f),u=f=>p=>typeof p===f,{isArray:c}=Array,e=u("undefined");function v(f){return f!==null&&!e(f)&&f.constructor!==null&&!e(f.constructor)&&y(f.constructor.isBuffer)&&f.constructor.isBuffer(f)}const l=i("ArrayBuffer");function h(f){let p;return typeof ArrayBuffer<"u"&&ArrayBuffer.isView?p=ArrayBuffer.isView(f):p=f&&f.buffer&&l(f.buffer),p}const m=u("string"),y=u("function"),x=u("number"),O=f=>f!==null&&typeof f=="object",R=f=>f===!0||f===!1,B=f=>{if(a(f)!=="object")return!1;const p=n(f);return(p===null||p===Object.prototype||Object.getPrototypeOf(p)===null)&&!(Symbol.toStringTag in f)&&!(Symbol.iterator in f)},w=i("Date"),N=i("File"),C=i("Blob"),T=i("FileList"),P=f=>O(f)&&y(f.pipe),I=f=>{let p;return f&&(typeof FormData=="function"&&f instanceof FormData||y(f.append)&&((p=a(f))==="formdata"||p==="object"&&y(f.toString)&&f.toString()==="[object FormData]"))},A=i("URLSearchParams"),[U,H,Y,rt]=["ReadableStream","Request","Response","Headers"].map(i),W=f=>f.trim?f.trim():f.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"");function K(f,p,{allOwnKeys:g=!1}={}){if(f===null||typeof f>"u")return;let S,E;if(typeof f!="object"&&(f=[f]),c(f))for(S=0,E=f.length;S0;)if(E=g[S],p===E.toLowerCase())return E;return null}const J=(()=>typeof globalThis<"u"?globalThis:typeof self<"u"?self:typeof window<"u"?window:t.g)(),it=f=>!e(f)&&f!==J;function ot(){const{caseless:f}=it(this)&&this||{},p={},g=(S,E)=>{const M=f&&F(p,E)||E;B(p[M])&&B(S)?p[M]=ot(p[M],S):B(S)?p[M]=ot({},S):c(S)?p[M]=S.slice():p[M]=S};for(let S=0,E=arguments.length;S(K(p,(E,M)=>{g&&y(E)?f[M]=r(E,g):f[M]=E},{allOwnKeys:S}),f),j=f=>(f.charCodeAt(0)===65279&&(f=f.slice(1)),f),V=(f,p,g,S)=>{f.prototype=Object.create(p.prototype,S),f.prototype.constructor=f,Object.defineProperty(f,"super",{value:p.prototype}),g&&Object.assign(f.prototype,g)},tt=(f,p,g,S)=>{let E,M,L;const X={};if(p=p||{},f==null)return p;do{for(E=Object.getOwnPropertyNames(f),M=E.length;M-- >0;)L=E[M],(!S||S(L,f,p))&&!X[L]&&(p[L]=f[L],X[L]=!0);f=g!==!1&&n(f)}while(f&&(!g||g(f,p))&&f!==Object.prototype);return p},nt=(f,p,g)=>{f=String(f),(g===void 0||g>f.length)&&(g=f.length),g-=p.length;const S=f.indexOf(p,g);return S!==-1&&S===g},at=f=>{if(!f)return null;if(c(f))return f;let p=f.length;if(!x(p))return null;const g=new Array(p);for(;p-- >0;)g[p]=f[p];return g},St=(f=>p=>f&&p instanceof f)(typeof Uint8Array<"u"&&n(Uint8Array)),vt=(f,p)=>{const S=(f&&f[Symbol.iterator]).call(f);let E;for(;(E=S.next())&&!E.done;){const M=E.value;p.call(f,M[0],M[1])}},At=(f,p)=>{let g;const S=[];for(;(g=f.exec(p))!==null;)S.push(g);return S},Et=i("HTMLFormElement"),jt=f=>f.toLowerCase().replace(/[-_\s]([a-z\d])(\w*)/g,function(g,S,E){return S.toUpperCase()+E}),bt=(({hasOwnProperty:f})=>(p,g)=>f.call(p,g))(Object.prototype),Lt=i("RegExp"),Dt=(f,p)=>{const g=Object.getOwnPropertyDescriptors(f),S={};K(g,(E,M)=>{let L;(L=p(E,M,f))!==!1&&(S[M]=L||E)}),Object.defineProperties(f,S)},Zt=f=>{Dt(f,(p,g)=>{if(y(f)&&["arguments","caller","callee"].indexOf(g)!==-1)return!1;const S=f[g];if(!!y(S)){if(p.enumerable=!1,"writable"in p){p.writable=!1;return}p.set||(p.set=()=>{throw Error("Can not rewrite read-only method '"+g+"'")})}})},kt=(f,p)=>{const g={},S=E=>{E.forEach(M=>{g[M]=!0})};return c(f)?S(f):S(String(f).split(p)),g},qt=()=>{},Gt=(f,p)=>f!=null&&Number.isFinite(f=+f)?f:p,Vt="abcdefghijklmnopqrstuvwxyz",ce="0123456789",ee={DIGIT:ce,ALPHA:Vt,ALPHA_DIGIT:Vt+Vt.toUpperCase()+ce},ae=(f=16,p=ee.ALPHA_DIGIT)=>{let g="";const{length:S}=p;for(;f--;)g+=p[Math.random()*S|0];return g};function Mt(f){return!!(f&&y(f.append)&&f[Symbol.toStringTag]==="FormData"&&f[Symbol.iterator])}const Jt=f=>{const p=new Array(10),g=(S,E)=>{if(O(S)){if(p.indexOf(S)>=0)return;if(!("toJSON"in S)){p[E]=S;const M=c(S)?[]:{};return K(S,(L,X)=>{const ft=g(L,E+1);!e(ft)&&(M[X]=ft)}),p[E]=void 0,M}}return S};return g(f,0)},re=i("AsyncFunction");var b={isArray:c,isArrayBuffer:l,isBuffer:v,isFormData:I,isArrayBufferView:h,isString:m,isNumber:x,isBoolean:R,isObject:O,isPlainObject:B,isReadableStream:U,isRequest:H,isResponse:Y,isHeaders:rt,isUndefined:e,isDate:w,isFile:N,isBlob:C,isRegExp:Lt,isFunction:y,isStream:P,isURLSearchParams:A,isTypedArray:St,isFileList:T,forEach:K,merge:ot,extend:G,trim:W,stripBOM:j,inherits:V,toFlatObject:tt,kindOf:a,kindOfTest:i,endsWith:nt,toArray:at,forEachEntry:vt,matchAll:At,isHTMLForm:Et,hasOwnProperty:bt,hasOwnProp:bt,reduceDescriptors:Dt,freezeMethods:Zt,toObjectSet:kt,toCamelCase:jt,noop:qt,toFiniteNumber:Gt,findKey:F,global:J,isContextDefined:it,ALPHABET:ee,generateString:ae,isSpecCompliantForm:Mt,toJSONObject:Jt,isAsyncFn:re,isThenable:f=>f&&(O(f)||y(f))&&y(f.then)&&y(f.catch)};function et(f,p,g,S,E){Error.call(this),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack,this.message=f,this.name="AxiosError",p&&(this.code=p),g&&(this.config=g),S&&(this.request=S),E&&(this.response=E)}b.inherits(et,Error,{toJSON:function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:b.toJSONObject(this.config),code:this.code,status:this.response&&this.response.status?this.response.status:null}}});const Tt=et.prototype,Pt={};["ERR_BAD_OPTION_VALUE","ERR_BAD_OPTION","ECONNABORTED","ETIMEDOUT","ERR_NETWORK","ERR_FR_TOO_MANY_REDIRECTS","ERR_DEPRECATED","ERR_BAD_RESPONSE","ERR_BAD_REQUEST","ERR_CANCELED","ERR_NOT_SUPPORT","ERR_INVALID_URL"].forEach(f=>{Pt[f]={value:f}}),Object.defineProperties(et,Pt),Object.defineProperty(Tt,"isAxiosError",{value:!0}),et.from=(f,p,g,S,E,M)=>{const L=Object.create(Tt);return b.toFlatObject(f,L,function(ft){return ft!==Error.prototype},X=>X!=="isAxiosError"),et.call(L,f.message,p,g,S,E),L.cause=f,L.name=f.name,M&&Object.assign(L,M),L};var Rt=null;function dt(f){return b.isPlainObject(f)||b.isArray(f)}function gt(f){return b.endsWith(f,"[]")?f.slice(0,-2):f}function ht(f,p,g){return f?f.concat(p).map(function(E,M){return E=gt(E),!g&&M?"["+E+"]":E}).join(g?".":""):p}function _(f){return b.isArray(f)&&!f.some(dt)}const lt=b.toFlatObject(b,{},null,function(p){return/^is[A-Z]/.test(p)});function pt(f,p,g){if(!b.isObject(f))throw new TypeError("target must be an object");p=p||new FormData,g=b.toFlatObject(g,{metaTokens:!0,dots:!1,indexes:!1},!1,function(Ct,_t){return!b.isUndefined(_t[Ct])});const S=g.metaTokens,E=g.visitor||q,M=g.dots,L=g.indexes,ft=(g.Blob||typeof Blob<"u"&&Blob)&&b.isSpecCompliantForm(p);if(!b.isFunction(E))throw new TypeError("visitor must be a function");function ut(mt){if(mt===null)return"";if(b.isDate(mt))return mt.toISOString();if(!ft&&b.isBlob(mt))throw new et("Blob is not supported. Use a Buffer instead.");return b.isArrayBuffer(mt)||b.isTypedArray(mt)?ft&&typeof Blob=="function"?new Blob([mt]):Buffer.from(mt):mt}function q(mt,Ct,_t){let te=mt;if(mt&&!_t&&typeof mt=="object"){if(b.endsWith(Ct,"{}"))Ct=S?Ct:Ct.slice(0,-2),mt=JSON.stringify(mt);else if(b.isArray(mt)&&_(mt)||(b.isFileList(mt)||b.endsWith(Ct,"[]"))&&(te=b.toArray(mt)))return Ct=gt(Ct),te.forEach(function(zt,Me){!(b.isUndefined(zt)||zt===null)&&p.append(L===!0?ht([Ct],Me,M):L===null?Ct:Ct+"[]",ut(zt))}),!1}return dt(mt)?!0:(p.append(ht(_t,Ct,M),ut(mt)),!1)}const yt=[],Wt=Object.assign(lt,{defaultVisitor:q,convertValue:ut,isVisitable:dt});function Ft(mt,Ct){if(!b.isUndefined(mt)){if(yt.indexOf(mt)!==-1)throw Error("Circular reference detected in "+Ct.join("."));yt.push(mt),b.forEach(mt,function(te,ve){(!(b.isUndefined(te)||te===null)&&E.call(p,te,b.isString(ve)?ve.trim():ve,Ct,Wt))===!0&&Ft(te,Ct?Ct.concat(ve):[ve])}),yt.pop()}}if(!b.isObject(f))throw new TypeError("data must be an object");return Ft(f),p}function It(f){const p={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+","%00":"\0"};return encodeURIComponent(f).replace(/[!'()~]|%20|%00/g,function(S){return p[S]})}function Ot(f,p){this._pairs=[],f&&pt(f,this,p)}const wt=Ot.prototype;wt.append=function(p,g){this._pairs.push([p,g])},wt.toString=function(p){const g=p?function(S){return p.call(this,S,It)}:It;return this._pairs.map(function(E){return g(E[0])+"="+g(E[1])},"").join("&")};function se(f){return encodeURIComponent(f).replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}function ue(f,p,g){if(!p)return f;const S=g&&g.encode||se,E=g&&g.serialize;let M;if(E?M=E(p,g):M=b.isURLSearchParams(p)?p.toString():new Ot(p,g).toString(S),M){const L=f.indexOf("#");L!==-1&&(f=f.slice(0,L)),f+=(f.indexOf("?")===-1?"?":"&")+M}return f}class ne{constructor(){this.handlers=[]}use(p,g,S){return this.handlers.push({fulfilled:p,rejected:g,synchronous:S?S.synchronous:!1,runWhen:S?S.runWhen:null}),this.handlers.length-1}eject(p){this.handlers[p]&&(this.handlers[p]=null)}clear(){this.handlers&&(this.handlers=[])}forEach(p){b.forEach(this.handlers,function(S){S!==null&&p(S)})}}var oe=ne,Re={silentJSONParsing:!0,forcedJSONParsing:!0,clarifyTimeoutError:!1},Oe=typeof URLSearchParams<"u"?URLSearchParams:Ot,Ee=typeof FormData<"u"?FormData:null,Ae=typeof Blob<"u"?Blob:null,Ce={isBrowser:!0,classes:{URLSearchParams:Oe,FormData:Ee,Blob:Ae},protocols:["http","https","file","blob","url","data"]};const xe=typeof window<"u"&&typeof document<"u",be=(f=>xe&&["ReactNative","NativeScript","NS"].indexOf(f)<0)(typeof navigator<"u"&&navigator.product),De=(()=>typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope&&typeof self.importScripts=="function")(),Ne=xe&&window.location.href||"http://localhost";var pe=Object.freeze({__proto__:null,hasBrowserEnv:xe,hasStandardBrowserWebWorkerEnv:De,hasStandardBrowserEnv:be,origin:Ne}),Ht={...pe,...Ce};function we(f,p){return pt(f,new Ht.classes.URLSearchParams,Object.assign({visitor:function(g,S,E,M){return Ht.isNode&&b.isBuffer(g)?(this.append(S,g.toString("base64")),!1):M.defaultVisitor.apply(this,arguments)}},p))}function de(f){return b.matchAll(/\w+|\[(\w*)]/g,f).map(p=>p[0]==="[]"?"":p[1]||p[0])}function le(f){const p={},g=Object.keys(f);let S;const E=g.length;let M;for(S=0;S=g.length;return L=!L&&b.isArray(E)?E.length:L,ft?(b.hasOwnProp(E,L)?E[L]=[E[L],S]:E[L]=S,!X):((!E[L]||!b.isObject(E[L]))&&(E[L]=[]),p(g,S,E[L],M)&&b.isArray(E[L])&&(E[L]=le(E[L])),!X)}if(b.isFormData(f)&&b.isFunction(f.entries)){const g={};return b.forEachEntry(f,(S,E)=>{p(de(S),E,g,0)}),g}return null}function he(f,p,g){if(b.isString(f))try{return(p||JSON.parse)(f),b.trim(f)}catch(S){if(S.name!=="SyntaxError")throw S}return(g||JSON.stringify)(f)}const Yt={transitional:Re,adapter:["xhr","http","fetch"],transformRequest:[function(p,g){const S=g.getContentType()||"",E=S.indexOf("application/json")>-1,M=b.isObject(p);if(M&&b.isHTMLForm(p)&&(p=new FormData(p)),b.isFormData(p))return E?JSON.stringify(Ie(p)):p;if(b.isArrayBuffer(p)||b.isBuffer(p)||b.isStream(p)||b.isFile(p)||b.isBlob(p)||b.isReadableStream(p))return p;if(b.isArrayBufferView(p))return p.buffer;if(b.isURLSearchParams(p))return g.setContentType("application/x-www-form-urlencoded;charset=utf-8",!1),p.toString();let X;if(M){if(S.indexOf("application/x-www-form-urlencoded")>-1)return we(p,this.formSerializer).toString();if((X=b.isFileList(p))||S.indexOf("multipart/form-data")>-1){const ft=this.env&&this.env.FormData;return pt(X?{"files[]":p}:p,ft&&new ft,this.formSerializer)}}return M||E?(g.setContentType("application/json",!1),he(p)):p}],transformResponse:[function(p){const g=this.transitional||Yt.transitional,S=g&&g.forcedJSONParsing,E=this.responseType==="json";if(b.isResponse(p)||b.isReadableStream(p))return p;if(p&&b.isString(p)&&(S&&!this.responseType||E)){const L=!(g&&g.silentJSONParsing)&&E;try{return JSON.parse(p)}catch(X){if(L)throw X.name==="SyntaxError"?et.from(X,et.ERR_BAD_RESPONSE,this,null,this.response):X}}return p}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,env:{FormData:Ht.classes.FormData,Blob:Ht.classes.Blob},validateStatus:function(p){return p>=200&&p<300},headers:{common:{Accept:"application/json, text/plain, */*","Content-Type":void 0}}};b.forEach(["delete","get","head","post","put","patch"],f=>{Yt.headers[f]={}});var Xt=Yt;const Ue=b.toObjectSet(["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"]);var Be=f=>{const p={};let g,S,E;return f&&f.split(` +`).forEach(function(L){E=L.indexOf(":"),g=L.substring(0,E).trim().toLowerCase(),S=L.substring(E+1).trim(),!(!g||p[g]&&Ue[g])&&(g==="set-cookie"?p[g]?p[g].push(S):p[g]=[S]:p[g]=p[g]?p[g]+", "+S:S)}),p};const $=Symbol("internals");function Q(f){return f&&String(f).trim().toLowerCase()}function z(f){return f===!1||f==null?f:b.isArray(f)?f.map(z):String(f)}function D(f){const p=Object.create(null),g=/([^\s,;=]+)\s*(?:=\s*([^,;]+))?/g;let S;for(;S=g.exec(f);)p[S[1]]=S[2];return p}const Z=f=>/^[-_a-zA-Z0-9^`|~,!#$%&'*+.]+$/.test(f.trim());function xt(f,p,g,S,E){if(b.isFunction(S))return S.call(this,p,g);if(E&&(p=g),!!b.isString(p)){if(b.isString(S))return p.indexOf(S)!==-1;if(b.isRegExp(S))return S.test(p)}}function ct(f){return f.trim().toLowerCase().replace(/([a-z\d])(\w*)/g,(p,g,S)=>g.toUpperCase()+S)}function $t(f,p){const g=b.toCamelCase(" "+p);["get","set","has"].forEach(S=>{Object.defineProperty(f,S+g,{value:function(E,M,L){return this[S].call(this,p,E,M,L)},configurable:!0})})}class Bt{constructor(p){p&&this.set(p)}set(p,g,S){const E=this;function M(X,ft,ut){const q=Q(ft);if(!q)throw new Error("header name must be a non-empty string");const yt=b.findKey(E,q);(!yt||E[yt]===void 0||ut===!0||ut===void 0&&E[yt]!==!1)&&(E[yt||ft]=z(X))}const L=(X,ft)=>b.forEach(X,(ut,q)=>M(ut,q,ft));if(b.isPlainObject(p)||p instanceof this.constructor)L(p,g);else if(b.isString(p)&&(p=p.trim())&&!Z(p))L(Be(p),g);else if(b.isHeaders(p))for(const[X,ft]of p.entries())M(ft,X,S);else p!=null&&M(g,p,S);return this}get(p,g){if(p=Q(p),p){const S=b.findKey(this,p);if(S){const E=this[S];if(!g)return E;if(g===!0)return D(E);if(b.isFunction(g))return g.call(this,E,S);if(b.isRegExp(g))return g.exec(E);throw new TypeError("parser must be boolean|regexp|function")}}}has(p,g){if(p=Q(p),p){const S=b.findKey(this,p);return!!(S&&this[S]!==void 0&&(!g||xt(this,this[S],S,g)))}return!1}delete(p,g){const S=this;let E=!1;function M(L){if(L=Q(L),L){const X=b.findKey(S,L);X&&(!g||xt(S,S[X],X,g))&&(delete S[X],E=!0)}}return b.isArray(p)?p.forEach(M):M(p),E}clear(p){const g=Object.keys(this);let S=g.length,E=!1;for(;S--;){const M=g[S];(!p||xt(this,this[M],M,p,!0))&&(delete this[M],E=!0)}return E}normalize(p){const g=this,S={};return b.forEach(this,(E,M)=>{const L=b.findKey(S,M);if(L){g[L]=z(E),delete g[M];return}const X=p?ct(M):String(M).trim();X!==M&&delete g[M],g[X]=z(E),S[X]=!0}),this}concat(...p){return this.constructor.concat(this,...p)}toJSON(p){const g=Object.create(null);return b.forEach(this,(S,E)=>{S!=null&&S!==!1&&(g[E]=p&&b.isArray(S)?S.join(", "):S)}),g}[Symbol.iterator](){return Object.entries(this.toJSON())[Symbol.iterator]()}toString(){return Object.entries(this.toJSON()).map(([p,g])=>p+": "+g).join(` +`)}get[Symbol.toStringTag](){return"AxiosHeaders"}static from(p){return p instanceof this?p:new this(p)}static concat(p,...g){const S=new this(p);return g.forEach(E=>S.set(E)),S}static accessor(p){const S=(this[$]=this[$]={accessors:{}}).accessors,E=this.prototype;function M(L){const X=Q(L);S[X]||($t(E,L),S[X]=!0)}return b.isArray(p)?p.forEach(M):M(p),this}}Bt.accessor(["Content-Type","Content-Length","Accept","Accept-Encoding","User-Agent","Authorization"]),b.reduceDescriptors(Bt.prototype,({value:f},p)=>{let g=p[0].toUpperCase()+p.slice(1);return{get:()=>f,set(S){this[g]=S}}}),b.freezeMethods(Bt);var Nt=Bt;function Qt(f,p){const g=this||Xt,S=p||g,E=Nt.from(S.headers);let M=S.data;return b.forEach(f,function(X){M=X.call(g,M,E.normalize(),p?p.status:void 0)}),E.normalize(),M}function k(f){return!!(f&&f.__CANCEL__)}function Ut(f,p,g){et.call(this,f??"canceled",et.ERR_CANCELED,p,g),this.name="CanceledError"}b.inherits(Ut,et,{__CANCEL__:!0});function ie(f,p,g){const S=g.config.validateStatus;!g.status||!S||S(g.status)?f(g):p(new et("Request failed with status code "+g.status,[et.ERR_BAD_REQUEST,et.ERR_BAD_RESPONSE][Math.floor(g.status/100)-4],g.config,g.request,g))}function je(f){const p=/^([-+\w]{1,25})(:?\/\/|:)/.exec(f);return p&&p[1]||""}function Fe(f,p){f=f||10;const g=new Array(f),S=new Array(f);let E=0,M=0,L;return p=p!==void 0?p:1e3,function(ft){const ut=Date.now(),q=S[M];L||(L=ut),g[E]=ft,S[E]=ut;let yt=M,Wt=0;for(;yt!==E;)Wt+=g[yt++],yt=yt%f;if(E=(E+1)%f,E===M&&(M=(M+1)%f),ut-LS)return E&&(clearTimeout(E),E=null),g=X,f.apply(null,arguments);E||(E=setTimeout(()=>(E=null,g=Date.now(),f.apply(null,arguments)),S-(X-g)))}}var me=(f,p,g=3)=>{let S=0;const E=Fe(50,250);return $e(M=>{const L=M.loaded,X=M.lengthComputable?M.total:void 0,ft=L-S,ut=E(ft),q=L<=X;S=L;const yt={loaded:L,total:X,progress:X?L/X:void 0,bytes:ft,rate:ut||void 0,estimated:ut&&X&&q?(X-L)/ut:void 0,event:M,lengthComputable:X!=null};yt[p?"download":"upload"]=!0,f(yt)},g)},pr=Ht.hasStandardBrowserEnv?function(){const p=/(msie|trident)/i.test(navigator.userAgent),g=document.createElement("a");let S;function E(M){let L=M;return p&&(g.setAttribute("href",L),L=g.href),g.setAttribute("href",L),{href:g.href,protocol:g.protocol?g.protocol.replace(/:$/,""):"",host:g.host,search:g.search?g.search.replace(/^\?/,""):"",hash:g.hash?g.hash.replace(/^#/,""):"",hostname:g.hostname,port:g.port,pathname:g.pathname.charAt(0)==="/"?g.pathname:"/"+g.pathname}}return S=E(window.location.href),function(L){const X=b.isString(L)?E(L):L;return X.protocol===S.protocol&&X.host===S.host}}():function(){return function(){return!0}}(),hr=Ht.hasStandardBrowserEnv?{write(f,p,g,S,E,M){const L=[f+"="+encodeURIComponent(p)];b.isNumber(g)&&L.push("expires="+new Date(g).toGMTString()),b.isString(S)&&L.push("path="+S),b.isString(E)&&L.push("domain="+E),M===!0&&L.push("secure"),document.cookie=L.join("; ")},read(f){const p=document.cookie.match(new RegExp("(^|;\\s*)("+f+")=([^;]*)"));return p?decodeURIComponent(p[3]):null},remove(f){this.write(f,"",Date.now()-864e5)}}:{write(){},read(){return null},remove(){}};function mr(f){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(f)}function gr(f,p){return p?f.replace(/\/?\/$/,"")+"/"+p.replace(/^\/+/,""):f}function _e(f,p){return f&&!mr(p)?gr(f,p):p}const tr=f=>f instanceof Nt?{...f}:f;function Te(f,p){p=p||{};const g={};function S(ut,q,yt){return b.isPlainObject(ut)&&b.isPlainObject(q)?b.merge.call({caseless:yt},ut,q):b.isPlainObject(q)?b.merge({},q):b.isArray(q)?q.slice():q}function E(ut,q,yt){if(b.isUndefined(q)){if(!b.isUndefined(ut))return S(void 0,ut,yt)}else return S(ut,q,yt)}function M(ut,q){if(!b.isUndefined(q))return S(void 0,q)}function L(ut,q){if(b.isUndefined(q)){if(!b.isUndefined(ut))return S(void 0,ut)}else return S(void 0,q)}function X(ut,q,yt){if(yt in p)return S(ut,q);if(yt in f)return S(void 0,ut)}const ft={url:M,method:M,data:M,baseURL:L,transformRequest:L,transformResponse:L,paramsSerializer:L,timeout:L,timeoutMessage:L,withCredentials:L,withXSRFToken:L,adapter:L,responseType:L,xsrfCookieName:L,xsrfHeaderName:L,onUploadProgress:L,onDownloadProgress:L,decompress:L,maxContentLength:L,maxBodyLength:L,beforeRedirect:L,transport:L,httpAgent:L,httpsAgent:L,cancelToken:L,socketPath:L,responseEncoding:L,validateStatus:X,headers:(ut,q)=>E(tr(ut),tr(q),!0)};return b.forEach(Object.keys(Object.assign({},f,p)),function(q){const yt=ft[q]||E,Wt=yt(f[q],p[q],q);b.isUndefined(Wt)&&yt!==X||(g[q]=Wt)}),g}var er=f=>{const p=Te({},f);let{data:g,withXSRFToken:S,xsrfHeaderName:E,xsrfCookieName:M,headers:L,auth:X}=p;p.headers=L=Nt.from(L),p.url=ue(_e(p.baseURL,p.url),f.params,f.paramsSerializer),X&&L.set("Authorization","Basic "+btoa((X.username||"")+":"+(X.password?unescape(encodeURIComponent(X.password)):"")));let ft;if(b.isFormData(g)){if(Ht.hasStandardBrowserEnv||Ht.hasStandardBrowserWebWorkerEnv)L.setContentType(void 0);else if((ft=L.getContentType())!==!1){const[ut,...q]=ft?ft.split(";").map(yt=>yt.trim()).filter(Boolean):[];L.setContentType([ut||"multipart/form-data",...q].join("; "))}}if(Ht.hasStandardBrowserEnv&&(S&&b.isFunction(S)&&(S=S(p)),S||S!==!1&&pr(p.url))){const ut=E&&M&&hr.read(M);ut&&L.set(E,ut)}return p},yr=typeof XMLHttpRequest<"u"&&function(f){return new Promise(function(g,S){const E=er(f);let M=E.data;const L=Nt.from(E.headers).normalize();let{responseType:X}=E,ft;function ut(){E.cancelToken&&E.cancelToken.unsubscribe(ft),E.signal&&E.signal.removeEventListener("abort",ft)}let q=new XMLHttpRequest;q.open(E.method.toUpperCase(),E.url,!0),q.timeout=E.timeout;function yt(){if(!q)return;const Ft=Nt.from("getAllResponseHeaders"in q&&q.getAllResponseHeaders()),Ct={data:!X||X==="text"||X==="json"?q.responseText:q.response,status:q.status,statusText:q.statusText,headers:Ft,config:f,request:q};ie(function(te){g(te),ut()},function(te){S(te),ut()},Ct),q=null}"onloadend"in q?q.onloadend=yt:q.onreadystatechange=function(){!q||q.readyState!==4||q.status===0&&!(q.responseURL&&q.responseURL.indexOf("file:")===0)||setTimeout(yt)},q.onabort=function(){!q||(S(new et("Request aborted",et.ECONNABORTED,E,q)),q=null)},q.onerror=function(){S(new et("Network Error",et.ERR_NETWORK,E,q)),q=null},q.ontimeout=function(){let mt=E.timeout?"timeout of "+E.timeout+"ms exceeded":"timeout exceeded";const Ct=E.transitional||Re;E.timeoutErrorMessage&&(mt=E.timeoutErrorMessage),S(new et(mt,Ct.clarifyTimeoutError?et.ETIMEDOUT:et.ECONNABORTED,E,q)),q=null},M===void 0&&L.setContentType(null),"setRequestHeader"in q&&b.forEach(L.toJSON(),function(mt,Ct){q.setRequestHeader(Ct,mt)}),b.isUndefined(E.withCredentials)||(q.withCredentials=!!E.withCredentials),X&&X!=="json"&&(q.responseType=E.responseType),typeof E.onDownloadProgress=="function"&&q.addEventListener("progress",me(E.onDownloadProgress,!0)),typeof E.onUploadProgress=="function"&&q.upload&&q.upload.addEventListener("progress",me(E.onUploadProgress)),(E.cancelToken||E.signal)&&(ft=Ft=>{!q||(S(!Ft||Ft.type?new Ut(null,f,q):Ft),q.abort(),q=null)},E.cancelToken&&E.cancelToken.subscribe(ft),E.signal&&(E.signal.aborted?ft():E.signal.addEventListener("abort",ft)));const Wt=je(E.url);if(Wt&&Ht.protocols.indexOf(Wt)===-1){S(new et("Unsupported protocol "+Wt+":",et.ERR_BAD_REQUEST,f));return}q.send(M||null)})},Sr=(f,p)=>{let g=new AbortController,S;const E=function(ft){if(!S){S=!0,L();const ut=ft instanceof Error?ft:this.reason;g.abort(ut instanceof et?ut:new Ut(ut instanceof Error?ut.message:ut))}};let M=p&&setTimeout(()=>{E(new et(`timeout ${p} of ms exceeded`,et.ETIMEDOUT))},p);const L=()=>{f&&(M&&clearTimeout(M),M=null,f.forEach(ft=>{ft&&(ft.removeEventListener?ft.removeEventListener("abort",E):ft.unsubscribe(E))}),f=null)};f.forEach(ft=>ft&&ft.addEventListener&&ft.addEventListener("abort",E));const{signal:X}=g;return X.unsubscribe=L,[X,()=>{M&&clearTimeout(M),M=null}]};const xr=function*(f,p){let g=f.byteLength;if(!p||g{const M=Tr(f,p,E);let L=0;return new ReadableStream({type:"bytes",async pull(X){const{done:ft,value:ut}=await M.next();if(ft){X.close(),S();return}let q=ut.byteLength;g&&g(L+=q),X.enqueue(new Uint8Array(ut))},cancel(X){return S(X),M.return()}},{highWaterMark:2})},nr=(f,p)=>{const g=f!=null;return S=>setTimeout(()=>p({lengthComputable:g,total:f,loaded:S}))},Ge=typeof fetch=="function"&&typeof Request=="function"&&typeof Response=="function",or=Ge&&typeof ReadableStream=="function",Ke=Ge&&(typeof TextEncoder=="function"?(f=>p=>f.encode(p))(new TextEncoder):async f=>new Uint8Array(await new Response(f).arrayBuffer())),Or=or&&(()=>{let f=!1;const p=new Request(Ht.origin,{body:new ReadableStream,method:"POST",get duplex(){return f=!0,"half"}}).headers.has("Content-Type");return f&&!p})(),ar=64*1024,We=or&&!!(()=>{try{return b.isReadableStream(new Response("").body)}catch{}})(),He={stream:We&&(f=>f.body)};Ge&&(f=>{["text","arrayBuffer","blob","formData","stream"].forEach(p=>{!He[p]&&(He[p]=b.isFunction(f[p])?g=>g[p]():(g,S)=>{throw new et(`Response type '${p}' is not supported`,et.ERR_NOT_SUPPORT,S)})})})(new Response);const Er=async f=>{if(f==null)return 0;if(b.isBlob(f))return f.size;if(b.isSpecCompliantForm(f))return(await new Request(f).arrayBuffer()).byteLength;if(b.isArrayBufferView(f))return f.byteLength;if(b.isURLSearchParams(f)&&(f=f+""),b.isString(f))return(await Ke(f)).byteLength},Ir=async(f,p)=>{const g=b.toFiniteNumber(f.getContentLength());return g??Er(p)};var Pr=Ge&&(async f=>{let{url:p,method:g,data:S,signal:E,cancelToken:M,timeout:L,onDownloadProgress:X,onUploadProgress:ft,responseType:ut,headers:q,withCredentials:yt="same-origin",fetchOptions:Wt}=er(f);ut=ut?(ut+"").toLowerCase():"text";let[Ft,mt]=E||M||L?Sr([E,M],L):[],Ct,_t;const te=()=>{!Ct&&setTimeout(()=>{Ft&&Ft.unsubscribe()}),Ct=!0};let ve;try{if(ft&&Or&&g!=="get"&&g!=="head"&&(ve=await Ir(q,S))!==0){let ye=new Request(p,{method:"POST",body:S,duplex:"half"}),Pe;b.isFormData(S)&&(Pe=ye.headers.get("content-type"))&&q.setContentType(Pe),ye.body&&(S=rr(ye.body,ar,nr(ve,me(ft)),null,Ke))}b.isString(yt)||(yt=yt?"cors":"omit"),_t=new Request(p,{...Wt,signal:Ft,method:g.toUpperCase(),headers:q.normalize().toJSON(),body:S,duplex:"half",withCredentials:yt});let zt=await fetch(_t);const Me=We&&(ut==="stream"||ut==="response");if(We&&(X||Me)){const ye={};["status","statusText","headers"].forEach(dr=>{ye[dr]=zt[dr]});const Pe=b.toFiniteNumber(zt.headers.get("content-length"));zt=new Response(rr(zt.body,ar,X&&nr(Pe,me(X,!0)),Me&&te,Ke),ye)}ut=ut||"text";let Mr=await He[b.findKey(He,ut)||"text"](zt,f);return!Me&&te(),mt&&mt(),await new Promise((ye,Pe)=>{ie(ye,Pe,{data:Mr,headers:Nt.from(zt.headers),status:zt.status,statusText:zt.statusText,config:f,request:_t})})}catch(zt){throw te(),zt&&zt.name==="TypeError"&&/fetch/i.test(zt.message)?Object.assign(new et("Network Error",et.ERR_NETWORK,f,_t),{cause:zt.cause||zt}):et.from(zt,zt&&zt.code,f,_t)}});const Ye={http:Rt,xhr:yr,fetch:Pr};b.forEach(Ye,(f,p)=>{if(f){try{Object.defineProperty(f,"name",{value:p})}catch{}Object.defineProperty(f,"adapterName",{value:p})}});const sr=f=>`- ${f}`,Rr=f=>b.isFunction(f)||f===null||f===!1;var ir={getAdapter:f=>{f=b.isArray(f)?f:[f];const{length:p}=f;let g,S;const E={};for(let M=0;M`adapter ${X} `+(ft===!1?"is not supported by the environment":"is not available in the build"));let L=p?M.length>1?`since : +`+M.map(sr).join(` +`):" "+sr(M[0]):"as no adapter specified";throw new et("There is no suitable adapter to dispatch the request "+L,"ERR_NOT_SUPPORT")}return S},adapters:Ye};function Je(f){if(f.cancelToken&&f.cancelToken.throwIfRequested(),f.signal&&f.signal.aborted)throw new Ut(null,f)}function ur(f){return Je(f),f.headers=Nt.from(f.headers),f.data=Qt.call(f,f.transformRequest),["post","put","patch"].indexOf(f.method)!==-1&&f.headers.setContentType("application/x-www-form-urlencoded",!1),ir.getAdapter(f.adapter||Xt.adapter)(f).then(function(S){return Je(f),S.data=Qt.call(f,f.transformResponse,S),S.headers=Nt.from(S.headers),S},function(S){return k(S)||(Je(f),S&&S.response&&(S.response.data=Qt.call(f,f.transformResponse,S.response),S.response.headers=Nt.from(S.response.headers))),Promise.reject(S)})}const lr="1.7.2",Ze={};["object","boolean","number","function","string","symbol"].forEach((f,p)=>{Ze[f]=function(S){return typeof S===f||"a"+(p<1?"n ":" ")+f}});const cr={};Ze.transitional=function(p,g,S){function E(M,L){return"[Axios v"+lr+"] Transitional option '"+M+"'"+L+(S?". "+S:"")}return(M,L,X)=>{if(p===!1)throw new et(E(L," has been removed"+(g?" in "+g:"")),et.ERR_DEPRECATED);return g&&!cr[L]&&(cr[L]=!0,console.warn(E(L," has been deprecated since v"+g+" and will be removed in the near future"))),p?p(M,L,X):!0}};function Ar(f,p,g){if(typeof f!="object")throw new et("options must be an object",et.ERR_BAD_OPTION_VALUE);const S=Object.keys(f);let E=S.length;for(;E-- >0;){const M=S[E],L=p[M];if(L){const X=f[M],ft=X===void 0||L(X,M,f);if(ft!==!0)throw new et("option "+M+" must be "+ft,et.ERR_BAD_OPTION_VALUE);continue}if(g!==!0)throw new et("Unknown option "+M,et.ERR_BAD_OPTION)}}var Xe={assertOptions:Ar,validators:Ze};const ge=Xe.validators;class ze{constructor(p){this.defaults=p,this.interceptors={request:new oe,response:new oe}}async request(p,g){try{return await this._request(p,g)}catch(S){if(S instanceof Error){let E;Error.captureStackTrace?Error.captureStackTrace(E={}):E=new Error;const M=E.stack?E.stack.replace(/^.+\n/,""):"";try{S.stack?M&&!String(S.stack).endsWith(M.replace(/^.+\n.+\n/,""))&&(S.stack+=` +`+M):S.stack=M}catch{}}throw S}}_request(p,g){typeof p=="string"?(g=g||{},g.url=p):g=p||{},g=Te(this.defaults,g);const{transitional:S,paramsSerializer:E,headers:M}=g;S!==void 0&&Xe.assertOptions(S,{silentJSONParsing:ge.transitional(ge.boolean),forcedJSONParsing:ge.transitional(ge.boolean),clarifyTimeoutError:ge.transitional(ge.boolean)},!1),E!=null&&(b.isFunction(E)?g.paramsSerializer={serialize:E}:Xe.assertOptions(E,{encode:ge.function,serialize:ge.function},!0)),g.method=(g.method||this.defaults.method||"get").toLowerCase();let L=M&&b.merge(M.common,M[g.method]);M&&b.forEach(["delete","get","head","post","put","patch","common"],mt=>{delete M[mt]}),g.headers=Nt.concat(L,M);const X=[];let ft=!0;this.interceptors.request.forEach(function(Ct){typeof Ct.runWhen=="function"&&Ct.runWhen(g)===!1||(ft=ft&&Ct.synchronous,X.unshift(Ct.fulfilled,Ct.rejected))});const ut=[];this.interceptors.response.forEach(function(Ct){ut.push(Ct.fulfilled,Ct.rejected)});let q,yt=0,Wt;if(!ft){const mt=[ur.bind(this),void 0];for(mt.unshift.apply(mt,X),mt.push.apply(mt,ut),Wt=mt.length,q=Promise.resolve(g);yt{if(!S._listeners)return;let M=S._listeners.length;for(;M-- >0;)S._listeners[M](E);S._listeners=null}),this.promise.then=E=>{let M;const L=new Promise(X=>{S.subscribe(X),M=X}).then(E);return L.cancel=function(){S.unsubscribe(M)},L},p(function(M,L,X){S.reason||(S.reason=new Ut(M,L,X),g(S.reason))})}throwIfRequested(){if(this.reason)throw this.reason}subscribe(p){if(this.reason){p(this.reason);return}this._listeners?this._listeners.push(p):this._listeners=[p]}unsubscribe(p){if(!this._listeners)return;const g=this._listeners.indexOf(p);g!==-1&&this._listeners.splice(g,1)}static source(){let p;return{token:new Qe(function(E){p=E}),cancel:p}}}var Cr=Qe;function br(f){return function(g){return f.apply(null,g)}}function Nr(f){return b.isObject(f)&&f.isAxiosError===!0}const ke={Continue:100,SwitchingProtocols:101,Processing:102,EarlyHints:103,Ok:200,Created:201,Accepted:202,NonAuthoritativeInformation:203,NoContent:204,ResetContent:205,PartialContent:206,MultiStatus:207,AlreadyReported:208,ImUsed:226,MultipleChoices:300,MovedPermanently:301,Found:302,SeeOther:303,NotModified:304,UseProxy:305,Unused:306,TemporaryRedirect:307,PermanentRedirect:308,BadRequest:400,Unauthorized:401,PaymentRequired:402,Forbidden:403,NotFound:404,MethodNotAllowed:405,NotAcceptable:406,ProxyAuthenticationRequired:407,RequestTimeout:408,Conflict:409,Gone:410,LengthRequired:411,PreconditionFailed:412,PayloadTooLarge:413,UriTooLong:414,UnsupportedMediaType:415,RangeNotSatisfiable:416,ExpectationFailed:417,ImATeapot:418,MisdirectedRequest:421,UnprocessableEntity:422,Locked:423,FailedDependency:424,TooEarly:425,UpgradeRequired:426,PreconditionRequired:428,TooManyRequests:429,RequestHeaderFieldsTooLarge:431,UnavailableForLegalReasons:451,InternalServerError:500,NotImplemented:501,BadGateway:502,ServiceUnavailable:503,GatewayTimeout:504,HttpVersionNotSupported:505,VariantAlsoNegotiates:506,InsufficientStorage:507,LoopDetected:508,NotExtended:510,NetworkAuthenticationRequired:511};Object.entries(ke).forEach(([f,p])=>{ke[p]=f});var jr=ke;function fr(f){const p=new Ve(f),g=r(Ve.prototype.request,p);return b.extend(g,Ve.prototype,p,{allOwnKeys:!0}),b.extend(g,p,null,{allOwnKeys:!0}),g.create=function(E){return fr(Te(f,E))},g}const Kt=fr(Xt);Kt.Axios=Ve,Kt.CanceledError=Ut,Kt.CancelToken=Cr,Kt.isCancel=k,Kt.VERSION=lr,Kt.toFormData=pt,Kt.AxiosError=et,Kt.Cancel=Kt.CanceledError,Kt.all=function(p){return Promise.all(p)},Kt.spread=br,Kt.isAxiosError=Nr,Kt.mergeConfig=Te,Kt.AxiosHeaders=Nt,Kt.formToJSON=f=>Ie(b.isHTMLForm(f)?new FormData(f):f),Kt.getAdapter=ir.getAdapter,Kt.HttpStatusCode=jr,Kt.default=Kt,s.exports=Kt},5493:function(s){function d(t,r){(r==null||r>t.length)&&(r=t.length);for(var o=0,n=new Array(r);o=0)&&(!Object.prototype.propertyIsEnumerable.call(n,u)||(i[u]=n[u]))}return i}s.exports=o,s.exports.__esModule=!0,s.exports.default=s.exports},2039:function(s,d,t){t(8257);function r(o,n){if(o==null)return{};var a={},i=Object.keys(o),u,c;for(c=0;c=0)&&(a[u]=o[u]);return a}s.exports=r,s.exports.__esModule=!0,s.exports.default=s.exports},7929:function(s,d,t){var r=t(1333),o=t(3102),n=t(8140),a=t(7662);function i(u,c){return r(u)||o(u,c)||n(u,c)||a()}s.exports=i,s.exports.__esModule=!0,s.exports.default=s.exports},1467:function(s,d,t){t(8191),t(487),t(8221);var r=t(3928).default;function o(n,a){if(r(n)!="object"||!n)return n;var i=n[Symbol.toPrimitive];if(i!==void 0){var u=i.call(n,a||"default");if(r(u)!="object")return u;throw new TypeError("@@toPrimitive must return a primitive value.")}return(a==="string"?String:Number)(n)}s.exports=o,s.exports.__esModule=!0,s.exports.default=s.exports},2646:function(s,d,t){var r=t(3928).default,o=t(1467);function n(a){var i=o(a,"string");return r(i)=="symbol"?i:i+""}s.exports=n,s.exports.__esModule=!0,s.exports.default=s.exports},3928:function(s,d,t){t(5794),t(6882),t(3949),t(314),t(982);function r(o){return s.exports=r=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(n){return typeof n}:function(n){return n&&typeof Symbol=="function"&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n},s.exports.__esModule=!0,s.exports.default=s.exports,r(o)}s.exports=r,s.exports.__esModule=!0,s.exports.default=s.exports},8140:function(s,d,t){t(551),t(9325),t(314),t(7364),t(3692);var r=t(5493);function o(n,a){if(!!n){if(typeof n=="string")return r(n,a);var i=Object.prototype.toString.call(n).slice(8,-1);if(i==="Object"&&n.constructor&&(i=n.constructor.name),i==="Map"||i==="Set")return Array.from(n);if(i==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i))return r(n,a)}}s.exports=o,s.exports.__esModule=!0,s.exports.default=s.exports},3079:function(s){"use strict";s.exports=JSON.parse('{"zh-CN":{"\u5F00\u542F\u6743\u9650\u7BA1\u7406":"\u5F00\u542F\u6743\u9650\u7BA1\u7406","\u7528\u6237\u7EC4\u540D":"\u7528\u6237\u7EC4\u540D","\u6388\u6743\u671F\u9650":"\u6388\u6743\u671F\u9650","\u81EA\u5B9A\u4E49":"\u81EA\u5B9A\u4E49","\u5929":"\u5929","\u5230\u671F\u65F6\u95F4":"\u5230\u671F\u65F6\u95F4","\u7406\u7531":"\u7406\u7531","\u786E\u5B9A":"\u786E\u5B9A","\u53D6\u6D88":"\u53D6\u6D88","1\u4E2A\u6708":"1\u4E2A\u6708","3\u4E2A\u6708":"3\u4E2A\u6708","6\u4E2A\u6708":"6\u4E2A\u6708","12\u4E2A\u6708":"12\u4E2A\u6708","\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650":"\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650","\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531":"\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531","\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279":"\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279","\u7528\u6237\u7EC4":"\u7528\u6237\u7EC4","\u6DFB\u52A0\u65F6\u95F4":"\u6DFB\u52A0\u65F6\u95F4","\u6709\u6548\u671F":"\u6709\u6548\u671F","\u72B6\u6001":"\u72B6\u6001","\u64CD\u4F5C":"\u64CD\u4F5C","\u6743\u9650\u8BE6\u60C5":"\u6743\u9650\u8BE6\u60C5","\u7533\u8BF7\u52A0\u5165":"\u7533\u8BF7\u52A0\u5165","\u7EED\u671F":"\u7EED\u671F","\u9000\u51FA":"\u9000\u51FA","\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4":"\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4","\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002":"\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u3010{0}\u3011\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002","\u672A\u52A0\u5165":"\u672A\u52A0\u5165","\u6B63\u5E38":"\u6B63\u5E38","\u5DF2\u8FC7\u671F":"\u5DF2\u8FC7\u671F","\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650":"\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650","\u6743\u9650\u89D2\u8272":"\u6743\u9650\u89D2\u8272","\u5220\u9664":"\u5220\u9664","\u65B0\u5EFA\u7528\u6237\u7EC4":"\u65B0\u5EFA\u7528\u6237\u7EC4","\u5173\u95ED\u6743\u9650\u7BA1\u7406":"\u5173\u95ED\u6743\u9650\u7BA1\u7406","\u662F\u5426\u5220\u9664\u7528\u6237\u7EC4":"\u662F\u5426\u5220\u9664\u7528\u6237\u7EC4","\u786E\u8BA4\u5173\u95ED\u3010\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F":"\u786E\u8BA4\u5173\u95ED\u3010{0}\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F","\u5173\u95ED\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"\u5173\u95ED{0}\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A","\u6D41\u6C34\u7EBF":"\u6D41\u6C34\u7EBF","\u6D41\u6C34\u7EBF\u7EC4":"\u6D41\u6C34\u7EBF\u7EC4","\u6D41\u6C34\u7EBF\u6A21\u677F":"\u6D41\u6C34\u7EBF\u6A21\u677F","\u5173\u95ED\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"\u5173\u95ED{0}\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A","\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664","\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664","\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650":"\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650","\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650":"\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650","\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!":"\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!","\u4E0D\u80FD\u6062\u590D":"\u4E0D\u80FD\u6062\u590D","\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650":"\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650","\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B":"\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B","\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B":"\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B","\u6CA1\u6709\u64CD\u4F5C\u6743\u9650":"\u6CA1\u6709\u64CD\u4F5C\u6743\u9650","\u53BB\u7533\u8BF7":"\u53BB\u7533\u8BF7","\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762":"\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762","\u5237\u65B0\u9875\u9762":"\u5237\u65B0\u9875\u9762","\u5173\u95ED":"\u5173\u95ED","\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4":"\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4","\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650":"\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650","\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD":"\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD","\u6D41\u6C34\u7EBF\u7BA1\u7406":"\u6D41\u6C34\u7EBF\u7BA1\u7406","\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406":"\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406","\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406":"\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4":"\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u9000\u51FA\u5148\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u9000\u51FA\u7528\u6237\u7EC4":"\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u9000\u51FA\u5148\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u9000\u51FA\u7528\u6237\u7EC4"},"en-US":{"\u5F00\u542F\u6743\u9650\u7BA1\u7406":"Turn on permission management","\u7528\u6237\u7EC4\u540D":"User Group Name","\u6388\u6743\u671F\u9650":"Authorization Term","\u81EA\u5B9A\u4E49":"Custom","\u5929":"day","\u5230\u671F\u65F6\u95F4":"Expire at","\u7406\u7531":"Reason","\u786E\u5B9A":"Confirm","\u53D6\u6D88":"Cancel","1\u4E2A\u6708":"1 Month","3\u4E2A\u6708":"3 Month","6\u4E2A\u6708":"6 Month","12\u4E2A\u6708":"12 Month","\u8BF7\u9009\u62E9\u7533\u8BF7\u671F\u9650":"Please select the application period","\u8BF7\u586B\u5199\u7533\u8BF7\u7406\u7531":"Please fill in the reason for application","\u7533\u8BF7\u6210\u529F\uFF0C\u8BF7\u7B49\u5F85\u5BA1\u6279":"Application successful, please wait for approval","\u7528\u6237\u7EC4":"User Group","\u6DFB\u52A0\u65F6\u95F4":"Add Time","\u6709\u6548\u671F":"Validity","\u72B6\u6001":"Status","\u64CD\u4F5C":"Actions","\u6743\u9650\u8BE6\u60C5":"Permission Details","\u7533\u8BF7\u52A0\u5165":"Apply to join","\u7EED\u671F":"Renewal","\u9000\u51FA":"Exit","\u786E\u8BA4\u9000\u51FA\u7528\u6237\u7EC4":"Confirm exit user group","\u9000\u51FA\u540E\uFF0C\u5C06\u65E0\u6CD5\u518D\u4F7F\u7528\u6240\u8D4B\u4E88\u7684\u6743\u9650\u3002":"After logging out, you will no longer be able to use the permissions granted by {0}.","\u672A\u52A0\u5165":"Not Joined","\u6B63\u5E38":"Normal","\u5DF2\u8FC7\u671F":"Expired","\u65E0\u8BE5\u9879\u76EE\u7528\u6237\u7EC4\u7BA1\u7406\u6743\u9650":"No user group management permission for this project","\u6743\u9650\u89D2\u8272":"Permission Roles","\u5220\u9664":"Delete","\u65B0\u5EFA\u7528\u6237\u7EC4":"Create new user group","\u5173\u95ED\u6743\u9650\u7BA1\u7406":"Close Permission Manage","\u786E\u8BA4\u5173\u95ED\u3010\u3011\u7684\u6743\u9650\u7BA1\u7406\uFF1F":"Are you sure to close \u3010{0}\u3011 permission management?","\u5173\u95ED\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"Turning off {0} permission management will perform the following actions:","\u6D41\u6C34\u7EBF":"pipeline","\u6D41\u6C34\u7EBF\u7EC4":"pipeline group","\u6D41\u6C34\u7EBF\u6A21\u677F":"pipeline template","\u5173\u95ED\u6743\u9650\u7BA1\u7406\uFF0C\u5C06\u6267\u884C\u5982\u4E0B\u64CD\u4F5C\uFF1A":"To close {0} permission management, the following operations will be performed:","\u5C06\u7F16\u8F91\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"Remove users from editors","\u5C06\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u3001\u67E5\u770B\u8005\u4E2D\u7684\u7528\u6237\u79FB\u9664":"Remove users from editors, executors, and viewers","\u5220\u9664\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u7EE7\u627F\u8BE5\u7EC4\u7684\u6743\u9650":"Delete the permissions inherited by users in the corresponding group","\u5220\u9664\u5BF9\u5E94\u7EC4\u4FE1\u606F\u548C\u7EC4\u6743\u9650":"Delete the corresponding group information and group permissions","\u63D0\u4EA4\u540E\uFF0C\u518D\u6B21\u5F00\u542F\u6743\u9650\u7BA1\u7406\u65F6\u5BF9\u5E94\u7EC4\u5185\u7528\u6237\u5C06\u4E0D\u80FD\u6062\u590D,\u8BF7\u8C28\u614E\u64CD\u4F5C!":"After submission, group members who have been removed from the corresponding permissions will not be able to recover them when permission management is reopened. Please proceed with caution !","\u4E0D\u80FD\u6062\u590D":"not be able to recover","\u9700\u8981\u7533\u8BF7\u7684\u6743\u9650":"Operation","\u5173\u8054\u7684\u8D44\u6E90\u7C7B\u578B":"Related Resource Type","\u5173\u8054\u7684\u8D44\u6E90\u5B9E\u4F8B":"Related Resource","\u6CA1\u6709\u64CD\u4F5C\u6743\u9650":"No operation permissions","\u53BB\u7533\u8BF7":"Apply","\u8BF7\u5728\u6743\u9650\u7BA1\u7406\u9875\u586B\u5199\u6743\u9650\u7533\u8BF7\u5355\uFF0C\u63D0\u4EA4\u5B8C\u6210\u540E\u518D\u5237\u65B0\u8BE5\u9875\u9762":"Please fill in the permission application form on the permission management page, and refresh the page after submission","\u5237\u65B0\u9875\u9762":"Refresh","\u5173\u95ED":"Close","\u6743\u9650\u7533\u8BF7\u5355\u5DF2\u63D0\u4EA4":"Permission application has been submitted","\u5C1A\u672A\u5F00\u542F\u6D41\u6C34\u7EBF\u7EC4\u6743\u9650\u7BA1\u7406\u3002\u5F00\u542F\u540E\uFF0C\u53EF\u4EE5\u7ED9\u7EC4\u5185\u6D41\u6C34\u7EBF\u6279\u91CF\u6DFB\u52A0\u7F16\u8F91\u8005\u3001\u6267\u884C\u8005\u6216\u67E5\u770B\u8005\u6743\u9650":"Pipeline group permission management is not yet enabled. Once enabled, it will be possible to add editors, executors, or viewers permissions in bulk to pipelines within the group.","\u5C1A\u672A\u5F00\u542F\u6B64\u6D41\u6C34\u7EBF\u6743\u9650\u7BA1\u7406\u529F\u80FD":"The permission management function of this pipeline has not been enabled","\u6D41\u6C34\u7EBF\u7BA1\u7406":"Pipeline Management","\u6D41\u6C34\u7EBF\u6A21\u677F\u7BA1\u7406":"Pipeline Template Management","\u6D41\u6C34\u7EBF\u7EC4\u7BA1\u7406":"Pipeline Group Management","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u7EED\u671F\u8BF7\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u7EED\u671F\u7528\u6237\u7EC4":"Obtained permissions through user group, if you need to renew, please contact the project administrator to renew the user group","\u901A\u8FC7\u7528\u6237\u7EC4\u83B7\u5F97\u6743\u9650\uFF0C\u82E5\u9700\u9000\u51FA\u5148\u8054\u7CFB\u9879\u76EE\u7BA1\u7406\u5458\u9000\u51FA\u7528\u6237\u7EC4":"Obtained permissions through user group, if you need to exit, please contact the project administrator to exit the user group first"}}')}},Se={};function fe(s){var d=Se[s];if(d!==void 0)return d.exports;var t=Se[s]={exports:{}};return Le[s](t,t.exports,fe),t.exports}(function(){fe.d=function(s,d){for(var t in d)fe.o(d,t)&&!fe.o(s,t)&&Object.defineProperty(s,t,{enumerable:!0,get:d[t]})}})(),function(){fe.g=function(){if(typeof globalThis=="object")return globalThis;try{return this||new Function("return this")()}catch{if(typeof window=="object")return window}}()}(),function(){fe.o=function(s,d){return Object.prototype.hasOwnProperty.call(s,d)}}(),function(){fe.r=function(s){typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(s,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(s,"__esModule",{value:!0})}}(),function(){fe.p=""}();var vr=fe(5840);return vr}()}); diff --git a/src/frontend/bk-permission/package.json b/src/frontend/bk-permission/package.json index ea7da5a82a2..eebc9025e13 100644 --- a/src/frontend/bk-permission/package.json +++ b/src/frontend/bk-permission/package.json @@ -1,6 +1,6 @@ { "name": "bk-permission", - "version": "0.0.28", + "version": "0.1.0", "description": "", "main": "./dist/main.js", "scripts": { @@ -40,5 +40,8 @@ }, "peerDependencies": { "vue": "^3.2.41" + }, + "dependencies": { + "axios": "^1.7.2" } -} +} \ No newline at end of file diff --git a/src/frontend/bk-permission/src/components/children/permission-manage/group-aside.vue b/src/frontend/bk-permission/src/components/children/permission-manage/group-aside.vue index 0f592582ac4..32fe8757352 100644 --- a/src/frontend/bk-permission/src/components/children/permission-manage/group-aside.vue +++ b/src/frontend/bk-permission/src/components/children/permission-manage/group-aside.vue @@ -15,14 +15,17 @@ @click="handleChooseGroup(group)" > {{ group.name }} - - - {{ group.userCount }} - - - - {{ group.departmentCount }} - +
+ +
{{ group[item] }}
+
- +