Preserve operation interrupted in ContextEval error#1303
Merged
TristonianJones merged 1 commit intoApr 15, 2026
Conversation
When ContextEval detects an InterruptError, wrap both the original
error and the context cause using fmt.Errorf("%w: %w", ...) so that:
- errors.Is(err, context.Canceled) works (new behavior)
- errors.Is(err, context.DeadlineExceeded) works (new behavior)
- errors.Is(err, InterruptError{}) works (preserved)
- strings.Contains(err.Error(), "operation interrupted") works (backward compat)
Previously, the error was replaced entirely with context.Cause(ctx),
which dropped the "operation interrupted" message that downstream
consumers (e.g. Kubernetes) rely on for string matching.
Fixes google#1195 while maintaining backward compatibility.
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
Contributor
Author
Collaborator
|
/gcbrun |
TristonianJones
approved these changes
Apr 15, 2026
Maks1mS
pushed a commit
to stplr-dev/stplr
that referenced
this pull request
May 13, 2026
This PR contains the following updates: | Package | Type | Update | Change | OpenSSF | |---|---|---|---|---| | [github.com/google/cel-go](https://github.com/google/cel-go) | require | patch | `v0.28.0` → `v0.28.1` | [](https://securityscorecards.dev/viewer/?uri=github.com/google/cel-go) | --- >⚠️ **Warning** > > Some dependencies could not be looked up. Check the [Dependency Dashboard](issues/23) for more information. --- ### Release Notes <details> <summary>google/cel-go (github.com/google/cel-go)</summary> ### [`v0.28.1`](https://github.com/google/cel-go/releases/tag/v0.28.1) [Compare Source](google/cel-go@v0.28.0...v0.28.1) #### What's Changed - fix: deleted `IntToDuration` overload by [@​alexsnaps](https://github.com/alexsnaps) in [#​1300](google/cel-go#1300) - Support shorthand types in env yaml and REPL by [@​jnthntatum](https://github.com/jnthntatum) in [#​1301](google/cel-go#1301) - Preserve operation interrupted in ContextEval error by [@​dims](https://github.com/dims) in [#​1303](google/cel-go#1303) - Use shorthand type specifiers in env yaml files by [@​jnthntatum](https://github.com/jnthntatum) in [#​1305](google/cel-go#1305) - Cost estimation and tracking for strings extension by [@​TristonianJones](https://github.com/TristonianJones) in [#​1307](google/cel-go#1307) - Update repl type string for doubles by [@​TristonianJones](https://github.com/TristonianJones) in [#​1308](google/cel-go#1308) #### New Contributors - [@​alexsnaps](https://github.com/alexsnaps) made their first contribution in [#​1300](google/cel-go#1300) - [@​dims](https://github.com/dims) made their first contribution in [#​1303](google/cel-go#1303) **Full Changelog**: <google/cel-go@v0.28.0...v0.28.1> </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At 12:00 AM through 04:59 AM and 10:00 PM through 11:59 PM, Monday through Friday (`* 0-4,22-23 * * 1-5`) - Only on Sunday and Saturday (`* * * * 0,6`) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xNzAuMjIiLCJ1cGRhdGVkSW5WZXIiOiI0My4xNzAuMjIiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbIktpbmQvRGVwZW5kZW5jaWVzIl19--> Reviewed-on: https://altlinux.space/stapler/stplr/pulls/431
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.
When ContextEval detects an InterruptError, wrap both the original error and the context cause using
fmt.Errorf("%w: %w", ...)so that:errors.Is(err, context.Canceled)works (new behavior)errors.Is(err, context.DeadlineExceeded)works (new behavior)errors.Is(err, InterruptError{})works (preserved)strings.Contains(err.Error(), "operation interrupted")works (backward compat)Previously, the error was replaced entirely with context.Cause(ctx), which dropped the "operation interrupted" message that downstream consumers (e.g. Kubernetes) rely on for string matching.
Fixes #1195 while maintaining backward compatibility.
Pull Requests Guidelines
See CONTRIBUTING.md for more details about when to create
a GitHub Pull Request and when other kinds of contributions or
consultation might be more desirable.
When creating a new pull request, please fork the repo and work within a
development branch.
Commit Messages
Reviews
Merging
they have write access. Otherwise, the change will be merged by a maintainer.
closes #<issue-num>: descriptionin the merge message,if applicable.