Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
@flaneur2020
flaneur2020 committed Aug 8, 2024
1 parent b3a6d50 commit 6ebdee1
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 28 deletions.
18 changes: 11 additions & 7 deletions src/aws/v4.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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(
Expand Down
10 changes: 7 additions & 3 deletions src/azure/storage/signer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
19 changes: 11 additions & 8 deletions src/google/signer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<()> {
Expand All @@ -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(())
Expand Down Expand Up @@ -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.
Expand Down
11 changes: 8 additions & 3 deletions src/huaweicloud/obs/signer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
9 changes: 5 additions & 4 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
//! use reqsign::AwsDefaultLoader;
//! use reqsign::AwsV4Signer;
//! use reqwest::Client;
//! use reqwest::Request;
//! use reqwest::Url;
//!
//! #[tokio::main]
Expand All @@ -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());
Expand Down
6 changes: 3 additions & 3 deletions tests/azure/storage.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 6ebdee1

Please sign in to comment.