refactor: Depends reqsign-core internally

Signed-off-by: Xuanwo <[email protected]>

Cargo.toml

@@ -31,7 +31,7 @@ percent-encoding = "2"
 pretty_assertions = "1.3"
 quick-xml = { version = "0.36", features = ["serialize"] }
 rand = "0.8.5"
-reqsign = { version = "0.16", path = "./crates/reqsign" }
+reqsign-core = { version = "0.16", path = "crates/reqsign-core" }
 reqwest = { version = "0.12", default-features = false }
 rsa = { version = "0.9.2", features = ["pkcs5", "sha2"] }
 rust-ini = { version = "0.21" }

crates/reqsign-aliyun-oss/Cargo.toml

@@ -16,7 +16,7 @@ http.workspace = true
 log.workspace = true
 once_cell.workspace = true
 percent-encoding.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 reqwest = { workspace = true, features = ["blocking", "json"] }
 serde.workspace = true
 serde_json.workspace = true

crates/reqsign-aliyun-oss/src/credential.rs

@@ -9,10 +9,10 @@ use reqwest::Client;
 use serde::Deserialize;
 
 use super::config::Config;
-use reqsign::time::format_rfc3339;
-use reqsign::time::now;
-use reqsign::time::parse_rfc3339;
-use reqsign::time::DateTime;
+use reqsign_core::time::format_rfc3339;
+use reqsign_core::time::now;
+use reqsign_core::time::parse_rfc3339;
+use reqsign_core::time::DateTime;
 
 /// Credential that holds the access_key and secret_key.
 #[derive(Default, Clone)]

crates/reqsign-aliyun-oss/src/signer.rs

@@ -14,12 +14,12 @@ use once_cell::sync::Lazy;
 use percent_encoding::utf8_percent_encode;
 
 use super::credential::Credential;
-use reqsign::hash::base64_hmac_sha1;
-use reqsign::time;
-use reqsign::time::format_http_date;
-use reqsign::time::DateTime;
-use reqsign::SigningMethod;
-use reqsign::SigningRequest;
+use reqsign_core::hash::base64_hmac_sha1;
+use reqsign_core::time;
+use reqsign_core::time::format_http_date;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningMethod;
+use reqsign_core::SigningRequest;
 
 const CONTENT_MD5: &str = "content-md5";
 

crates/reqsign-aws-v4/Cargo.toml

@@ -22,7 +22,7 @@ http.workspace = true
 log.workspace = true
 percent-encoding.workspace = true
 quick-xml.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 reqwest.workspace = true
 rust-ini.workspace = true
 serde.workspace = true

crates/reqsign-aws-v4/src/config.rs

@@ -7,7 +7,7 @@ use anyhow::Result;
 use ini::Ini;
 #[cfg(not(target_arch = "wasm32"))]
 use log::debug;
-use reqsign::Context;
+use reqsign_core::Context;
 
 /// Config for aws services.
 #[derive(Clone)]
