back out noop_client feature

cataggar · Jan 10, 2024 · a5e2c39 · a5e2c39
1 parent 6d49499
commit a5e2c39
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 deletions.
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
@@ -59,7 +59,6 @@ enable_reqwest_gzip = ["reqwest/gzip"]
 enable_reqwest_rustls = ["reqwest/rustls-tls"]
 hmac_rust = ["dep:sha2", "dep:hmac"]
 hmac_openssl = ["dep:openssl"]
-noop_client = []
 test_e2e = []
 azurite_workaround = []
 xml = ["quick-xml"]

diff --git a/sdk/core/src/http_client/mod.rs b/sdk/core/src/http_client/mod.rs
@@ -1,15 +1,9 @@
-#[cfg(any(
-    feature = "noop_client",
-    not(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls"))
-))]
+#[cfg(not(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls")))]
 mod noop;
 #[cfg(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls"))]
 mod reqwest;
 
-#[cfg(any(
-    feature = "noop_client",
-    not(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls"))
-))]
+#[cfg(not(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls")))]
 pub use self::noop::{new_noop_client, NoopClient};
 #[cfg(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls"))]
 use self::reqwest::new_reqwest_client;

diff --git a/sdk/core/src/lib.rs b/sdk/core/src/lib.rs
@@ -55,10 +55,7 @@ pub use error::{Error, Result};
 #[doc(inline)]
 pub use headers::Header;
 pub use http_client::{from_json, new_http_client, to_json, HttpClient};
-#[cfg(any(
-    feature = "noop_client",
-    not(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls"))
-))]
+#[cfg(not(any(feature = "enable_reqwest", feature = "enable_reqwest_rustls")))]
 pub use http_client::{new_noop_client, NoopClient};
 pub use models::*;
 pub use options::*;

diff --git a/sdk/identity/Cargo.toml b/sdk/identity/Cargo.toml
@@ -33,7 +33,6 @@ async-process = "2.0"
 tz-rs = { version = "0.6", optional = true }
 
 [dev-dependencies]
-azure_core = { path = "../core", version = "0.19", features = ["noop_client"] }
 reqwest = { version = "0.11", features = ["json"], default-features = false }
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 env_logger = "0.10"

diff --git a/sdk/identity/src/token_credentials/specific_azure_credential.rs b/sdk/identity/src/token_credentials/specific_azure_credential.rs
@@ -206,7 +206,7 @@ impl TokenCredential for SpecificAzureCredential {
 #[cfg(test)]
 pub fn test_options(env_vars: &[(&str, &str)]) -> TokenCredentialOptions {
     let env = crate::env::Env::from(env_vars);
-    let http_client = azure_core::new_noop_client();
+    let http_client = azure_core::new_http_client();
     TokenCredentialOptions::new(env, http_client)
 }