From 6ebdee1f5ee8cf4282daf6568c840fb5e6191d36 Mon Sep 17 00:00:00 2001 From: Li Yazhou Date: Thu, 8 Aug 2024 19:40:54 +0800 Subject: [PATCH] fix test --- src/aws/v4.rs | 18 +++++++++++------- src/azure/storage/signer.rs | 10 +++++++--- src/google/signer.rs | 19 +++++++++++-------- src/huaweicloud/obs/signer.rs | 11 ++++++++--- src/lib.rs | 9 +++++---- tests/azure/storage.rs | 6 +++--- 6 files changed, 45 insertions(+), 28 deletions(-) diff --git a/src/aws/v4.rs b/src/aws/v4.rs index 059a777..888fb28 100644 --- a/src/aws/v4.rs +++ b/src/aws/v4.rs @@ -153,11 +153,13 @@ impl Signer { /// let loader = AwsDefaultLoader::new(client.clone(), config); /// let signer = AwsV4Signer::new("s3", "us-east-1"); /// // Construct request - /// let url = Url::parse("https://s3.amazonaws.com/testbucket")?; - /// let mut req = reqwest::Request::new(http::Method::GET, url); + /// let req = http::Request::get("https://s3.amazonaws.com/testbucket").body(reqwest::Body::default())?; + /// let (mut parts, body) = req.into_parts(); /// // Signing request with Signer /// let credential = loader.load().await?.unwrap(); - /// signer.sign(&mut req, &credential)?; + /// signer.sign(&mut parts, &credential)?; + /// let req = http::Request::from_parts(parts, body); + /// let req = reqwest::Request::try_from(req)?; /// // Sending already signed request. /// let resp = client.execute(req).await?; /// println!("resp got status: {}", resp.status()); @@ -191,11 +193,13 @@ impl Signer { /// let loader = AwsDefaultLoader::new(client.clone(), config); /// let signer = AwsV4Signer::new("s3", "us-east-1"); /// // Construct request - /// let url = Url::parse("https://s3.amazonaws.com/testbucket")?; - /// let mut req = reqwest::Request::new(http::Method::GET, url); + /// let mut req = http::Request::get("https://s3.amazonaws.com/testbucket").body(reqwest::Body::default())?; /// // Signing request with Signer /// let credential = loader.load().await?.unwrap(); - /// signer.sign_query(&mut req, Duration::from_secs(3600), &credential)?; + /// let (mut parts, body) = req.into_parts(); + /// signer.sign_query(&mut parts, Duration::from_secs(3600), &credential)?; + /// let req = http::Request::from_parts(parts, body); + /// let req = reqwest::Request::try_from(req)?; /// // Sending already signed request. /// let resp = client.execute(req).await?; /// println!("resp got status: {}", resp.status()); @@ -890,7 +894,7 @@ mod tests { aws_sig.apply_to_request_http1x(&mut req); let expected_req = req; - let mut req = req_fn(); + let req = req_fn(); let (mut parts, body) = req.into_parts(); let loader = AwsDefaultLoader::new( diff --git a/src/azure/storage/signer.rs b/src/azure/storage/signer.rs index 432cea0..e837b9e 100644 --- a/src/azure/storage/signer.rs +++ b/src/azure/storage/signer.rs @@ -130,11 +130,15 @@ impl Signer { /// let loader = AzureStorageLoader::new(config); /// let signer = AzureStorageSigner::new(); /// // Construct request - /// let url = Url::parse("https://test.blob.core.windows.net/testbucket/testblob")?; - /// let mut req = reqwest::Request::new(http::Method::GET, url); + /// let mut req = http::Request::get("https://test.blob.core.windows.net/testbucket/testblob").body(reqwest::Body::default())?; /// // Signing request with Signer /// let credential = loader.load().await?.unwrap(); - /// signer.sign(&mut req, &credential)?; + /// + /// let (mut parts, body) = req.into_parts(); + /// signer.sign(&mut parts, &credential)?; + /// let req = http::Request::from_parts(parts, body); + /// let req = reqwest::Request::try_from(req)?; + /// /// // Sending already signed request. /// let resp = Client::new().execute(req).await?; /// println!("resp got status: {}", resp.status()); diff --git a/src/google/signer.rs b/src/google/signer.rs index d849e77..22d413d 100644 --- a/src/google/signer.rs +++ b/src/google/signer.rs @@ -155,8 +155,7 @@ impl Signer { /// use reqsign::GoogleSigner; /// use reqsign::GoogleTokenLoader; /// use reqwest::Client; - /// use reqwest::Request; - /// use reqwest::Url; + /// use http::Request; /// /// #[tokio::main] /// async fn main() -> Result<()> { @@ -168,14 +167,16 @@ impl Signer { /// let signer = GoogleSigner::new("storage"); /// /// // Construct request - /// let url = Url::parse("https://storage.googleapis.com/storage/v1/b/test")?; - /// let mut req = reqwest::Request::new(http::Method::GET, url); + /// let mut req = http::Request::get("https://storage.googleapis.com/storage/v1/b/test") + /// .body(reqwest::Body::default())?; /// /// // Signing request with Signer /// let token = token_loader.load().await?.unwrap(); - /// signer.sign(&mut req, &token)?; + /// let (mut parts, body) = req.into_parts(); + /// signer.sign(&mut parts, &token)?; /// /// // Sending already signed request. + /// let req = reqwest::Request::try_from(http::Request::from_parts(parts, body))?; /// let resp = Client::new().execute(req).await?; /// println!("resp got status: {}", resp.status()); /// Ok(()) @@ -209,12 +210,14 @@ impl Signer { /// let signer = GoogleSigner::new("stroage"); /// /// // Construct request - /// let url = Url::parse("https://storage.googleapis.com/testbucket-reqsign/CONTRIBUTING.md")?; - /// let mut req = reqwest::Request::new(http::Method::GET, url); + /// let mut req = http::Request::get("https://storage.googleapis.com/testbucket-reqsign/CONTRIBUTING.md").body(reqwest::Body::default())?; /// /// // Signing request with Signer /// let credential = credential_loader.load()?.unwrap(); - /// signer.sign_query(&mut req, Duration::from_secs(3600), &credential)?; + /// let (mut parts, body) = req.into_parts(); + /// signer.sign_query(&mut parts, Duration::from_secs(3600), &credential)?; + /// let req = http::Request::from_parts(parts, body); + /// let req = reqwest::Request::try_from(req)?; /// /// println!("signed request: {:?}", req); /// // Sending already signed request. diff --git a/src/huaweicloud/obs/signer.rs b/src/huaweicloud/obs/signer.rs index 8a5055d..4cd7bee 100644 --- a/src/huaweicloud/obs/signer.rs +++ b/src/huaweicloud/obs/signer.rs @@ -115,11 +115,16 @@ impl Signer { /// let signer = HuaweicloudObsSigner::new("bucket"); /// /// // Construct request - /// let url = Url::parse("https://bucket.obs.cn-north-4.myhuaweicloud.com/object.txt")?; - /// let mut req = Request::new(http::Method::GET, url); + /// let mut req = http::Request::get("https://bucket.obs.cn-north-4.myhuaweicloud.com/object.txt") + /// .body(reqwest::Body::default())?; /// // Signing request with Signer /// let credential = loader.load().await?.unwrap(); - /// signer.sign(&mut req, &credential)?; + /// + /// let (mut parts, body) = req.into_parts(); + /// signer.sign(&mut parts, &credential)?; + /// let req = http::Request::from_parts(parts, body); + /// let req = reqwest::Request::try_from(req)?; + /// /// // Sending already signed request. /// let resp = Client::new().execute(req).await?; /// println!("resp got status: {}", resp.status()); diff --git a/src/lib.rs b/src/lib.rs index dda381e..f256cbd 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,6 @@ //! use reqsign::AwsDefaultLoader; //! use reqsign::AwsV4Signer; //! use reqwest::Client; -//! use reqwest::Request; //! use reqwest::Url; //! //! #[tokio::main] @@ -19,11 +18,13 @@ //! let loader = AwsDefaultLoader::new(client.clone(), config); //! let signer = AwsV4Signer::new("s3", "us-east-1"); //! // Construct request -//! let url = Url::parse("https://s3.amazonaws.com/testbucket")?; -//! let mut req = reqwest::Request::new(http::Method::GET, url); +//! let mut req = http::Request::get("https://s3.amazonaws.com/testbucket").body(reqwest::Body::default())?; //! // Signing request with Signer //! let credential = loader.load().await?.unwrap(); -//! signer.sign(&mut req, &credential)?; +//! let (mut parts, body) = req.into_parts(); +//! signer.sign(&mut parts, &credential)?; +//! let req = http::Request::from_parts(parts, body); +//! let req = reqwest::Request::try_from(req)?; //! // Sending already signed request. //! let resp = client.execute(req).await?; //! println!("resp got status: {}", resp.status()); diff --git a/tests/azure/storage.rs b/tests/azure/storage.rs index 6a9a591..a6ec5cd 100644 --- a/tests/azure/storage.rs +++ b/tests/azure/storage.rs @@ -58,7 +58,7 @@ async fn test_head_blob() -> Result<()> { builder = builder.method(http::Method::HEAD); builder = builder.header("x-ms-version", "2023-01-03"); builder = builder.uri(format!("{}/{}", url, "not_exist_file")); - let mut req = builder.body("")?; + let req = builder.body("")?; let cred = loader .load() @@ -160,7 +160,7 @@ async fn test_list_container_blobs() -> Result<()> { builder = builder.method(http::Method::GET); builder = builder.uri(format!("{url}?{query}")); builder = builder.header("x-ms-version", "2023-01-03"); - let mut req = builder.body("")?; + let req = builder.body("")?; let cred = loader .load() @@ -207,7 +207,7 @@ async fn test_can_head_blob_with_sas() -> Result<()> { builder = builder.method(http::Method::HEAD); builder = builder.header("x-ms-version", "2023-01-03"); builder = builder.uri(format!("{}/{}", url, "not_exist_file")); - let mut req = builder.body("")?; + let req = builder.body("")?; let cred = loader .load()