feat: 支持配置文件恢复 --story=74835198 #2960
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
AlkaidChan
reviewed
Feb 22, 2024
Ambition9186
force-pushed
the
feature/config_item_recovery
branch
4 times, most recently
from
51df6ae to
1ce4a21
Compare
AlkaidChan
reviewed
Feb 27, 2024
| @@ -47,7 +50,8 @@ func (s *Service) CreateConfigItem(ctx context.Context, req *pbds.CreateConfigIt | |||
| } | |||
| // 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 { | |||
| req.ConfigItemAttachment.AppId, req.ConfigItemSpec.Name, req.ConfigItemSpec.Path); err == nil && | |||
| errors.Is(err, gorm.ErrRecordNotFound) { | |||
| } | ||
|
|
||
| if commit.ID == releaseCi.CommitID { | ||
| return nil, errors.New("It's already the latest version") |
Ambition9186
force-pushed
the
feature/config_item_recovery
branch
from
1ce4a21 to
2e80254
Compare
AlkaidChan
reviewed
Feb 28, 2024
| } | ||
|
|
||
| commitID := []uint32{} | ||
| contextID := []uint32{} |
Ambition9186
force-pushed
the
feature/config_item_recovery
branch
from
2e80254 to
a234d65
Compare
AlkaidChan
approved these changes
Feb 28, 2024
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.