add new_http_client & fix cosmos_client

.github/workflows/build.yml

@@ -34,8 +34,8 @@ jobs:
     - name: check core for wasm
       run: cargo check -p azure_core --target=wasm32-unknown-unknown
 
-    - name: check core for hyper
-      run: cargo check -p azure_core --no-default-features --features enable_hyper
+    # - name: check core for hyper
+    #   run: cargo check -p azure_core --no-default-features --features enable_hyper
 
     - name: sdk tests
       run: cargo test --all

.gitignore

@@ -11,3 +11,4 @@ sample/
 *.swp
 *.swo
 *.vim
+__azurite*.json

sdk/core/src/http_client.rs

@@ -10,6 +10,17 @@ use http::{Request, Response, StatusCode};
 #[allow(unused_imports)]
 use hyper_rustls::HttpsConnector;
 use serde::Serialize;
+use std::sync::Arc;
+
+#[cfg(feature = "enable_reqwest")]
+pub fn new_http_client() -> Arc<dyn HttpClient> {
+    Arc::new(reqwest::Client::new())
+}
+
+#[cfg(feature = "enable_hyper")]
+pub fn new_http_client() -> Arc<dyn HttpClient> {
+    Arc::new(hyper::Client::builder().build(hyper_rustls::HttpsConnector::with_native_roots()))
+}
 
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]

sdk/core/src/lib.rs

@@ -37,7 +37,7 @@ pub use bytes_stream::*;
 pub use context::Context;
 pub use errors::*;
 pub use headers::AddAsHeader;
-pub use http_client::{to_json, HttpClient};
+pub use http_client::{new_http_client, to_json, HttpClient};
 pub use models::*;
 pub use request::*;
 pub use response::*;

sdk/core/src/prelude.rs

@@ -1,3 +1,5 @@
 pub use crate::etag::Etag;
 pub use crate::request_options::*;
-pub use crate::{AddAsHeader, AppendToUrlQuery, HttpClient, RequestId, SessionToken, EMPTY_BODY};
+pub use crate::{
+    new_http_client, AddAsHeader, AppendToUrlQuery, HttpClient, RequestId, SessionToken, EMPTY_BODY,
+};

sdk/cosmos/examples/attachments_00.rs

@@ -1,9 +1,7 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::error::Error;
-use std::sync::Arc;
 
 // Now we create a sample struct. The Cow trick
 // allows us to use the same struct for serializing
@@ -44,7 +42,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account, authorization_token);
     let client = client.into_database_client(database_name);
     let client = client.into_collection_client(collection_name);

sdk/cosmos/examples/collection.rs

@@ -1,7 +1,5 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -25,7 +23,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     // authorization token at later time if you need, for example, to escalate the privileges for a
     // single operation.
     // Here we are using reqwest but other clients are supported (check the documentation).
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     // The Cosmos' client exposes a lot of methods. This one lists the databases in the specified

sdk/cosmos/examples/create_delete_database.rs

@@ -1,4 +1,3 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use collection::*;
 use futures::stream::StreamExt;
@@ -30,7 +29,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     // Once we have an authorization token you can create a client instance. You can change the
     // authorization token at later time if you need, for example, to escalate the privileges for a
     // single operation.
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(
         http_client.clone(),
         account.clone(),
@@ -45,6 +44,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     println!("list_databases_response = {:#?}", list_databases_response);
 
     let cosmos_client = CosmosClient::with_pipeline(
+        http_client,
         account,
         authorization_token,
         CosmosOptions::with_client(Arc::new(reqwest::Client::new())),

sdk/cosmos/examples/database_00.rs

@@ -1,8 +1,6 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use serde_json::Value;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -14,7 +12,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = permission::AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account, authorization_token);
 
     let dbs = client.list_databases().execute().await?;

sdk/cosmos/examples/database_01.rs

@@ -1,7 +1,5 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -13,7 +11,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account, authorization_token);
 
     let database_client = client.into_database_client("pollo");

sdk/cosmos/examples/document_00.rs

@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 // Using the prelude module of the Cosmos crate makes easier to use the Rust Azure SDK for Cosmos
 // DB.
 use azure_core::prelude::*;
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use azure_cosmos::resources::collection::*;
 use azure_cosmos::responses::GetDocumentResponse;
