Update mas-iana-codegen to use reqwest

Author: sandhose

Cargo.lock

@@ -18,8 +18,8 @@ camino.workspace = true
 convert_case = "0.6.0"
 csv = "1.3.0"
 futures-util = "0.3.30"
-hyper.workspace = true
+reqwest = "0.12.5"
 serde.workspace = true
-tokio.workspace=  true
+tokio.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true

crates/iana-codegen/Cargo.toml

@@ -12,22 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{collections::HashMap, fmt::Display, sync::Arc};
+use std::{collections::HashMap, fmt::Display};
 
 use camino::{Utf8Path, Utf8PathBuf};
+use reqwest::Client;
 use tokio::io::AsyncWriteExt;
 use tracing::Level;
 
-type Client = hyper::Client<hyper::client::HttpConnector>;
-
 mod gen;
 pub mod jose;
 pub mod oauth;
 pub mod traits;
 
 #[derive(Debug)]
 struct File {
-    client: Arc<Client>,
+    client: Client,
     registry_name: &'static str,
     registry_url: &'static str,
     sections: Vec<Section>,
@@ -42,7 +41,7 @@ fn resolve_path(relative: impl AsRef<Utf8Path>) -> Utf8PathBuf {
 
 impl File {
     #[tracing::instrument(skip(client))]
-    fn new(registry_name: &'static str, registry_url: &'static str, client: Arc<Client>) -> Self {
+    fn new(registry_name: &'static str, registry_url: &'static str, client: Client) -> Self {
         tracing::info!("Generating file from IANA registry");
         Self {
             client,
@@ -142,7 +141,7 @@ use self::traits::{EnumEntry, EnumMember, Section};
 
 #[tracing::instrument(skip_all, fields(%path))]
 async fn generate_jose(
-    client: &Arc<Client>,
+    client: &Client,
     path: impl AsRef<Utf8Path> + std::fmt::Display,
 ) -> anyhow::Result<()> {
     let path = resolve_path(path);
@@ -173,7 +172,7 @@ async fn generate_jose(
 
 #[tracing::instrument(skip_all, fields(%path))]
 async fn generate_oauth(
-    client: &Arc<Client>,
+    client: &Client,
     path: impl AsRef<Utf8Path> + std::fmt::Display,
 ) -> anyhow::Result<()> {
     let path = resolve_path(path);
@@ -182,7 +181,7 @@ async fn generate_oauth(
     let file = File::new(
         "OAuth Parameters",
         "https://www.iana.org/assignments/jose/jose.xhtml",
-        client.clone(),
+        client,
     )
     .load::<oauth::AccessTokenType>()
     .await?
@@ -208,7 +207,6 @@ async fn main() -> anyhow::Result<()> {
         .init();
 
     let client = Client::new();
-    let client = Arc::new(client);
 
     let iana_crate_root = Utf8Path::new("crates/iana/");
 

crates/iana-codegen/src/main.rs

@@ -15,7 +15,6 @@
 use anyhow::Context;
 use async_trait::async_trait;
 use convert_case::{Case, Casing};
-use hyper::http;
 use serde::de::DeserializeOwned;
 
 use super::Client;
@@ -74,23 +73,23 @@ pub trait EnumEntry: DeserializeOwned + Send + Sync {
 
     async fn fetch(client: &Client) -> anyhow::Result<Vec<(&'static str, EnumMember)>> {
         tracing::info!("Fetching CSV");
-        let request = http::Request::get(Self::URL)
-            .header("User-Agent", "mas-iana-codegen/0.1")
-            .body(hyper::Body::empty())?;
 
         let response = client
-            .request(request)
+            .get(Self::URL)
+            .header("User-Agent", "mas-iana-codegen/0.1")
+            .send()
             .await
             .context(format!("can't the CSV at {}", Self::URL))?;
 
         let status = response.status();
         anyhow::ensure!(status.is_success(), "HTTP status code is not 200: {status}");
 
-        let body = hyper::body::to_bytes(response.into_body())
+        let body = response
+            .text()
             .await
             .context(format!("can't the CSV body at {}", Self::URL))?;
 
-        let parsed: Result<Vec<_>, _> = csv::Reader::from_reader(body.as_ref())
+        let parsed: Result<Vec<_>, _> = csv::Reader::from_reader(body.as_bytes())
             .into_deserialize()
             .filter_map(|item: Result<Self, _>| {
                 item.map(|item| {