feat: 对接腾讯云cfs --story=127069191 #1737
Open
Conversation
This file contains hidden or 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
|
|
Super-zhw
added a commit
to Super-zhw/bk-hcm
that referenced
this pull request
Sep 3, 2025
Super-zhw
added a commit
to Super-zhw/bk-hcm
that referenced
this pull request
Sep 4, 2025
Signed-off-by: huiwenzhang <huiwenzhang@tencent.com>
Super-zhw
added a commit
to Super-zhw/bk-hcm
that referenced
this pull request
Sep 4, 2025
Signed-off-by: huiwenzhang <1458070668@qq.com>
Super-zhw
force-pushed
the
cfs/dev
branch
2 times, most recently
from
4dbc341 to
269bb7a
Compare
Super-zhw
added a commit
to Super-zhw/bk-hcm
that referenced
this pull request
Sep 4, 2025
Signed-off-by: Super-zhw <1458070668@qq.com>
Super-zhw
added a commit
to Super-zhw/bk-hcm
that referenced
this pull request
Sep 16, 2025
Signed-off-by: Super-zhw <1458070668@qq.com>
Super-zhw
added a commit
to Super-zhw/bk-hcm
that referenced
this pull request
Sep 19, 2025
Signed-off-by: Super-zhw <1458070668@qq.com>
Signed-off-by: Super-zhw <1458070668@qq.com>
fxdgg
reviewed
Oct 21, 2025
| logs.Errorf("create cfs storage request decode failed, err: %v, rid: %s", err, cts.Kit.Rid) | ||
| return nil, errf.NewFromErr(errf.DecodeRequestFailed, err) | ||
| } | ||
|
|
Collaborator
There was a problem hiding this comment.
if err := req.Validate(); err != nil {
return nil, errf.NewFromErr(errf.InvalidParameter, err)
}
缺少参数校验逻辑
fxdgg
reviewed
Oct 21, 2025
| accountInfo, err := svc.client.DataService().Global.Cloud.GetResBasicInfo(cts.Kit, enumor.AccountCloudResType, | ||
| req.AccountID) | ||
| if err != nil { | ||
| logs.Errorf("get account basic info failed, err: %v, rid: %s", err, cts.Kit.Rid) |
fxdgg
reviewed
Oct 21, 2025
| if err := cts.DecodeInto(req); err != nil { | ||
| logs.Errorf("delete cfs storage request decode failed, err: %v, rid: %s", err, cts.Kit.Rid) | ||
| return nil, errf.NewFromErr(errf.DecodeRequestFailed, err) | ||
| } |
fxdgg
reviewed
Oct 21, 2025
| return nil, errf.NewFromErr(errf.DecodeRequestFailed, err) | ||
| } | ||
|
|
||
| //// note: 暂时不验证权限 |
fxdgg
reviewed
Oct 21, 2025
| //authRes := meta.ResourceAttribute{Basic: &meta.Basic{Type: meta.CfsStorage, Action: meta.Find, | ||
| // ResourceID: req.AccountID}} | ||
| //if err := svc.authorizer.AuthorizeWithPerm(cts.Kit, authRes); err != nil { | ||
| // logs.Errorf("list cfs storage auth failed, err: %v, account id: %s, rid: %s", err, req.AccountID, cts.Kit.Rid) |
Collaborator
There was a problem hiding this comment.
“get cfs storage auth failed”
fxdgg
reviewed
Oct 21, 2025
| accountInfo, err := svc.client.DataService().Global.Cloud.GetResBasicInfo(cts.Kit, enumor.AccountCloudResType, | ||
| req.AccountID) | ||
| if err != nil { | ||
| logs.Errorf("get account basic info failed, err: %v, rid: %s", err, cts.Kit.Rid) |
ZQHcode
reviewed
Oct 22, 2025
| switch vendor { | ||
| case enumor.TCloud: // 只支持腾讯云 | ||
| return createCfs[corecfs.TCloudCfsExtension](cts, svc, vendor) | ||
| //case enumor.Aws: |
ZQHcode
reviewed
Oct 22, 2025
| if err := req.Validate(); err != nil { | ||
| return nil, errf.NewFromErr(errf.InvalidParameter, err) | ||
| } | ||
|
|
ZQHcode
reviewed
Oct 22, 2025
| }, | ||
| }, nil | ||
|
|
||
| //return &protocloud.CfsExtListResult[corecfs.TCloudCfsExtension]{Count: result.Count}, nil |
ZQHcode
reviewed
Oct 22, 2025
| case enumor.TCloud: | ||
| return convCfsGetResult[corecfs.TCloudCfsExtension](base, cfsTable.Extension) | ||
|
|
||
| //case enumor.Aws: |
ZQHcode
reviewed
Oct 22, 2025
| } | ||
|
|
||
| //// ListCfs cfs. | ||
| //func (svc *cfsSvc) ListCfs(cts *rest.Contexts) (interface{}, error) { |
ZQHcode
reviewed
Oct 22, 2025
| BkBizID: one.BkBizID, | ||
| AccountID: one.AccountID, | ||
| Vendor: one.Vendor, | ||
| // |
ZQHcode
reviewed
Oct 22, 2025
| tSdk, err := svc.ad.TCloud(cts.Kit, req.AccountID) | ||
| if err != nil { | ||
| logs.Errorf("request dataservice create tcloud cfs failed, rid: %s", cts.Kit.Rid) | ||
| return nil, errors.Wrapf(err, "request dataservice create tcloud cfs failed, rid: %s", cts.Kit.Rid) |
ZQHcode
reviewed
Oct 22, 2025
| *tcloudResp.Cfs.FileSystemId, cts.Kit.Rid) | ||
| } | ||
| // 获取cfs | ||
| resp, err := svc.dc.TCloud.Cfs.GetCfs(cts.Kit.Ctx, cts.Kit.Header(), createResp.IDs[0]) |
Collaborator
There was a problem hiding this comment.
createResp.IDs[0]做一下长度判断吧，防止panic
ZQHcode
reviewed
Oct 22, 2025
| } | ||
| // db删除 | ||
| deleteReq := new(protocloud.CfsBatchDeleteReq) | ||
| deleteReq.Filter = tools.ContainersExpression("id", []string{resp.ID}) |
Collaborator
There was a problem hiding this comment.
只有一个的话，直接用tools.EqualExpression就好了
ZQHcode
reviewed
Oct 22, 2025
| } | ||
| } | ||
|
|
||
| // 数据同步 |
Collaborator
There was a problem hiding this comment.
这个是什么原因呢，为什么查询接口里会有数据同步逻辑？
ZQHcode
reviewed
Oct 22, 2025
| logs.Errorf("ListTCloudCfs validate request failed, err: %v, rid: %s", err, cts.Kit.Rid) | ||
| return nil, errf.NewFromErr(errf.InvalidParameter, err) | ||
| } | ||
| //// 云上资源查询 |
ZQHcode
reviewed
Oct 22, 2025
| TieringState: info.Cfs.TieringState, | ||
| TieringDetail: info.Cfs.TieringDetail, | ||
| Version: info.Cfs.Version, | ||
| //MetaType: info.Cfs.MetaType, |
ZQHcode
reviewed
Oct 22, 2025
| logs.Errorf("tcloud cfs create failed, err: %v, rid: %s", err, kt.Rid) | ||
| return nil, err | ||
| } | ||
| //respStr, _ := json.MarshalToString(createResp) // debug log |
ZQHcode
reviewed
Oct 22, 2025
| return nil, err | ||
| } | ||
| if len(resp.SuccessCloudIDs) == 0 { | ||
| return nil, errors.Errorf("tcloud create cfs storage failed, cloudID: %s, result: %s, rid: %s", |
ZQHcode
reviewed
Oct 22, 2025
| package cfs | ||
|
|
||
| import ( | ||
| cfs "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs/v20190719" |
ZQHcode
reviewed
Oct 22, 2025
| package cfs | ||
|
|
||
| import ( | ||
| cfs "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs/v20190719" |
ZQHcode
reviewed
Oct 22, 2025
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/pkg/errors" |
ZQHcode
reviewed
Oct 22, 2025
| sql := fmt.Sprintf(`INSERT INTO %s (%s) VALUES(%s)`, table.CfsTable, tablecfs.TableColumns.ColumnExpr(), | ||
| tablecfs.TableColumns.ColonNameExpr()) | ||
|
|
||
| //logs.Infof("sql: %s, rid: %s", sql, kt.Rid) // note: debug log |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.