fix: add canary_id to job_history and cleanup sync canary function #1169
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
yashmehrotra
commented
Jul 24, 2023
Comment on lines
-348
to
-353
| canary, err := c.ToV1() | ||
| if err != nil { | ||
| logger.Errorf("Error parsing canary[%s]: %v", c.ID, err) | ||
| jobHistory.AddError(err.Error()) | ||
| continue | ||
| } |
There was a problem hiding this comment.
Not required, we are doing this in the SyncCanary func
yashmehrotra
commented
Jul 24, 2023
Comment on lines
-355
to
-362
| if len(canary.Status.Checks) == 0 && len(canary.Spec.GetAllChecks()) > 0 { | ||
| logger.Infof("Persisting %s as it has no checks", canary.Name) | ||
| pkgCanary, _, _, err := db.PersistCanary(*canary, canary.Annotations["source"]) | ||
| if err != nil { | ||
| logger.Errorf("Failed to persist canary %s: %v", canary.Name, err) | ||
| jobHistory.AddError(err.Error()) | ||
| continue | ||
| } |
There was a problem hiding this comment.
Since these canaries are always fetched from database, no persistence logic is needed
There was a problem hiding this comment.
@yashmehrotra we were also saving checks from the canary spec in here. Now, checks aren't being saved.
There was a problem hiding this comment.
There was a problem hiding this comment.
@yashmehrotra I'm not talking about component checks. If you create a canary from the UI then the checks are never saved.
yashmehrotra
commented
Jul 24, 2023
Comment on lines
-364
to
-369
| v1canary, err := pkgCanary.ToV1() | ||
| if err != nil { | ||
| logger.Errorf("Failed to convert canary to V1 %s: %v", canary.Name, err) | ||
| jobHistory.AddError(err.Error()) | ||
| continue | ||
| } |
There was a problem hiding this comment.
redundant conversion
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.
Fixes: flanksource/duty#229
@moshloop @adityathebe
Removed some dead logic and redundant conditions which I don't think was necessary. Please do a double check on this