upgrade to hyper v1 (#1028)

Co-authored-by: David Pacheco <dap@oxidecomputer.com>
Co-authored-by: Adam H. Leventhal <ahl@oxide.computer>

Author: 3 people

CHANGELOG.adoc

@@ -15,6 +15,18 @@
 
 https://github.com/oxidecomputer/dropshot/compare/v0.11.0\...HEAD[Full list of commits]
 
+=== Breaking Changes
+
+* https://github.com/oxidecomputer/dropshot/pull/1028[#1028] Updates Dropshot for `hyper` 1.0 and `http` 1.0.  Since consumers provide Dropshot with values from `hyper` and `http`, you'll need to update to `hyper` 1.0 and `http` 1.0 (or newer compatible versions), too.
+
+==== Upgrading to hyper 1.0
+
+1. Update your crate's dependencies on `hyper` and `http` to 1.0 (or a newer compatible version) in Cargo.toml.
+2. Replace any references to `hyper::Body` with `dropshot::Body` instead.
+3. You may need to update your use of `dropshot::Body`; the `http-body-util` can be helpful.
+
+There are no other known breaking changes in these crates that affect Dropshot.  If you have any trouble with this upgrade, please let us know by filing an issue.
+
 == 0.11.0 (released 2024-08-21)
 
 https://github.com/oxidecomputer/dropshot/compare/v0.10.1\...v0.11.0[Full list of commits]

Cargo.lock

@@ -23,7 +23,8 @@ debug-ignore = "1.0.5"
 form_urlencoded = "1.2.1"
 futures = "0.3.30"
 hostname = "0.4.0"
-http = "0.2.9"
+http = "1.1.0"
+http-body-util = "0.1.2"
 indexmap = "2.5.0"
 multer = "3.1.0"
 paste = "1.0.15"
@@ -55,7 +56,11 @@ version = "^0.11.1-dev"
 path = "../dropshot_endpoint"
 
 [dependencies.hyper]
-version = "0.14"
+version = "1.4.1"
+features = [ "full" ]
+
+[dependencies.hyper-util]
+version = "0.1.9"
 features = [ "full" ]
 
 [dependencies.openapiv3]
@@ -88,8 +93,8 @@ anyhow = "1.0.89"
 async-channel = "2.3.1"
 buf-list = "1.0.3"
 expectorate = "1.1.0"
-hyper-rustls = "0.25.0"
-hyper-staticfile = "0.9"
+hyper-rustls = "0.26.0"
+hyper-staticfile = "0.10"
 lazy_static = "1.5.0"
 libc = "0.2.158"
 mime_guess = "2.0.5"

dropshot/Cargo.toml

@@ -3,14 +3,14 @@
 //! Example using Dropshot to serve files
 
 use dropshot::ApiDescription;
+use dropshot::Body;
 use dropshot::ConfigLogging;
 use dropshot::ConfigLoggingLevel;
 use dropshot::HttpError;
 use dropshot::HttpServerStarter;
 use dropshot::RequestContext;
 use dropshot::{endpoint, Path};
 use http::{Response, StatusCode};
-use hyper::Body;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use std::path::PathBuf;
@@ -133,7 +133,11 @@ async fn static_content(
                 format!("failed to read file {:?}: {:#}", entry, e),
             )
         })?;
-        let file_stream = hyper_staticfile::FileBytesStream::new(file);
+
+        let file_access = hyper_staticfile::vfs::TokioFileAccess::new(file);
+        let file_stream =
+            hyper_staticfile::util::FileBytesStream::new(file_access);
+        let body = Body::wrap(hyper_staticfile::Body::Full(file_stream));
 
         // Derive the MIME type from the file name
         let content_type = mime_guess::from_path(&entry)
@@ -143,7 +147,7 @@ async fn static_content(
         Ok(Response::builder()
             .status(StatusCode::OK)
             .header(http::header::CONTENT_TYPE, content_type)
-            .body(file_stream.into_body())?)
+            .body(body)?)
     }
 }
 

dropshot/examples/file_server.rs

@@ -2,6 +2,7 @@
 //! Example use of Dropshot for matching wildcard paths to serve static content.
 
 use dropshot::ApiDescription;
+use dropshot::Body;
 use dropshot::ConfigDropshot;
 use dropshot::ConfigLogging;
 use dropshot::ConfigLoggingLevel;
@@ -10,7 +11,6 @@ use dropshot::HttpServerStarter;
 use dropshot::RequestContext;
 use dropshot::{endpoint, Path};
 use http::{Response, StatusCode};
-use hyper::Body;
 use schemars::JsonSchema;
 use serde::Deserialize;
 

dropshot/examples/index.rs

@@ -3,6 +3,7 @@
 
 use dropshot::endpoint;
 use dropshot::ApiDescription;
+use dropshot::Body;
 use dropshot::ConfigDropshot;
 use dropshot::ConfigLogging;
 use dropshot::ConfigLoggingLevel;
@@ -11,7 +12,6 @@ use dropshot::HttpServerStarter;
 use dropshot::MultipartBody;
 use dropshot::RequestContext;
 use http::{Response, StatusCode};
-use hyper::Body;
 
 #[tokio::main]
 async fn main() -> Result<(), String> {

dropshot/examples/multipart.rs

@@ -1312,14 +1312,14 @@ mod test {
     use crate::handler::RequestContext;
     use crate::ApiDescription;
     use crate::ApiEndpoint;
+    use crate::Body;
     use crate::EndpointTagPolicy;
     use crate::Path;
     use crate::Query;
     use crate::TagConfig;
     use crate::TagDetails;
     use crate::CONTENT_TYPE_JSON;
     use http::Method;
-    use hyper::Body;
     use hyper::Response;
     use openapiv3::OpenAPI;
     use schemars::JsonSchema;