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

migrate to hyper v1 #6580

Merged
merged 33 commits into from
Sep 27, 2024
Merged

migrate to hyper v1 #6580

merged 33 commits into from
Sep 27, 2024

Conversation

ahl
Copy link
Contributor

@ahl ahl commented Sep 14, 2024

There's going to need to be some coordination with these:

I hope to merge this and then get crucible, propolis, and maghemite depending on this updated version so that we can return the reqwest 0.11 dependency over there.

After merging this I intend to temporarily depend on a maghemite branch (see oxidecomputer/maghemite#378) to navigate past the omicron-common test failure.

@@ -13,6 +13,7 @@
[libraries."libgcc_s.so.1"]
[libraries."libipcc.so.1"]
[libraries."libkstat.so.1"]
[libraries."liblzma.so.5"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@papertigers can I just... add this? @rcgoodfellow this is due to a new dep from falcon from oxidecomputer/falcon#88

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's an explicit allow list, so as long as we expect that lib to be present in the gz and ngz it's the right place to stick it. If it's a lib we don't want to leak out of a single binary we can add it an allow list similar to what libipcc has.

|| error.to_string().contains("self-signed certificate")
|| error.to_string().contains("self signed certificate")
);
assert!(error.chain().to_string().contains("self-signed certificate"));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmpesp I think this was you; does this new check suffice?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's been so long I don't remember doing this haha!

I'm not sure this check is right: it looks like this part of the test is meant to check that a client can't connect using the wrong certificate, and this check is asserting it won't trust a self-signed certificate. That's not quite the same thing. I think we need either add_root_certificate or danger_accept_invalid_certs in order to test that the client accepts the self-signed cert but fails due to the incorrect certificate being used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahl ahl marked this pull request as ready for review September 27, 2024 03:21
@ahl ahl changed the title WIP: migrate to hyper v1 migrate to hyper v1 Sep 27, 2024
Copy link
Collaborator

@bnaecker bnaecker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks alright to me!

Cargo.toml Show resolved Hide resolved
Cargo.toml Show resolved Hide resolved
@@ -834,8 +833,8 @@ mod test {
// The DNS server is running, but has no records. Expect a failure.
let err = client.test_endpoint().await.unwrap_err();
assert!(
err.to_string().contains("no record found"),
"Unexpected Error (expected 'no record found'): {err}",
err.to_string().contains("error sending request"),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this bit change? If the server is running, but doesn't have any records, shouldn't the "send part" succeed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I can improve this check (insofar as it's useful). The part we were looking for is just farther down the nested chain of errors. I'll do that in a follow on

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahl ahl merged commit c727c3f into main Sep 27, 2024
17 of 18 checks passed
@ahl ahl deleted the hyper-v1 branch September 27, 2024 05:25
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.

4 participants