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(app/inbound): address hyper deprecations in http/1 tests #3454

Merged
merged 1 commit into from
Dec 13, 2024

Conversation

cratelyn
Copy link
Collaborator

@cratelyn cratelyn commented Dec 13, 2024

this is a follow-up commit related to 24dc5d8 (#3445).

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


this addresses hyper deprecations in the http/1 tests for the inbound proxy.

prior, we made use of tower::ServiceExt::oneshot, which consumes a service and drops it after sending a request and polling the response future to completion.

https://docs.rs/tower/0.5.2/src/tower/util/oneshot.rs.html#96-100

tower is not a 1.0 library yet, so SendRequest does not provide an implementation of tower::Service in hyper's 1.0 interface:

consequentially, we must drop the sender ourselves after receiving a response now.


this commit also addresses hyper deprecations in the http/1 downgrade tests for the inbound proxy.

because these tests involve a http/2 client and an http/1 server, we take the choice of inlining the body of
http_util::connect_and_accept() rather than introducing a new, third http_util::connect_and_accept_http_downgrade() function.

we will refactor these helper functions separately.

NB: because ContextError is internal to the linkerd-app-test crate, we do not wrap the errors. these are allegedly used by the fuzzing tests (see f.ex #986 and #989), but for our purposes with respect to the inbound proxy we can elide them rather than making ctx() a public method.

this is a follow-up commit related to 24dc5d8 (#3445).

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

---

this addresses hyper deprecations in the http/1 tests for the inbound
proxy.

prior, we made use of `tower::ServiceExt::oneshot`, which consumes a
service and drops it after sending a request and polling the response
future to completion.

<https://docs.rs/tower/0.5.2/src/tower/util/oneshot.rs.html#96-100>

tower is not a 1.0 library yet, so `SendRequest` does not provide an
implementation of `tower::Service` in hyper's 1.0 interface:

- <https://docs.rs/hyper/0.14.31/hyper/client/conn/struct.SendRequest.html#impl-Service%3CRequest%3CB%3E%3E-for-SendRequest%3CB%3E>
- <https://docs.rs/hyper/1.5.1/hyper/client/conn/http1/struct.SendRequest.html#trait-implementations>

consequentially, we must drop the sender ourselves after receiving a
response now.

---

this commit *also* addresses hyper deprecations in the http/1 downgrade
tests for the inbound proxy.

because these tests involve a http/2 client and an http/1 server, we
take the choice of inlining the body of
`http_util::connect_and_accept()` rather than introducing a new, third
`http_util::connect_and_accept_http_downgrade()` function.

we will refactor these helper functions in follow-on commits.

NB: because `ContextError` is internal to the `linkerd-app-test` crate,
we do not wrap the errors. these are allegedly used by the fuzzing tests
(_see f.ex #986 and #989_), but for our purposes with respect to the
inbound proxy we can elide them rather than making `ctx()` a public
method.

---

Signed-off-by: katelyn martin <[email protected]>
@cratelyn cratelyn marked this pull request as ready for review December 13, 2024 02:22
@cratelyn cratelyn requested a review from a team as a code owner December 13, 2024 02:22
@cratelyn cratelyn merged commit 42fe4cf into main Dec 13, 2024
15 checks passed
@cratelyn cratelyn deleted the kate/hyper-1.x-inbound-http1-client-deprecations branch December 13, 2024 16:13
cratelyn added a commit that referenced this pull request Dec 13, 2024
this commit removes a duplicate function that was errantly defined, due
to some issues when merging previous (interdependent) pr's.

see
- #3455
- #3454
- linkerd/linkerd2#8733

Signed-off-by: katelyn martin <[email protected]>
cratelyn added a commit that referenced this pull request Dec 13, 2024
…3461)

this commit removes a duplicate function that was errantly defined, due
to some issues when merging previous (interdependent) pr's.

see
- #3455
- #3454
- linkerd/linkerd2#8733

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants