feat: 补充腾讯云没加vendor、region过滤条件的请求, 并补充region索引 #1216
Conversation
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
chenjr15
changed the title
fxdgg
reviewed
Jan 3, 2025
| @@ -427,6 +427,7 @@ func (cli *client) getVpcMap(kt *kit.Kit, accountID string, cloudVpcIDsMap map[s | |||
| Rules: []filter.RuleFactory{ | |||
| &filter.AtomRule{Field: "account_id", Op: filter.Equal.Factory(), Value: accountID}, | |||
| &filter.AtomRule{Field: "cloud_id", Op: filter.In.Factory(), Value: cloudVpcIDs}, | |||
| &filter.AtomRule{Field: "vendor", Op: filter.Equal.Factory(), Value: enumor.Azure}, | |||
There was a problem hiding this comment.
这里怎么没有加region？我看“cmd/hc-service/logics/res-sync/aws/cvm.go”里面是有的呢
There was a problem hiding this comment.
azure的上下文里面没有region这个参数，没办法给查询强行加上
fxdgg
reviewed
Jan 3, 2025
| Filter: tools.ExpressionAnd( | ||
| tools.RuleIn("cloud_id", delCloudIDs), | ||
| tools.RuleEqual("vendor", enumor.Azure), | ||
| ), |
There was a problem hiding this comment.
这里也没加region，我看“cmd/hc-service/logics/res-sync/aws/subnet.go”的deleteSubnet()里面是有的呢
fxdgg
reviewed
Jan 3, 2025
| Filter: tools.ContainersExpression("cloud_id", delCloudIDs), | ||
| Filter: tools.ExpressionAnd( | ||
| tools.RuleIn("cloud_id", delCloudIDs), | ||
| tools.RuleEqual("vendor", enumor.Azure), |
There was a problem hiding this comment.
azure的上下文里面没有region这个参数，没办法给查询强行加上
fxdgg
reviewed
Jan 3, 2025
| Filter: tools.ContainersExpression("cloud_id", partIDs), | ||
| Page: core.NewDefaultBasePage(), | ||
| Filter: tools.ExpressionAnd( | ||
| tools.RuleIn("cloud_id", partIDs), |
There was a problem hiding this comment.
传过来的partIDs不一定都是同一个region的吧？而且也不一定是同一个vendor的
There was a problem hiding this comment.
对的，所以这里已经写了注释 没有修改原有的逻辑
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.