refactor(mock/http-body): outline MockBody test body
#3611
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
`MockBody` is a type that we use to implement tests for our `peek_trailers::PeekTrailersBody<B>` body middleware. this is a useful tool for mocking the polling outcomes of the inner body we wrap, which would be useful for testing other `http_body::Body` middleware. this commit moves `MockBody` out of `linkerd-http-retry`, and into a new `linkerd-mock-http-body` crate. this is added as a test dependency for the retry crate, and can now be used (rather than vendored) by other bodies. Signed-off-by: katelyn martin <[email protected]>
cratelyn
force-pushed
the
kate/mock-http-body
branch
from
2428926 to
c0ad90b
Compare
sfleen
approved these changes
Feb 12, 2025
olix0r
approved these changes
Feb 12, 2025
cratelyn
added a commit
that referenced
this pull request
Feb 14, 2025
this commit makes some minor alterations to our error recovery body middleware. see linkerd/linkerd2#8733 for more information. this commit removes an `assert!` statement from the implementation of `<Response<R, B> as Body>::poll_data()`. see the documentation of `Body::poll_frame()`: > Once the end of the stream is reached, implementations should > continue to return [`Poll::Ready(None)`]. hyperium/http-body@1090bff#diff-33aabe8c2aaa7614022addf244245e09bbff576a67a9ae3c6938c8a868201d36R60-R61 to do this, this commit introduces a distinct terminal state `Inner::Rescued` to represent when the underlying `B`-typed body has yielded an error and been rescued. once in this state the body will yield no more data frames, instead yielding a collection of trailers describing the mid-stream error that was encountered by the underlying body. the call to `R::rescue` is also moved down into the helper function fka `grpc_trailers()`. this helps the function follow the grain of our "state machine" a little more directly. see #3615, #3614, and #3611 for pretext to this change.
cratelyn
added a commit
that referenced
this pull request
Feb 14, 2025
this commit makes some minor alterations to our error recovery body middleware. see linkerd/linkerd2#8733 for more information. this commit removes an `assert!` statement from the implementation of `<Response<R, B> as Body>::poll_data()`. see the documentation of `Body::poll_frame()`: > Once the end of the stream is reached, implementations should > continue to return [`Poll::Ready(None)`]. hyperium/http-body@1090bff#diff-33aabe8c2aaa7614022addf244245e09bbff576a67a9ae3c6938c8a868201d36R60-R61 to do this, this commit introduces a distinct terminal state `Inner::Rescued` to represent when the underlying `B`-typed body has yielded an error and been rescued. once in this state the body will yield no more data frames, instead yielding a collection of trailers describing the mid-stream error that was encountered by the underlying body. the call to `R::rescue` is also moved down into the helper function fka `grpc_trailers()`. this helps the function follow the grain of our "state machine" a little more directly. see #3615, #3614, and #3611 for pretext to this change. Signed-off-by: katelyn martin <[email protected]>
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.
MockBodyis a type that we use to implement tests for ourpeek_trailers::PeekTrailersBody<B>body middleware. this is a useful tool for mocking the polling outcomes of the inner body we wrap, which would be useful for testing otherhttp_body::Bodymiddleware.this commit moves
MockBodyout oflinkerd-http-retry, and into a newlinkerd-mock-http-bodycrate. this is added as a test dependency for the retry crate, and can now be used (rather than vendored) by other bodies.