@@ -285,7 +285,7 @@ impl Config {
 mod tests {
     use super::*;
     use pretty_assertions::assert_eq;
-    use reqsign::StaticEnv;
+    use reqsign_core::StaticEnv;
     use reqsign_file_read_tokio::TokioFileRead;
     use reqsign_http_send_reqwest::ReqwestHttpSend;
     use std::collections::HashMap;

crates/reqsign-aws-v4/src/credential.rs

@@ -16,9 +16,9 @@ use serde::Deserialize;
 use super::config::Config;
 use super::constants::X_AMZ_CONTENT_SHA_256;
 use crate::Signer;
-use reqsign::time::now;
-use reqsign::time::parse_rfc3339;
-use reqsign::time::DateTime;
+use reqsign_core::time::now;
+use reqsign_core::time::parse_rfc3339;
+use reqsign_core::time::DateTime;
 
 pub const EMPTY_STRING_SHA256: &str =
     "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
@@ -587,7 +587,7 @@ mod tests {
     use http::StatusCode;
     use once_cell::sync::Lazy;
     use quick_xml::de;
-    use reqsign::{Context, StaticEnv};
+    use reqsign_core::{Context, StaticEnv};
     use reqsign_file_read_tokio::TokioFileRead;
     use reqsign_http_send_reqwest::ReqwestHttpSend;
     use reqwest::Client;

crates/reqsign-aws-v4/src/signer.rs

@@ -16,15 +16,15 @@ use super::constants::X_AMZ_CONTENT_SHA_256;
 use super::constants::X_AMZ_DATE;
 use super::constants::X_AMZ_SECURITY_TOKEN;
 use super::credential::Credential;
-use reqsign::hash::hex_hmac_sha256;
-use reqsign::hash::hex_sha256;
-use reqsign::hash::hmac_sha256;
-use reqsign::time::format_date;
-use reqsign::time::format_iso8601;
-use reqsign::time::now;
-use reqsign::time::DateTime;
-use reqsign::SigningMethod;
-use reqsign::SigningRequest;
+use reqsign_core::hash::hex_hmac_sha256;
+use reqsign_core::hash::hex_sha256;
+use reqsign_core::hash::hmac_sha256;
+use reqsign_core::time::format_date;
+use reqsign_core::time::format_iso8601;
+use reqsign_core::time::now;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningMethod;
+use reqsign_core::SigningRequest;
 
 /// Signer that implement AWS SigV4.
 ///

crates/reqsign-aws-v4/tests/main.rs

@@ -9,10 +9,10 @@ use log::debug;
 use log::warn;
 use percent_encoding::utf8_percent_encode;
 use percent_encoding::NON_ALPHANUMERIC;
-use reqsign::Context;
 use reqsign_aws_v4::Config;
 use reqsign_aws_v4::DefaultLoader;
 use reqsign_aws_v4::Signer;
+use reqsign_core::Context;
 use reqsign_file_read_tokio::TokioFileRead;
 use reqsign_http_send_reqwest::ReqwestHttpSend;
 use reqwest::Client;

crates/reqsign-azure-storage/Cargo.toml

@@ -16,7 +16,7 @@ form_urlencoded.workspace = true
 http.workspace = true
 log.workspace = true
 percent-encoding.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true

crates/reqsign-azure-storage/src/account_sas.rs

@@ -1,8 +1,8 @@
 use anyhow::Result;
 
-use reqsign::hash;
-use reqsign::time;
-use reqsign::time::DateTime;
+use reqsign_core::hash;
+use reqsign_core::time;
+use reqsign_core::time::DateTime;
 
 /// The default parameters that make up a SAS token
 /// https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas#specify-the-account-sas-parameters

crates/reqsign-azure-storage/src/credential.rs

@@ -1,4 +1,4 @@
-use reqsign::time::DateTime;
+use reqsign_core::time::DateTime;
 
 /// Credential that holds the access_key and secret_key.
 #[derive(Clone)]

crates/reqsign-azure-storage/src/loader.rs

@@ -3,7 +3,7 @@ use std::sync::Mutex;
 
 use anyhow::Result;
 
-use reqsign::time::{now, parse_rfc3339};
+use reqsign_core::time::{now, parse_rfc3339};
 
 use super::credential::Credential;
 use super::imds_credential;

crates/reqsign-azure-storage/src/signer.rs

@@ -13,13 +13,13 @@ use percent_encoding::percent_encode;
 use super::credential::Credential;
 use crate::account_sas;
 use crate::constants::*;
-use reqsign::hash::base64_decode;
-use reqsign::hash::base64_hmac_sha256;
-use reqsign::time;
-use reqsign::time::format_http_date;
-use reqsign::time::DateTime;
-use reqsign::SigningMethod;
-use reqsign::SigningRequest;
+use reqsign_core::hash::base64_decode;
+use reqsign_core::hash::base64_hmac_sha256;
+use reqsign_core::time;
+use reqsign_core::time::format_http_date;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningMethod;
+use reqsign_core::SigningRequest;
 
 /// Signer that implement Azure Storage Shared Key Authorization.
 ///
@@ -274,7 +274,7 @@ mod tests {
     use crate::Credential;
     use crate::Loader;
     use crate::Signer;
-    use reqsign::time::now;
+    use reqsign_core::time::now;
 
     #[tokio::test]
     async fn test_sas_url() {

crates/reqsign/Cargo.toml → crates/reqsign-core/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "reqsign"
+name = "reqsign-core"
 version = "0.16.0"
 
 categories.workspace = true

crates/reqsign-file-read-tokio/Cargo.toml

@@ -11,5 +11,5 @@ version = "0.1.0"
 [dependencies]
 anyhow = "1"
 async-trait = "0.1"
-reqsign = { version = "0.16", path = "../reqsign" }
+reqsign-core.workspace = true
 tokio = { version = "1", features = ["fs"] }

crates/reqsign-file-read-tokio/src/lib.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use async_trait::async_trait;
-use reqsign::FileRead;
+use reqsign_core::FileRead;
 
 #[derive(Debug, Clone, Copy, Default)]
 pub struct TokioFileRead;

crates/reqsign-google/Cargo.toml

@@ -18,7 +18,7 @@ jsonwebtoken = "9.2"
 log.workspace = true
 percent-encoding.workspace = true
 rand.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 reqwest.workspace = true
 rsa.workspace = true
 serde.workspace = true

crates/reqsign-google/src/credential.rs

@@ -15,7 +15,7 @@ pub use self::external_account::ExternalAccount;
 use self::impersonated_service_account::ImpersonatedServiceAccount;
 pub use self::service_account::ServiceAccount;
 use super::constants::GOOGLE_APPLICATION_CREDENTIALS;
-use reqsign::hash::base64_decode;
+use reqsign_core::hash::base64_decode;
 
 #[derive(Clone, serde::Deserialize)]
 #[cfg_attr(test, derive(Debug))]

crates/reqsign-google/src/signer.rs

@@ -14,13 +14,13 @@ use super::constants::GOOG_QUERY_ENCODE_SET;
 use super::credential::Credential;
 use super::credential::ServiceAccount;
 use super::token::Token;
-use reqsign::hash::hex_sha256;
-use reqsign::time;
-use reqsign::time::format_date;
-use reqsign::time::format_iso8601;
-use reqsign::time::DateTime;
-use reqsign::SigningMethod;
-use reqsign::SigningRequest;
+use reqsign_core::hash::hex_sha256;
+use reqsign_core::time;
+use reqsign_core::time::format_date;
+use reqsign_core::time::format_iso8601;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningMethod;
+use reqsign_core::SigningRequest;
 
 /// Signer that implement Google OAuth2 Authentication.
 ///

crates/reqsign-google/src/token.rs

@@ -14,8 +14,8 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use super::credential::Credential;
-use reqsign::time::now;
-use reqsign::time::DateTime;
+use reqsign_core::time::now;
+use reqsign_core::time::DateTime;
 
 /// Token is the authentication methods used by google services.
 ///

crates/reqsign-http-send-reqwest/Cargo.toml

@@ -14,5 +14,5 @@ async-trait = "0.1"
 bytes.workspace = true
 http-body-util = "0.1.2"
 http.workspace = true
-reqsign = { version = "0.16.0", path = "../reqsign" }
+reqsign-core.workspace = true
 reqwest = { version = "0.12", default-features = false }

crates/reqsign-http-send-reqwest/src/lib.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use bytes::Bytes;
 use http_body_util::BodyExt;
-use reqsign::HttpSend;
+use reqsign_core::HttpSend;
 use reqwest::{Client, Request};
 
 #[derive(Debug, Default)]

crates/reqsign-huaweicloud-obs/Cargo.toml

@@ -16,7 +16,7 @@ http.workspace = true
 log.workspace = true
 once_cell.workspace = true
 percent-encoding.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true

crates/reqsign-huaweicloud-obs/src/signer.rs

@@ -15,12 +15,12 @@ use percent_encoding::utf8_percent_encode;
 
 use super::constants::*;
 use super::credential::Credential;
-use reqsign::hash::base64_hmac_sha1;
-use reqsign::time::format_http_date;
-use reqsign::time::now;
-use reqsign::time::DateTime;
-use reqsign::SigningMethod;
-use reqsign::SigningRequest;
+use reqsign_core::hash::base64_hmac_sha1;
+use reqsign_core::time::format_http_date;
+use reqsign_core::time::now;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningMethod;
+use reqsign_core::SigningRequest;
 
 /// Signer that implement Huawei Cloud Object Storage Service Authorization.
 ///

crates/reqsign-oracle/Cargo.toml

@@ -15,7 +15,7 @@ base64.workspace = true
 chrono.workspace = true
 http.workspace = true
 log.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 rsa.workspace = true
 serde.workspace = true
 toml.workspace = true

crates/reqsign-oracle/src/credential.rs

@@ -6,8 +6,8 @@ use log::debug;
 
 use super::config::Config;
 use super::constants::ORACLE_CONFIG_PATH;
-use reqsign::time::now;
-use reqsign::time::DateTime;
+use reqsign_core::time::now;
+use reqsign_core::time::DateTime;
 
 /// Credential that holds the API private key.
 /// private_key_path is optional, because some other credential will be added later

crates/reqsign-oracle/src/signer.rs

@@ -14,9 +14,9 @@ use rsa::{pkcs8::DecodePrivateKey, RsaPrivateKey};
 use std::fmt::Write;
 
 use super::credential::Credential;
-use reqsign::time;
-use reqsign::time::DateTime;
-use reqsign::SigningRequest;
+use reqsign_core::time;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningRequest;
 
 /// Signer for Oracle Cloud Infrastructure using API Key.
 #[derive(Default)]

crates/reqsign-tencent-cos/Cargo.toml

@@ -16,7 +16,7 @@ chrono.workspace = true
 http.workspace = true
 log.workspace = true
 percent-encoding.workspace = true
-reqsign.workspace = true
+reqsign-core.workspace = true
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true

crates/reqsign-tencent-cos/src/credential.rs

@@ -13,9 +13,9 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use super::config::Config;
-use reqsign::time::now;
-use reqsign::time::parse_rfc3339;
-use reqsign::time::DateTime;
+use reqsign_core::time::now;
+use reqsign_core::time::parse_rfc3339;
+use reqsign_core::time::DateTime;
 
 /// Credential for cos.
 #[derive(Clone)]

crates/reqsign-tencent-cos/src/signer.rs

@@ -12,13 +12,13 @@ use percent_encoding::utf8_percent_encode;
 
 use super::constants::*;
 use super::credential::Credential;
-use reqsign::hash::hex_hmac_sha1;
-use reqsign::hash::hex_sha1;
-use reqsign::time;
-use reqsign::time::format_http_date;
-use reqsign::time::DateTime;
-use reqsign::SigningMethod;
-use reqsign::SigningRequest;
+use reqsign_core::hash::hex_hmac_sha1;
+use reqsign_core::hash::hex_sha1;
+use reqsign_core::time;
+use reqsign_core::time::format_http_date;
+use reqsign_core::time::DateTime;
+use reqsign_core::SigningMethod;
+use reqsign_core::SigningRequest;
 
 /// Signer for Tencent COS.
 #[derive(Default)]