refactor: error processing for xPolicy #3302
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
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
|
/retest |
shawnh2
commented
May 6, 2024
| @@ -1015,20 +1016,23 @@ func (t *Translator) buildCircuitBreaker(policy *egv1a1.BackendTrafficPolicy) (* | |||
|
|
|||
| func (t *Translator) buildTimeout(policy *egv1a1.BackendTrafficPolicy, r *ir.HTTPRoute) (*ir.Timeout, error) { | |||
| var ( | |||
| tto *ir.TCPTimeout | |||
| hto *ir.HTTPTimeout | |||
| tto *ir.TCPTimeout | |||
There was a problem hiding this comment.
this part is reverted from https://github.com/envoyproxy/gateway/pull/2846/files#diff-ce86bc9474dbc964bb6180e6a110b708dd85081193dca54a2fa7cda70d742247L930, since BTP has supported dealing with multi-errors now
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
shawnh2
commented
May 14, 2024
| if to, err = t.buildTimeout(policy, r); err != nil { | ||
| return errors.Wrap(err, "Timeout") | ||
| if to, err = t.buildTimeout(policy, r); err == nil { | ||
| r.Timeout = to |
There was a problem hiding this comment.
stop warpping error with message here to prevent the error returned by buildTimeout got surfaced again.
Xunzhuo
previously approved these changes
May 22, 2024
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3302 +/- ##
==========================================
- Coverage 67.23% 67.22% -0.01%
==========================================
Files 166 166
Lines 19439 19489 +50
==========================================
+ Hits 13070 13102 +32
- Misses 5424 5439 +15
- Partials 945 948 +3 ☔ View full report in Codecov by Sentry. |
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.
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #2894, separated from #2926