Skip to content

Commit 85a2e61

Browse files
committed
Remove parity features
Resolves Azure#2750 and replaces Azure#2811 by removing the `reqwest_rustls` feature which was there only to enable `reqwest/rustls-tls-native-roots-no-provider`. But using resolver v2 and newer, dependents can already do that by just taking a dependency on `reqwest` themselves to add that feature. In some cases, they may need to import `azure_core` with `default-features=false`, but passing a different `reqwest::Client` via our `TransportOptions` is easy. Not only will this scale better, but should help avoid opinionated feature selection that adversely impacts customers as with Azure#2750.
1 parent b1b367f commit 85a2e61

File tree

7 files changed

+17
-152
lines changed

7 files changed

+17
-152
lines changed

Cargo.lock

Lines changed: 2 additions & 121 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ quote = "1.0.37"
117117
rand = "0.9.1"
118118
rand_chacha = "0.9"
119119
reqwest = { version = "0.12.23", features = [
120-
"json",
121120
"stream",
122121
], default-features = false }
123122
rust_decimal.version = "1.37.2"

sdk/core/azure_core/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ hmac_rust = ["dep:sha2", "dep:hmac"]
6363
reqwest = ["typespec_client_core/reqwest"]
6464
reqwest_deflate = ["typespec_client_core/reqwest_deflate"]
6565
reqwest_gzip = ["typespec_client_core/reqwest_gzip"]
66-
reqwest_rustls = ["typespec_client_core/reqwest_rustls"]
6766
test = ["typespec_client_core/test"]
6867
tokio = ["dep:tokio", "typespec_client_core/tokio"]
6968
xml = ["typespec_client_core/xml"]
@@ -80,7 +79,6 @@ features = [
8079
"reqwest",
8180
"reqwest_deflate",
8281
"reqwest_gzip",
83-
"reqwest_rustls",
8482
"tokio",
8583
"xml",
8684
]

sdk/identity/azure_identity/Cargo.toml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,8 @@ tracing-subscriber.workspace = true
3939
[features]
4040
default = ["reqwest"]
4141
reqwest = ["azure_core/reqwest"]
42-
reqwest_rustls = ["azure_core/reqwest_rustls"]
4342
tokio = ["dep:tokio", "azure_core/tokio", "tokio/process"]
4443
client_certificate = ["openssl"]
4544

4645
[lints]
4746
workspace = true
48-
49-
[package.metadata.docs.rs]
50-
features = [
51-
"client_certificate",
52-
"reqwest",
53-
"reqwest_rustls",
54-
"tokio",
55-
]

sdk/typespec/typespec_client_core/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ json = ["typespec/json"]
6464
reqwest = ["reqwest/native-tls"]
6565
reqwest_deflate = ["reqwest/deflate"]
6666
reqwest_gzip = ["reqwest/gzip"]
67-
reqwest_rustls = [
68-
"reqwest/rustls-tls-native-roots-no-provider",
69-
] # Remove dependency on banned `ring` crate; requires manually configuring crypto provider.
7067
test = [] # Enables extra tracing including error bodies that may contain PII.
7168
tokio = ["tokio/sync", "tokio/time"]
7269
wasm_bindgen = ["dep:wasm-bindgen-futures", "gloo-timers/futures"]
@@ -89,7 +86,6 @@ features = [
8986
"reqwest",
9087
"reqwest_deflate",
9188
"reqwest_gzip",
92-
"reqwest_rustls",
9389
"tokio",
9490
"wasm_bindgen",
9591
"xml",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
//! Built-in HTTP clients.
55
6-
#[cfg(not(any(feature = "reqwest", feature = "reqwest_rustls")))]
6+
#[cfg(not(feature = "reqwest"))]
77
mod noop;
8-
#[cfg(any(feature = "reqwest", feature = "reqwest_rustls"))]
8+
#[cfg(feature = "reqwest")]
99
mod reqwest;
1010

11-
#[cfg(not(any(feature = "reqwest", feature = "reqwest_rustls")))]
11+
#[cfg(not(feature = "reqwest"))]
1212
use self::noop::new_noop_client;
13-
#[cfg(any(feature = "reqwest", feature = "reqwest_rustls"))]
13+
#[cfg(feature = "reqwest")]
1414
use self::reqwest::new_reqwest_client;
1515

1616
use crate::http::{RawResponse, Request};
@@ -20,11 +20,11 @@ use typespec::error::Result;
2020

2121
/// Create a new [`HttpClient`].
2222
pub fn new_http_client() -> Arc<dyn HttpClient> {
23-
#[cfg(any(feature = "reqwest", feature = "reqwest_rustls"))]
23+
#[cfg(feature = "reqwest")]
2424
{
2525
new_reqwest_client()
2626
}
27-
#[cfg(not(any(feature = "reqwest", feature = "reqwest_rustls")))]
27+
#[cfg(not(feature = "reqwest"))]
2828
{
2929
new_noop_client()
3030
}

sdk/typespec/typespec_macros/tests/data/safe-debug-tests/Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)