fix: 创建前检测非模板配置和模板配置是否存在冲突 --bug=122816798 #3124
Merged
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
Ambition9186
changed the title
Ambition9186
force-pushed
the
hotfix/config_item_duplicates
branch
from
b756200
to
1a6c04a
Compare
Ambition9186
force-pushed
the
hotfix/config_item_duplicates
branch
2 times, most recently
from
8b3da64
to
b5f2c30
Compare
Ambition9186
force-pushed
the
hotfix/config_item_duplicates
branch
from
b5f2c30
to
d592912
Compare
AlkaidChan
reviewed
May 8, 2024
Comment on lines
302
to
299
| fileDir = strings.Replace(path, rootDir, "", 1) | ||
| fileDir = strings.ReplaceAll(fileDir, "\\", "/") | ||
| lastSlashIndex := strings.LastIndex(fileDir, "/") | ||
| if lastSlashIndex >= 0 { | ||
| fileDir = fileDir[:lastSlashIndex] | ||
| } |
There was a problem hiding this comment.
这里做的事情应该是以下几步吧：
- 获取相对路径
- 统一分隔符为 '/'
- 获取文件的父目录
可以直接用内置函数来解决，可读性比较强
fileDir = filepath.Rel(fileDir, path)
fileDir = strings.ReplaceAll(fileDir, "\\", "/")
fileDir = filepath.Dir(fileDir)| for _, v2 := range b { | ||
| path2 := path.Join(v2.Path, v2.Name) | ||
| if path1 == path2 { | ||
| continue |
There was a problem hiding this comment.
反了吧，应该是 path1 == path2 就直接报错冲突了吧
| @@ -38,6 +39,20 @@ func (s *Service) CreateRelease(ctx context.Context, req *pbcs.CreateReleaseReq) | |||
| return nil, err | |||
| } | |||
|
|
|||
| // 创建版本前验证非模板配置和模板配置是否存在冲突 | |||
There was a problem hiding this comment.
在 GenerateReleaseAndPublish 接口也加上这个判断
| // validate in table config_items | ||
| if _, err := s.dao.ConfigItem().GetByUniqueKey(grpcKit, req.ConfigItemAttachment.BizId, | ||
| req.ConfigItemAttachment.AppId, req.ConfigItemSpec.Name, req.ConfigItemSpec.Path); err == nil { | ||
| if tools.CheckPathConflict(path.Join(req.ConfigItemSpec.Path, req.ConfigItemSpec.Name), existingPaths) { |
There was a problem hiding this comment.
BatchUpsertConfigItems 也要加上这个逻辑，这两个接口也要考虑下会不会导致路径冲突
AlkaidChan
reviewed
May 8, 2024
| return | ||
| } | ||
|
|
||
| // 获取服务下某个空间下的所有套餐 |
There was a problem hiding this comment.
这里应该是获取空间下的所有模板吧，和服务、套餐没关系
Comment on lines
466
to
468
| // getAllConfigFileByApp 获取服务下的配置项以及关联后的空间模板配置 | ||
| func (c *configImport) getAllConfigFileByApp(kt *kit.Kit, newFiles []types.CIUniqueKey) error { | ||
| // 获取服务下所有配置模板 |
There was a problem hiding this comment.
这两个注释都不对吧，这里应该是获取服务下的所有非模板配置
Ambition9186
force-pushed
the
hotfix/config_item_duplicates
branch
3 times, most recently
from
5060dc7
to
733aa86
Compare
AlkaidChan
approved these changes
May 14, 2024
Ambition9186
force-pushed
the
hotfix/config_item_duplicates
branch
from
733aa86
to
a4de386
Compare
wenxinlee2015
added a commit
that referenced
this pull request
May 16, 2024
* github-bk-bcs/master: fix: 客户端体验问题优化 (#3200) refactor: 文件型配置表格优化 (#3201) feat: 组件类型版本分布数据支持下钻 (#3197) refactor: 更新前端icon资源 (#3199) fix: 修复下载zip类型配置项文件损坏的问题 (#3198) fix: 客户端验收问题修复 (#3196) feature: 客户端事件列表支持时分秒搜索 (#3195) feat: 客户端统计新增在线/离线状态搜索 (#3194) fix: 修复数据下钻标签没加搜索 (#3193) fix: 修复客户端添加搜索条件时心跳时间被覆盖问题 (#3192) fix: 创建前检测非模板配置和模板配置是否存在冲突 (#3124) feat: 客户端统计新增多维度查询和下钻 (#3189) feat: 客户端统计补全下钻功能及验收问题修复 (#3188)
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.