diff --git a/Cargo.toml b/Cargo.toml index d9f22c6..9464f15 100644 --- a/Cargo.toml +++ b/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" } diff --git a/crates/reqsign-aliyun-oss/Cargo.toml b/crates/reqsign-aliyun-oss/Cargo.toml index 4885a5a..981df09 100644 --- a/crates/reqsign-aliyun-oss/Cargo.toml +++ b/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 diff --git a/crates/reqsign-aliyun-oss/src/credential.rs b/crates/reqsign-aliyun-oss/src/credential.rs index 5fb182c..faadf18 100644 --- a/crates/reqsign-aliyun-oss/src/credential.rs +++ b/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)] diff --git a/crates/reqsign-aliyun-oss/src/signer.rs b/crates/reqsign-aliyun-oss/src/signer.rs index a26cdfe..dcd5146 100644 --- a/crates/reqsign-aliyun-oss/src/signer.rs +++ b/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"; diff --git a/crates/reqsign-aws-v4/Cargo.toml b/crates/reqsign-aws-v4/Cargo.toml index 97cccd8..e062e06 100644 --- a/crates/reqsign-aws-v4/Cargo.toml +++ b/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 diff --git a/crates/reqsign-aws-v4/src/config.rs b/crates/reqsign-aws-v4/src/config.rs index 20097bd..b9cbd77 100644 --- a/crates/reqsign-aws-v4/src/config.rs +++ b/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; diff --git a/crates/reqsign-aws-v4/src/credential.rs b/crates/reqsign-aws-v4/src/credential.rs index f3a5a83..7c6700d 100644 --- a/crates/reqsign-aws-v4/src/credential.rs +++ b/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; diff --git a/crates/reqsign-aws-v4/src/signer.rs b/crates/reqsign-aws-v4/src/signer.rs index 25f81a0..bf500e0 100644 --- a/crates/reqsign-aws-v4/src/signer.rs +++ b/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. /// diff --git a/crates/reqsign-aws-v4/tests/main.rs b/crates/reqsign-aws-v4/tests/main.rs index c04493e..b9f872c 100644 --- a/crates/reqsign-aws-v4/tests/main.rs +++ b/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; diff --git a/crates/reqsign-azure-storage/Cargo.toml b/crates/reqsign-azure-storage/Cargo.toml index 617517d..2ebf98b 100644 --- a/crates/reqsign-azure-storage/Cargo.toml +++ b/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 diff --git a/crates/reqsign-azure-storage/src/account_sas.rs b/crates/reqsign-azure-storage/src/account_sas.rs index 8ce1559..e6f36f6 100644 --- a/crates/reqsign-azure-storage/src/account_sas.rs +++ b/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 diff --git a/crates/reqsign-azure-storage/src/credential.rs b/crates/reqsign-azure-storage/src/credential.rs index 1550007..ab1ffb3 100644 --- a/crates/reqsign-azure-storage/src/credential.rs +++ b/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)] diff --git a/crates/reqsign-azure-storage/src/loader.rs b/crates/reqsign-azure-storage/src/loader.rs index 9d2f791..aaaaf7c 100644 --- a/crates/reqsign-azure-storage/src/loader.rs +++ b/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; diff --git a/crates/reqsign-azure-storage/src/signer.rs b/crates/reqsign-azure-storage/src/signer.rs index 1075bf8..969bf4e 100644 --- a/crates/reqsign-azure-storage/src/signer.rs +++ b/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() { diff --git a/crates/reqsign/Cargo.toml b/crates/reqsign-core/Cargo.toml similarity index 96% rename from crates/reqsign/Cargo.toml rename to crates/reqsign-core/Cargo.toml index 7a1381b..b7eb584 100644 --- a/crates/reqsign/Cargo.toml +++ b/crates/reqsign-core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "reqsign" +name = "reqsign-core" version = "0.16.0" categories.workspace = true diff --git a/crates/reqsign/src/context.rs b/crates/reqsign-core/src/context.rs similarity index 100% rename from crates/reqsign/src/context.rs rename to crates/reqsign-core/src/context.rs diff --git a/crates/reqsign/src/env.rs b/crates/reqsign-core/src/env.rs similarity index 100% rename from crates/reqsign/src/env.rs rename to crates/reqsign-core/src/env.rs diff --git a/crates/reqsign/src/fs.rs b/crates/reqsign-core/src/fs.rs similarity index 100% rename from crates/reqsign/src/fs.rs rename to crates/reqsign-core/src/fs.rs diff --git a/crates/reqsign/src/hash.rs b/crates/reqsign-core/src/hash.rs similarity index 100% rename from crates/reqsign/src/hash.rs rename to crates/reqsign-core/src/hash.rs diff --git a/crates/reqsign/src/http.rs b/crates/reqsign-core/src/http.rs similarity index 100% rename from crates/reqsign/src/http.rs rename to crates/reqsign-core/src/http.rs diff --git a/crates/reqsign/src/lib.rs b/crates/reqsign-core/src/lib.rs similarity index 100% rename from crates/reqsign/src/lib.rs rename to crates/reqsign-core/src/lib.rs diff --git a/crates/reqsign/src/sign/api.rs b/crates/reqsign-core/src/sign/api.rs similarity index 100% rename from crates/reqsign/src/sign/api.rs rename to crates/reqsign-core/src/sign/api.rs diff --git a/crates/reqsign/src/sign/mod.rs b/crates/reqsign-core/src/sign/mod.rs similarity index 100% rename from crates/reqsign/src/sign/mod.rs rename to crates/reqsign-core/src/sign/mod.rs diff --git a/crates/reqsign/src/sign/request.rs b/crates/reqsign-core/src/sign/request.rs similarity index 100% rename from crates/reqsign/src/sign/request.rs rename to crates/reqsign-core/src/sign/request.rs diff --git a/crates/reqsign/src/sign/signer.rs b/crates/reqsign-core/src/sign/signer.rs similarity index 100% rename from crates/reqsign/src/sign/signer.rs rename to crates/reqsign-core/src/sign/signer.rs diff --git a/crates/reqsign/src/time.rs b/crates/reqsign-core/src/time.rs similarity index 100% rename from crates/reqsign/src/time.rs rename to crates/reqsign-core/src/time.rs diff --git a/crates/reqsign-file-read-tokio/Cargo.toml b/crates/reqsign-file-read-tokio/Cargo.toml index 1dcb3fa..60fe75f 100644 --- a/crates/reqsign-file-read-tokio/Cargo.toml +++ b/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"] } diff --git a/crates/reqsign-file-read-tokio/src/lib.rs b/crates/reqsign-file-read-tokio/src/lib.rs index 705439d..d6f9aa9 100644 --- a/crates/reqsign-file-read-tokio/src/lib.rs +++ b/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; diff --git a/crates/reqsign-google/Cargo.toml b/crates/reqsign-google/Cargo.toml index f0450ad..f703239 100644 --- a/crates/reqsign-google/Cargo.toml +++ b/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 diff --git a/crates/reqsign-google/src/credential.rs b/crates/reqsign-google/src/credential.rs index 62ec8ac..30cc2a6 100644 --- a/crates/reqsign-google/src/credential.rs +++ b/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))] diff --git a/crates/reqsign-google/src/signer.rs b/crates/reqsign-google/src/signer.rs index e410567..1af6501 100644 --- a/crates/reqsign-google/src/signer.rs +++ b/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. /// diff --git a/crates/reqsign-google/src/token.rs b/crates/reqsign-google/src/token.rs index 5b34dd7..c92bd40 100644 --- a/crates/reqsign-google/src/token.rs +++ b/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. /// diff --git a/crates/reqsign-http-send-reqwest/Cargo.toml b/crates/reqsign-http-send-reqwest/Cargo.toml index a676f17..77c3932 100644 --- a/crates/reqsign-http-send-reqwest/Cargo.toml +++ b/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 } diff --git a/crates/reqsign-http-send-reqwest/src/lib.rs b/crates/reqsign-http-send-reqwest/src/lib.rs index a9e244e..121b2e6 100644 --- a/crates/reqsign-http-send-reqwest/src/lib.rs +++ b/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)] diff --git a/crates/reqsign-huaweicloud-obs/Cargo.toml b/crates/reqsign-huaweicloud-obs/Cargo.toml index 84b703f..a762adf 100644 --- a/crates/reqsign-huaweicloud-obs/Cargo.toml +++ b/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 diff --git a/crates/reqsign-huaweicloud-obs/src/signer.rs b/crates/reqsign-huaweicloud-obs/src/signer.rs index ab93666..cef80e9 100644 --- a/crates/reqsign-huaweicloud-obs/src/signer.rs +++ b/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. /// diff --git a/crates/reqsign-oracle/Cargo.toml b/crates/reqsign-oracle/Cargo.toml index a854c11..3a164e7 100644 --- a/crates/reqsign-oracle/Cargo.toml +++ b/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 diff --git a/crates/reqsign-oracle/src/credential.rs b/crates/reqsign-oracle/src/credential.rs index 7b1b00f..846cb03 100644 --- a/crates/reqsign-oracle/src/credential.rs +++ b/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 diff --git a/crates/reqsign-oracle/src/signer.rs b/crates/reqsign-oracle/src/signer.rs index 74a8cb3..d855add 100644 --- a/crates/reqsign-oracle/src/signer.rs +++ b/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)] diff --git a/crates/reqsign-tencent-cos/Cargo.toml b/crates/reqsign-tencent-cos/Cargo.toml index 18cbf29..42c1e01 100644 --- a/crates/reqsign-tencent-cos/Cargo.toml +++ b/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 diff --git a/crates/reqsign-tencent-cos/src/credential.rs b/crates/reqsign-tencent-cos/src/credential.rs index 048a6f5..f3f04de 100644 --- a/crates/reqsign-tencent-cos/src/credential.rs +++ b/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)] diff --git a/crates/reqsign-tencent-cos/src/signer.rs b/crates/reqsign-tencent-cos/src/signer.rs index 071592f..8b2c3b1 100644 --- a/crates/reqsign-tencent-cos/src/signer.rs +++ b/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)]