From f18b07aa057778052e720af2c91c6232c4a63615 Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conrad@neon.tech>
Date: Fri, 18 Jul 2025 16:43:26 +0100
Subject: [PATCH] hack around azure_core reqwest features

---
 libs/remote_storage/src/azure_blob.rs         |  2 +-
 .../src/azure_reqwest_polyfill.rs             | 96 +++++++++++++++++++
 libs/remote_storage/src/lib.rs                |  1 +
 3 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 libs/remote_storage/src/azure_reqwest_polyfill.rs

diff --git a/libs/remote_storage/src/azure_blob.rs b/libs/remote_storage/src/azure_blob.rs
index db30829216..eed044a86b 100644
--- a/libs/remote_storage/src/azure_blob.rs
+++ b/libs/remote_storage/src/azure_blob.rs
@@ -129,7 +129,7 @@ impl AzureBlobStorage {
             .pool_max_idle_per_host(conn_pool_size)
             .build()
             .expect("failed to build `reqwest` client");
-        Arc::new(client)
+        Arc::new(super::azure_reqwest_polyfill::Client(client))
     }
 
     pub fn relative_path_to_name(&self, path: &RemotePath) -> String {
diff --git a/libs/remote_storage/src/azure_reqwest_polyfill.rs b/libs/remote_storage/src/azure_reqwest_polyfill.rs
new file mode 100644
index 0000000000..b879ac3108
--- /dev/null
+++ b/libs/remote_storage/src/azure_reqwest_polyfill.rs
@@ -0,0 +1,96 @@
+use std::{collections::HashMap, str::FromStr};
+
+use azure_core::{
+    Body, HttpClient, Method, Request, Response, StatusCode,
+    error::{Error, ErrorKind, ResultExt},
+    headers::{HeaderName, HeaderValue, Headers},
+};
+use futures::TryStreamExt;
+use tracing::{debug, warn};
+
+#[derive(Debug)]
+pub struct Client(pub reqwest::Client);
+
+#[async_trait::async_trait]
+impl HttpClient for Client {
+    async fn execute_request(&self, request: &Request) -> azure_core::Result<Response> {
+        let url = request.url().clone();
+        let method = request.method();
+        let mut req = self.0.request(try_from_method(*method)?, url.clone());
+
+        for (name, value) in request.headers().iter() {
+            req = req.header(name.as_str(), value.as_str());
+        }
+
+        let req = match request.body().clone() {
+            Body::Bytes(bytes) => req.body(bytes),
+            Body::SeekableStream(seekable_stream) => {
+                req.body(reqwest::Body::wrap_stream(seekable_stream))
+            }
+        };
+
+        let reqwest_request = req
+            .build()
+            .context(ErrorKind::Other, "failed to build `reqwest` request")?;
+
+        debug!("performing request {method} '{url}' with `reqwest`");
+        let rsp = self
+            .0
+            .execute(reqwest_request)
+            .await
+            .context(ErrorKind::Io, "failed to execute `reqwest` request")?;
+
+        let status = rsp.status();
+        let headers = to_headers(rsp.headers());
+
+        let body = Box::pin(
+            rsp.bytes_stream()
+                .map_err(|error| Error::new(ErrorKind::Io, error)),
+        );
+
+        Ok(Response::new(try_from_status(status)?, headers, body))
+    }
+}
+
+fn to_headers(map: &reqwest::header::HeaderMap) -> Headers {
+    let map = map
+        .iter()
+        .filter_map(|(k, v)| {
+            let key = k.as_str();
+            if let Ok(value) = v.to_str() {
+                Some((
+                    HeaderName::from(key.to_owned()),
+                    HeaderValue::from(value.to_owned()),
+                ))
+            } else {
+                warn!("header value for `{key}` is not utf8");
+                None
+            }
+        })
+        .collect::<HashMap<_, _>>();
+    Headers::from(map)
+}
+
+fn try_from_method(method: Method) -> azure_core::Result<reqwest::Method> {
+    match method {
+        Method::Connect => Ok(reqwest::Method::CONNECT),
+        Method::Delete => Ok(reqwest::Method::DELETE),
+        Method::Get => Ok(reqwest::Method::GET),
+        Method::Head => Ok(reqwest::Method::HEAD),
+        Method::Options => Ok(reqwest::Method::OPTIONS),
+        Method::Patch => Ok(reqwest::Method::PATCH),
+        Method::Post => Ok(reqwest::Method::POST),
+        Method::Put => Ok(reqwest::Method::PUT),
+        Method::Trace => Ok(reqwest::Method::TRACE),
+        _ => reqwest::Method::from_str(method.as_ref()).map_kind(ErrorKind::DataConversion),
+    }
+}
+
+fn try_from_status(status: reqwest::StatusCode) -> azure_core::Result<StatusCode> {
+    let status = u16::from(status);
+    StatusCode::try_from(status).map_err(|_| {
+        Error::with_message(ErrorKind::DataConversion, || {
+            format!("invalid status code {status}")
+        })
+    })
+}
diff --git a/libs/remote_storage/src/lib.rs b/libs/remote_storage/src/lib.rs
index 5885c3e791..0354297479 100644
--- a/libs/remote_storage/src/lib.rs
+++ b/libs/remote_storage/src/lib.rs
@@ -10,6 +10,7 @@
 #![deny(clippy::undocumented_unsafe_blocks)]
 
 mod azure_blob;
+mod azure_reqwest_polyfill;
 mod config;
 mod error;
 mod local_fs;