-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #835 from TencentBlueKing/v1.5.x
Merge V1.5.0 into master
- Loading branch information
Showing
754 changed files
with
83,149 additions
and
14,766 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * TencentBlueKing is pleased to support the open source community by making | ||
| * 蓝鲸智云 - 混合云管理平台 (BlueKing - Hybrid Cloud Management System) available. | ||
| * Copyright (C) 2022 THL A29 Limited, | ||
| * a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at http://opensource.org/licenses/MIT | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| * either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * We undertake not to change the open source license (MIT license) applicable | ||
| * | ||
| * to the current version of the project delivered to anyone in the future. | ||
| */ | ||
|
|
||
| package cert | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| logicaudit "hcm/cmd/cloud-server/logics/audit" | ||
| "hcm/pkg/api/core" | ||
| corecert "hcm/pkg/api/core/cloud/cert" | ||
| protocloud "hcm/pkg/api/data-service/cloud" | ||
| dataservice "hcm/pkg/client/data-service" | ||
| "hcm/pkg/criteria/constant" | ||
| "hcm/pkg/criteria/enumor" | ||
| "hcm/pkg/kit" | ||
| "hcm/pkg/logs" | ||
| "hcm/pkg/runtime/filter" | ||
| "hcm/pkg/tools/slice" | ||
| ) | ||
|
|
||
| // Assign 分配证书到业务下 | ||
| func Assign(kt *kit.Kit, cli *dataservice.Client, ids []string, bizID int64) error { | ||
| if len(ids) == 0 { | ||
| return fmt.Errorf("ids is required") | ||
| } | ||
|
|
||
| if err := ValidateBeforeAssign(kt, cli, ids); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // create cert assign audit | ||
| audit := logicaudit.NewAudit(cli) | ||
| if err := audit.ResBizAssignAudit(kt, enumor.SslCertAuditResType, ids, bizID); err != nil { | ||
| logs.Errorf("create assign cert audit failed, ids: %v, bizID: %d, err: %v, rid: %s", ids, bizID, err, kt.Rid) | ||
| return err | ||
| } | ||
|
|
||
| // assign | ||
| req := &protocloud.CertBatchUpdateExprReq{ | ||
| IDs: ids, | ||
| BkBizID: bizID, | ||
| } | ||
| _, err := cli.Global.BatchUpdateCert(kt, req) | ||
| if err != nil { | ||
| logs.Errorf("batch update cert db failed, ids: %v, bizID: %d, err: %v, rid: %s", ids, bizID, err, kt.Rid) | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // ValidateBeforeAssign 分配前置校验 | ||
| func ValidateBeforeAssign(kt *kit.Kit, cli *dataservice.Client, ids []string) error { | ||
| // 判断是否已经分配 | ||
| listReq := &core.ListReq{ | ||
| Filter: &filter.Expression{ | ||
| Op: filter.And, | ||
| Rules: []filter.RuleFactory{ | ||
| &filter.AtomRule{Field: "id", Op: filter.In.Factory(), Value: ids}, | ||
| &filter.AtomRule{Field: "bk_biz_id", Op: filter.NotEqual.Factory(), Value: constant.UnassignedBiz}, | ||
| }, | ||
| }, | ||
| Page: core.NewDefaultBasePage(), | ||
| } | ||
| listResp, err := cli.Global.ListCert(kt, listReq) | ||
| if err != nil { | ||
| logs.Errorf("list cert failed, req: %+v, err: %v, rid: %s", listReq, err, kt.Rid) | ||
| return err | ||
| } | ||
|
|
||
| if len(listResp.Details) != 0 { | ||
| return fmt.Errorf("cert(ids=%v) already assigned", slice.Map(listResp.Details, | ||
| func(cert corecert.BaseCert) string { return cert.ID })) | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.