Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(http/upgrade): replace hyper::Body with BoxBody #3479

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

cratelyn
Copy link
Collaborator

hyper::Body is removed in the 1.0 version.

this commit removes it from our upgrade facilities, using a generic body parameter that defaults to BoxBody.

see linkerd/linkerd2#8733.

`hyper::Body` is removed in the 1.0 version.

this commit removes it from our upgrade facilities, using a generic body
parameter that defaults to BoxBody.

see <linkerd/linkerd2#8733>.

Signed-off-by: katelyn martin <[email protected]>
@cratelyn cratelyn marked this pull request as ready for review December 19, 2024 23:48
@cratelyn cratelyn requested a review from a team as a code owner December 19, 2024 23:48
cratelyn added a commit that referenced this pull request Dec 20, 2024
`UpgradeResponseBody` currently wraps a `hyper::Body`. this type is
removed in hyper 1.0.

this commit replaces this with a generic `B`-typed body.

see #3479, which performs
the same change in `linkerd-http-upgrade`.

see linkerd/linkerd2#8733 for more information
on upgrading to hyper 1.0.

Signed-off-by: katelyn martin <[email protected]>
linkerd/http/upgrade/src/glue.rs Outdated Show resolved Hide resolved
https://github.com/linkerd/linkerd2-proxy/pull/3479/files#r1894068885

in `main` this isn't currently pinned, so this was needed to add the `B`
parameter originally in development, but tweaking how we poll the body
(_see lines 70-80, below_) means this bound is indeed frivolous now.

this commit removes an extraneous `Unpin` bound.

Co-authored-by: Scott Fleener <[email protected]>
Signed-off-by: katelyn martin <[email protected]>
@cratelyn cratelyn merged commit fcfde84 into main Dec 20, 2024
15 checks passed
@cratelyn cratelyn deleted the kate/hyper-1.x-glue-upgrade-body branch December 20, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants