diff --git a/bcs-services/bcs-bscp/docs/changelog/en_US/v1.29.0_2023-09-20.md b/bcs-services/bcs-bscp/docs/changelog/en_US/v1.29.0_2023-09-20.md index a06532b3c4..930646c285 100644 --- a/bcs-services/bcs-bscp/docs/changelog/en_US/v1.29.0_2023-09-20.md +++ b/bcs-services/bcs-bscp/docs/changelog/en_US/v1.29.0_2023-09-20.md @@ -1,5 +1,5 @@ -# v1.29.0 version update log -### Newly added +# v1.29.0 Release Notes +### Features - [Service Management] Added permission control for service creation, service editing, generated version, online version, etc. - [Service Management] Configuration supports variable rendering - [Service Management] Configuration supports importing from configuration templates diff --git a/bcs-services/bcs-bscp/pkg/components/bkcmdb/bkcmdb.go b/bcs-services/bcs-bscp/pkg/components/bkcmdb/bkcmdb.go deleted file mode 100644 index eae226fd8a..0000000000 --- a/bcs-services/bcs-bscp/pkg/components/bkcmdb/bkcmdb.go +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making Blueking Container Service available. - * Copyright (C) 2019 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. - */ - -// Package bkcmdb provides bkcmdb client. -package bkcmdb - -import ( - "context" - "encoding/json" - "fmt" - - "github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/components" - "github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/config" - "github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/thirdparty/esb/cmdb" - "github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/thirdparty/esb/types" -) - -// SearchBusiness 组件化的函数 -func SearchBusiness(ctx context.Context, params *cmdb.SearchBizParams) (*cmdb.SearchBizResp, error) { - url := fmt.Sprintf("%s/api/c/compapi/v2/cc/search_business/", config.G.Base.BKPaaSHost) - - // SearchBizParams is esb search cmdb business parameter. - type esbSearchBizParams struct { - *types.CommParams - *cmdb.SearchBizParams - } - - req := &esbSearchBizParams{ - CommParams: &types.CommParams{ - AppCode: config.G.Base.AppCode, - AppSecret: config.G.Base.AppSecret, - UserName: "admin", - }, - SearchBizParams: params, - } - - resp, err := components.GetClient().R(). - SetContext(ctx). - SetBody(req). - Post(url) - - if err != nil { - return nil, err - } - - bizList := &cmdb.SearchBizResp{} - if err := json.Unmarshal(resp.Body(), bizList); err != nil { - return nil, err - } - return bizList, nil - -} diff --git a/bcs-services/bcs-bscp/pkg/thirdparty/esb/client/transport.go b/bcs-services/bcs-bscp/pkg/thirdparty/esb/client/transport.go index c431437b9a..bdee28f46f 100644 --- a/bcs-services/bcs-bscp/pkg/thirdparty/esb/client/transport.go +++ b/bcs-services/bcs-bscp/pkg/thirdparty/esb/client/transport.go @@ -22,9 +22,8 @@ import ( // esbAuthTransport esb auth transport type esbAuthTransport struct { - Transport http.RoundTripper - commParams *types.CommParams - authValue string + Transport http.RoundTripper + authValue string } // newEsbAuthTransport . @@ -35,9 +34,8 @@ func newEsbAuthTransport(cfg *cc.Esb, transport http.RoundTripper) (http.RoundTr return nil, err } t := &esbAuthTransport{ - commParams: params, - authValue: string(value), - Transport: transport, + authValue: string(value), + Transport: transport, } return t, nil }