chore: bump gitops-engine for error wrapping #23282
Merged
Conversation
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
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev
commented
Jun 6, 2025
| @@ -43,23 +43,19 @@ var ErrAnotherOperationInProgress = status.Errorf(codes.FailedPrecondition, "ano | |||
|
|
|||
| // AugmentSyncMsg enrich the K8s message with user-relevant information | |||
| func AugmentSyncMsg(res common.ResourceSyncResult, apiResourceInfoGetter func() ([]kube.APIResourceInfo, error)) (string, error) { | |||
| switch res.Message { | |||
| case "the server could not find the requested resource": | |||
| if strings.Contains(res.Message, "the server could not find the requested resource") { | |||
There was a problem hiding this comment.
I refactored this function to return early and short-circuit instead of having a lot of nested logic. But the only functional change is to use strings.Contains instead of an exact match, in order to cope with the now-wrapped error message.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #23282 +/- ##
==========================================
- Coverage 60.00% 59.93% -0.08%
==========================================
Files 341 342 +1
Lines 57818 58548 +730
==========================================
+ Hits 34694 35090 +396
- Misses 20344 20617 +273
- Partials 2780 2841 +61 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
agaudreault
approved these changes
Jun 6, 2025
philippemerle
pushed a commit
to philippemerle/argoproj-argo-cd
that referenced
this pull request
Jun 7, 2025
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Philippe Merle <philippe.merle@inria.fr>
dsuhinin
pushed a commit
to dsuhinin/argo-cd
that referenced
this pull request
Jun 16, 2025
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
dsuhinin
pushed a commit
to dsuhinin/argo-cd
that referenced
this pull request
Jun 16, 2025
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
enneitex
pushed a commit
to enneitex/argo-cd
that referenced
this pull request
Aug 24, 2025
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: enneitex <etienne.divet@gmail.com>
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.
Bumping for this change: argoproj/gitops-engine#732