Bugfix/134 wait for deletion of configmap#142
Open
notmyown wants to merge 14 commits into
Open
Conversation
Contributor
|
Is missing in BackupSchedules, doesn't it? |
Contributor
|
Sonarqube is unhappy with test coverage :( |
meiserloh
requested changes
Jul 8, 2026
| } | ||
|
|
||
| err = migration.WaitForDeletion(func() error { | ||
| _, terror := repo.Get(ctx, doguName) |
Contributor
There was a problem hiding this comment.
is terror a thing or a typo? shouldn't we write it t_error or something (i am not even sure what the t is meaning - probably timeout)?
Comment on lines
164
to
171
| mockRepo.EXPECT().Get(testCtx, doguName).Return(regConfig.DoguConfig{}, apierrors.NewNotFound( | ||
| schema.GroupResource{ | ||
| Group: "", | ||
| Resource: "configmaps", | ||
| }, | ||
| doguName.String(), | ||
| )) | ||
|
|
Contributor
There was a problem hiding this comment.
I feel like this is adding much bloat to every positive test. Should we introduce a file-wide variable? Or at least remove the Group and Resource, since they are not checked anyways?
Comment on lines
+16
to
+22
| oldWaitFunc := migration.WaitForDeletion | ||
| migration.WaitForDeletion = func(check func() error) error { | ||
| return nil | ||
| } | ||
| defer func() { | ||
| migration.WaitForDeletion = oldWaitFunc | ||
| }() |
Contributor
There was a problem hiding this comment.
So why no global-config tests?
Contributor
Author
There was a problem hiding this comment.
to keep the unittests as they were
- added another test for specificly testing wait function on global-config
meiserloh
reviewed
Jul 9, 2026
…g' into bugfix/134-wait-for-deletion-of-configmap # Conflicts: # CHANGELOG.md # migration/config/dogu.go # migration/config/dogu_test.go
…r-deletion-of-configmap
meiserloh
reviewed
Jul 10, 2026
Comment on lines
84
to
86
Contributor
There was a problem hiding this comment.
// importDoguConfigWithRepo imports a dogu configuration into a doguConfigRepo by wiping the
// existing config and refilling it. Excluded keys are restored to their original values, or
// skipped if they didn't exist before the import.
meiserloh
reviewed
Jul 10, 2026
Comment on lines
+90
to
+112
| } | ||
| } else { | ||
| return fmt.Errorf("failed to get original dogu config: %w", err) | ||
| } |
Contributor
There was a problem hiding this comment.
change the order of operations to remove the second get:
registryDoguConfig, err := repo.Get(ctx, doguName)
slog.Debug(fmt.Sprintf("old dogu config %s: %v", doguName, registryDoguConfig))
if err != nil {
if !ceserrors.IsNotFoundError(err) && !apierrors.IsNotFound(err) {
return fmt.Errorf("failed to get original dogu config: %w", err)
}
registryDoguConfig, err = repo.Create(ctx, regConfig.CreateDoguConfig(doguName, map[regConfig.Key]regConfig.Value{}))
if err != nil {
return fmt.Errorf("failed to create new dogu config: %w", err)
}
}
originalValues := registryDoguConfig
meiserloh
reviewed
Jul 10, 2026
| if err != nil { | ||
| return fmt.Errorf("failed to create new dogu config: %w", err) | ||
| } | ||
| //whipe out old config |
Contributor
There was a problem hiding this comment.
add a little context:
// wipe out old config so we overwrite instead of merging with old values.
or something
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.