Add feature to use reqwest with rustls/webpki_roots

sdk/core/azure_core/Cargo.toml

@@ -61,7 +61,9 @@ hmac_rust = ["dep:sha2", "dep:hmac"]
 reqwest = ["typespec_client_core/reqwest"]
 reqwest_deflate = ["typespec_client_core/reqwest_deflate"]
 reqwest_gzip = ["typespec_client_core/reqwest_gzip"]
-reqwest_rustls = ["typespec_client_core/reqwest_rustls"]
+reqwest_rustls = ["reqwest_rustls_native_roots"]
+reqwest_rustls_native_roots = ["typespec_client_core/reqwest_rustls_native_roots"]
+reqwest_rustls_webpki_roots = ["typespec_client_core/reqwest_rustls_webpki_roots"]
 test = ["typespec_client_core/test"]
 tokio = ["dep:tokio", "typespec_client_core/tokio"]
 xml = ["typespec_client_core/xml"]

sdk/core/azure_core/README.md

@@ -50,7 +50,8 @@ We guarantee that all client instance methods are thread-safe and independent of
 - `reqwest` (default): enables and sets `reqwest` as the default `HttpClient`. Enables `reqwest`'s `native-tls` feature.
 - `reqwest_deflate` (default): enables deflate compression for `reqwest`.
 - `reqwest_gzip` (default): enables gzip compression for `reqwest`.
-- `reqwest_rustls`: enables `reqwest`'s `rustls-tls-native-roots-no-provider` feature,
+- `reqwest_rustls_native_roots`: enables `reqwest`'s `rustls-tls-native-roots-no-provider` feature,
+- `reqwest_rustls_webpki_roots`: enables `reqwest`'s `rustls-tls-webpki-roots-no-provider` feature,
 - `tokio`: enables and sets `tokio` as the default async runtime.
 - `xml`: enables XML support.
 

sdk/identity/azure_identity/Cargo.toml

@@ -39,7 +39,8 @@ tracing-subscriber.workspace = true
 [features]
 default = ["reqwest"]
 reqwest = ["azure_core/reqwest"]
-reqwest_rustls = ["azure_core/reqwest_rustls"]
+reqwest_rustls_ = ["reqwest_rustls_native_roots"]
+reqwest_rustls_native_roots = ["azure_core/reqwest_rustls_native_roots"]
 tokio = ["dep:tokio", "azure_core/tokio", "tokio/process"]
 client_certificate = ["openssl"]
 

sdk/typespec/typespec_client_core/Cargo.toml

@@ -53,9 +53,11 @@ json = ["typespec/json"]
 reqwest = ["reqwest/native-tls"]
 reqwest_deflate = ["reqwest/deflate"]
 reqwest_gzip = ["reqwest/gzip"]
-reqwest_rustls = [
+reqwest_rustls = ["reqwest_rustls_native_roots"]
+reqwest_rustls_native_roots = [
   "reqwest/rustls-tls-native-roots-no-provider",
 ] # Remove dependency on banned `ring` crate; requires manually configuring crypto provider.
+reqwest_rustls_webpki_roots = ["reqwest/rustls-tls-webpki-roots-no-provider"]
 test = [] # Enables extra tracing including error bodies that may contain PII.
 tokio = ["tokio/fs", "tokio/sync", "tokio/time", "tokio/io-util"]
 xml = ["dep:quick-xml"]

sdk/typespec/typespec_client_core/README.md

@@ -11,7 +11,8 @@ This is the runtime for [TypeSpec](https://typespec.io)-generated clients.
 * `reqwest` (default): enables and sets `reqwest` as the default `HttpClient`. Enables `reqwest`'s `native-tls` feature.
 * `reqwest_deflate` (default): enables deflate compression for `reqwest`.
 * `reqwest_gzip` (default): enables gzip compression for `reqwest`.
-* `reqwest_rustls`: enables `reqwest`'s `rustls-tls-native-roots-no-provider` feature,
+* `reqwest_rustls_native_roots`: enables `reqwest`'s `rustls-tls-native-roots-no-provider` feature,
+* `reqwest_rustls_webpki_roots`: enables `reqwest`'s `rustls-tls-webpki-roots-no-provider` feature,
   which requires manually configuring a cryptography provider since `ring` is a banned dependency.
 * `tokio`: enables and sets `tokio` as the default async runtime.
 * `xml`: enables XML support.

sdk/typespec/typespec_client_core/src/http/clients/mod.rs

@@ -3,14 +3,30 @@
 
 //! Built-in HTTP clients.
 
-#[cfg(not(any(feature = "reqwest", feature = "reqwest_rustls")))]
+#[cfg(not(any(
+    feature = "reqwest",
+    feature = "reqwest_rustls_native_roots",
+    feature = "reqwest_rustls_webpki_roots"
+)))]
 mod noop;
-#[cfg(any(feature = "reqwest", feature = "reqwest_rustls"))]
+#[cfg(any(
+    feature = "reqwest",
+    feature = "reqwest_rustls_native_roots",
+    feature = "reqwest_rustls_webpki_roots"
+))]
 mod reqwest;
 
-#[cfg(not(any(feature = "reqwest", feature = "reqwest_rustls")))]
+#[cfg(not(any(
+    feature = "reqwest",
+    feature = "reqwest_rustls_native_roots",
+    feature = "reqwest_rustls_webpki_roots"
+)))]
 use self::noop::new_noop_client;
-#[cfg(any(feature = "reqwest", feature = "reqwest_rustls"))]
+#[cfg(any(
+    feature = "reqwest",
+    feature = "reqwest_rustls_native_roots",
+    feature = "reqwest_rustls_webpki_roots"
+))]
 use self::reqwest::new_reqwest_client;
 
 use crate::http::{RawResponse, Request};
@@ -20,11 +36,19 @@ use typespec::error::Result;
 
 /// Create a new [`HttpClient`].
 pub fn new_http_client() -> Arc<dyn HttpClient> {
-    #[cfg(any(feature = "reqwest", feature = "reqwest_rustls"))]
+    #[cfg(any(
+        feature = "reqwest",
+        feature = "reqwest_rustls_native_roots",
+        feature = "reqwest_rustls_webpki_roots"
+    ))]
     {
         new_reqwest_client()
     }
-    #[cfg(not(any(feature = "reqwest", feature = "reqwest_rustls")))]
+    #[cfg(not(any(
+        feature = "reqwest",
+        feature = "reqwest_rustls_native_roots",
+        feature = "reqwest_rustls_webpki_roots"
+    )))]
     {
         new_noop_client()
     }