@@ -50,7 +49,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     // Next we will create a Cosmos client. You need an authorization_token but you can later
     // change it if needed.
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = new_http_client();
     let client = CosmosClient::new(
         http_client.clone(),
         account.clone(),
@@ -70,6 +69,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         .find(|db| db.id == DATABASE);
 
     let database_client = CosmosClient::with_pipeline(
+        http_client,
         account,
         authorization_token,
         CosmosOptions::with_client(Arc::new(reqwest::Client::new())),

sdk/cosmos/examples/document_entries_00.rs

@@ -5,7 +5,6 @@ use futures::stream::StreamExt;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::error::Error;
-use std::sync::Arc;
 
 // Now we create a sample struct. The Cow trick
 // allows us to use the same struct for serializing
@@ -46,7 +45,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = permission::AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = new_http_client();
     let client = CosmosClient::new(http_client, account, authorization_token);
     let client = client.into_database_client(database_name);
     let client = client.into_collection_client(collection_name);

sdk/cosmos/examples/document_entries_01.rs

@@ -1,9 +1,7 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::error::Error;
-use std::sync::Arc;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 struct MySampleStruct<'a> {
@@ -38,7 +36,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account, authorization_token);
     let client = client.into_database_client(database_name);
     let client = client.into_collection_client(collection_name);

sdk/cosmos/examples/get_database.rs

@@ -1,7 +1,5 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -17,7 +15,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let database_client = client.into_database_client(database_name.clone());

sdk/cosmos/examples/key_ranges_00.rs

@@ -1,7 +1,5 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -18,7 +16,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let client = client.into_database_client(database);

sdk/cosmos/examples/permission_00.rs

@@ -1,7 +1,5 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -26,7 +24,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let database_client = client.into_database_client(database_name);

sdk/cosmos/examples/query_document_00.rs

@@ -1,9 +1,7 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use azure_cosmos::responses::QueryDocumentsResponse;
 use serde::{Deserialize, Serialize};
 use std::error::Error;
-use std::sync::Arc;
 
 #[derive(Serialize, Deserialize, Debug)]
 struct MySampleStructOwned {
@@ -39,7 +37,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let client = client.into_database_client(database_name);

sdk/cosmos/examples/readme.rs

@@ -1,11 +1,9 @@
 use serde::{Deserialize, Serialize};
 // Using the prelude module of the Cosmos crate makes easier to use the Rust Azure SDK for Cosmos.
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use futures::stream::StreamExt;
 use std::borrow::Cow;
 use std::error::Error;
-use std::sync::Arc;
 
 // This is the stuct we want to use in our sample.
 // Make sure to have a collection with partition key "a_number" for this example to
@@ -55,7 +53,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
     // Next we will create a Cosmos client.
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     // We know the database so we can obtain a database client.

sdk/cosmos/examples/remove_all_documents.rs

@@ -1,9 +1,7 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use futures::stream::StreamExt;
 use serde_json::Value;
 use std::error::Error;
-use std::sync::Arc;
 
 // This example expects you to have created a collection
 // with partitionKey on "id".
@@ -26,7 +24,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
     // Next we will create a Cosmos client.
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let client = client.into_database_client(database_name);

sdk/cosmos/examples/stored_proc_00.rs

@@ -1,4 +1,3 @@
-use azure_core::HttpClient;
 /// This sample showcases execution of stored procedure
 /// Create stored procedure called test_proc, like so:
 /// function f(personToGreet) {
@@ -8,7 +7,6 @@ use azure_core::HttpClient;
 /// }
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -25,7 +23,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let ret = client

sdk/cosmos/examples/stored_proc_01.rs

@@ -1,4 +1,3 @@
-use azure_core::HttpClient;
 /// This sample showcases execution of stored procedure
 /// Create stored procedure called test_proc, like so:
 /// function f(personToGreet) {
@@ -8,7 +7,6 @@ use azure_core::HttpClient;
 /// }
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -36,7 +34,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let database_client = client.into_database_client(database_name);

sdk/cosmos/examples/trigger_00.rs

@@ -1,9 +1,7 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use azure_cosmos::resources::trigger::{TriggerOperation, TriggerType};
 use futures::stream::StreamExt;
 use std::error::Error;
-use std::sync::Arc;
 
 const TRIGGER_BODY: &str = r#"
 function updateMetadata() {
@@ -53,7 +51,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let database_client = client.into_database_client(database);

sdk/cosmos/examples/user_00.rs

@@ -1,7 +1,5 @@
-use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
 use std::error::Error;
-use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -20,7 +18,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let http_client = azure_core::new_http_client();
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let database_client = client.into_database_client(database_name);