refactor: Split crates into services and context (#491)

Signed-off-by: Xuanwo <[email protected]>
Xuanwo · Sep 24, 2024 · ea10a23 · ea10a23
1 parent 47340fa
commit ea10a23
Show file tree

Hide file tree

Showing 94 changed files with 27 additions and 28 deletions.
diff --git a/.github/workflows/aliyun_oss.yml b/.github/workflows/aliyun_oss.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-aliyun-oss
+        working-directory: ./services/aliyun-oss
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/aws_v4.yml b/.github/workflows/aws_v4.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-aws-v4
+        working-directory: ./services/aws-v4
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG
@@ -54,7 +54,7 @@ jobs:
             core.setSecret(id_token)
 
       - name: Test
-        working-directory: ./crates/reqsign-aws-v4
+        working-directory: ./services/aws-v4
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/azure_storage.yml b/.github/workflows/azure_storage.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-aws-v4
+        working-directory: ./services/aws-v4
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,7 +55,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-core
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/google.yml b/.github/workflows/google.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-google
+        working-directory: ./services/google
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG
@@ -49,7 +49,7 @@ jobs:
           service_account: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
 
       - name: Test
-        working-directory: ./crates/reqsign-google
+        working-directory: ./services/google
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/huaweicloud_obs.yml b/.github/workflows/huaweicloud_obs.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-huaweicloud-obs
+        working-directory: ./services/huaweicloud-obs
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-oracle
+        working-directory: ./services/oracle
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/.github/workflows/tencent_cos.yml b/.github/workflows/tencent_cos.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Test
-        working-directory: ./crates/reqsign-tencent-cos
+        working-directory: ./services/tencent-cos
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG
@@ -50,7 +50,7 @@ jobs:
             core.setSecret(id_token)
 
       - name: Test
-        working-directory: ./crates/reqsign-tencent-cos
+        working-directory: ./services/tencent-cos
         run: cargo test --no-fail-fast
         env:
           RUST_LOG: DEBUG

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["crates/*"]
+members = ["core", "context/*", "services/*"]
 resolver = "2"
 
 [workspace.package]
@@ -31,7 +31,7 @@ percent-encoding = "2"
 pretty_assertions = "1.3"
 quick-xml = { version = "0.36", features = ["serialize"] }
 rand = "0.8.5"
-reqsign-core = { version = "0.16", path = "crates/reqsign-core" }
+reqsign-core = { version = "0.16", path = "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-file-read-tokio/Cargo.toml → context/file-read-tokio/Cargo.toml b/crates/reqsign-file-read-tokio/Cargo.toml → context/file-read-tokio/Cargo.toml
diff --git a/crates/reqsign-file-read-tokio/src/lib.rs → context/file-read-tokio/src/lib.rs b/crates/reqsign-file-read-tokio/src/lib.rs → context/file-read-tokio/src/lib.rs
diff --git a/crates/reqsign-http-send-reqwest/Cargo.toml → context/http-send-reqwest/Cargo.toml b/crates/reqsign-http-send-reqwest/Cargo.toml → context/http-send-reqwest/Cargo.toml
diff --git a/crates/reqsign-http-send-reqwest/src/lib.rs → context/http-send-reqwest/src/lib.rs b/crates/reqsign-http-send-reqwest/src/lib.rs → context/http-send-reqwest/src/lib.rs
diff --git a/crates/reqsign-core/Cargo.toml → core/Cargo.toml b/crates/reqsign-core/Cargo.toml → core/Cargo.toml
diff --git a/crates/reqsign-core/src/context.rs → core/src/context.rs b/crates/reqsign-core/src/context.rs → core/src/context.rs
diff --git a/crates/reqsign-core/src/env.rs → core/src/env.rs b/crates/reqsign-core/src/env.rs → core/src/env.rs
diff --git a/crates/reqsign-core/src/fs.rs → core/src/fs.rs b/crates/reqsign-core/src/fs.rs → core/src/fs.rs
diff --git a/crates/reqsign-core/src/hash.rs → core/src/hash.rs b/crates/reqsign-core/src/hash.rs → core/src/hash.rs
diff --git a/crates/reqsign-core/src/http.rs → core/src/http.rs b/crates/reqsign-core/src/http.rs → core/src/http.rs
diff --git a/crates/reqsign-core/src/lib.rs → core/src/lib.rs b/crates/reqsign-core/src/lib.rs → core/src/lib.rs
diff --git a/crates/reqsign-core/src/sign/api.rs → core/src/sign/api.rs b/crates/reqsign-core/src/sign/api.rs → core/src/sign/api.rs
diff --git a/crates/reqsign-core/src/sign/mod.rs → core/src/sign/mod.rs b/crates/reqsign-core/src/sign/mod.rs → core/src/sign/mod.rs
diff --git a/crates/reqsign-core/src/sign/request.rs → core/src/sign/request.rs b/crates/reqsign-core/src/sign/request.rs → core/src/sign/request.rs
diff --git a/crates/reqsign-core/src/sign/signer.rs → core/src/sign/signer.rs b/crates/reqsign-core/src/sign/signer.rs → core/src/sign/signer.rs
diff --git a/crates/reqsign-core/src/time.rs → core/src/time.rs b/crates/reqsign-core/src/time.rs → core/src/time.rs
diff --git a/crates/reqsign-aliyun-oss/Cargo.toml → services/aliyun-oss/Cargo.toml b/crates/reqsign-aliyun-oss/Cargo.toml → services/aliyun-oss/Cargo.toml
diff --git a/crates/reqsign-aliyun-oss/src/config.rs → services/aliyun-oss/src/config.rs b/crates/reqsign-aliyun-oss/src/config.rs → services/aliyun-oss/src/config.rs
diff --git a/crates/reqsign-aliyun-oss/src/constants.rs → services/aliyun-oss/src/constants.rs b/crates/reqsign-aliyun-oss/src/constants.rs → services/aliyun-oss/src/constants.rs
diff --git a/crates/reqsign-aliyun-oss/src/credential.rs → services/aliyun-oss/src/credential.rs b/crates/reqsign-aliyun-oss/src/credential.rs → services/aliyun-oss/src/credential.rs
@@ -257,7 +257,7 @@ mod tests {
     fn test_signer_with_oidc() -> Result<()> {
         let _ = env_logger::builder().is_test(true).try_init();
 
-        dotenv::from_filename(".env").ok();
+        dotenv::from_filename("../../../.env").ok();
 
         if env::var("REQSIGN_ALIYUN_OSS_TEST").is_err()
             || env::var("REQSIGN_ALIYUN_OSS_TEST").unwrap() != "on"
@@ -358,7 +358,7 @@ mod tests {
     fn test_signer_with_oidc_query() -> Result<()> {
         let _ = env_logger::builder().try_init();
 
-        dotenv::from_filename(".env").ok();
+        dotenv::from_filename("../../../.env").ok();
 
         if env::var("REQSIGN_ALIYUN_OSS_TEST").is_err()
             || env::var("REQSIGN_ALIYUN_OSS_TEST").unwrap() != "on"

diff --git a/crates/reqsign-aliyun-oss/src/lib.rs → services/aliyun-oss/src/lib.rs b/crates/reqsign-aliyun-oss/src/lib.rs → services/aliyun-oss/src/lib.rs
diff --git a/crates/reqsign-aliyun-oss/src/signer.rs → services/aliyun-oss/src/signer.rs b/crates/reqsign-aliyun-oss/src/signer.rs → services/aliyun-oss/src/signer.rs
diff --git a/...es/reqsign-aliyun-oss/testdata/.gitignore → services/aliyun-oss/testdata/.gitignore b/...es/reqsign-aliyun-oss/testdata/.gitignore → services/aliyun-oss/testdata/.gitignore
diff --git a/crates/reqsign-aliyun-oss/tests/main.rs → services/aliyun-oss/tests/main.rs b/crates/reqsign-aliyun-oss/tests/main.rs → services/aliyun-oss/tests/main.rs
@@ -18,7 +18,7 @@ use reqwest::Client;
 fn init_signer() -> Option<(Loader, Signer)> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_ALIYUN_OSS_TEST").is_err()
         || env::var("REQSIGN_ALIYUN_OSS_TEST").unwrap() != "on"

diff --git a/crates/reqsign-aws-v4/Cargo.toml → services/aws-v4/Cargo.toml b/crates/reqsign-aws-v4/Cargo.toml → services/aws-v4/Cargo.toml
@@ -38,7 +38,7 @@ hex.workspace = true
 macro_rules_attribute.workspace = true
 once_cell.workspace = true
 pretty_assertions.workspace = true
-reqsign-http-send-reqwest = { path = "../reqsign-http-send-reqwest" }
+reqsign-http-send-reqwest = { path = "../../context/http-send-reqwest" }
 reqwest = { workspace = true, features = ["rustls-tls"] }
 sha2.workspace = true
 temp-env.workspace = true
@@ -47,4 +47,4 @@ test-case.workspace = true
 tokio = { workspace = true, features = ["full"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-reqsign-file-read-tokio = { path = "../reqsign-file-read-tokio" }
+reqsign-file-read-tokio = { path = "../../context/file-read-tokio" }
diff --git a/crates/reqsign-aws-v4/benches/aws.rs → services/aws-v4/benches/aws.rs b/crates/reqsign-aws-v4/benches/aws.rs → services/aws-v4/benches/aws.rs
diff --git a/crates/reqsign-aws-v4/src/config.rs → services/aws-v4/src/config.rs b/crates/reqsign-aws-v4/src/config.rs → services/aws-v4/src/config.rs
diff --git a/crates/reqsign-aws-v4/src/constants.rs → services/aws-v4/src/constants.rs b/crates/reqsign-aws-v4/src/constants.rs → services/aws-v4/src/constants.rs
diff --git a/crates/reqsign-aws-v4/src/credential.rs → services/aws-v4/src/credential.rs b/crates/reqsign-aws-v4/src/credential.rs → services/aws-v4/src/credential.rs
@@ -766,7 +766,7 @@ mod tests {
     async fn test_signer_with_web_loader() -> Result<()> {
         let _ = env_logger::builder().is_test(true).try_init();
 
-        dotenv::from_filename(".env").ok();
+        dotenv::from_filename("../../../.env").ok();
 
         if env::var("REQSIGN_AWS_S3_TEST").is_err()
             || env::var("REQSIGN_AWS_S3_TEST").unwrap() != "on"
@@ -844,7 +844,7 @@ mod tests {
     async fn test_signer_with_web_loader_assume_role() -> Result<()> {
         let _ = env_logger::builder().is_test(true).try_init();
 
-        dotenv::from_filename(".env").ok();
+        dotenv::from_filename("../../../.env").ok();
 
         if env::var("REQSIGN_AWS_S3_TEST").is_err()
             || env::var("REQSIGN_AWS_S3_TEST").unwrap() != "on"

diff --git a/crates/reqsign-aws-v4/src/lib.rs → services/aws-v4/src/lib.rs b/crates/reqsign-aws-v4/src/lib.rs → services/aws-v4/src/lib.rs
diff --git a/crates/reqsign-aws-v4/src/signer.rs → services/aws-v4/src/signer.rs b/crates/reqsign-aws-v4/src/signer.rs → services/aws-v4/src/signer.rs
diff --git a/crates/reqsign-aws-v4/testdata/.gitignore → services/aws-v4/testdata/.gitignore b/crates/reqsign-aws-v4/testdata/.gitignore → services/aws-v4/testdata/.gitignore
diff --git a/...es/reqsign-aws-v4/testdata/default_config → services/aws-v4/testdata/default_config b/...es/reqsign-aws-v4/testdata/default_config → services/aws-v4/testdata/default_config
diff --git a/...eqsign-aws-v4/testdata/default_credential → services/aws-v4/testdata/default_credential b/...eqsign-aws-v4/testdata/default_credential → services/aws-v4/testdata/default_credential
diff --git a/crates/reqsign-aws-v4/tests/main.rs → services/aws-v4/tests/main.rs b/crates/reqsign-aws-v4/tests/main.rs → services/aws-v4/tests/main.rs
@@ -22,7 +22,7 @@ use sha2::Sha256;
 async fn init_signer() -> Option<(DefaultLoader, Signer)> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_AWS_V4_TEST").is_err() || env::var("REQSIGN_AWS_V4_TEST").unwrap() != "on"
     {

diff --git a/crates/reqsign-azure-storage/Cargo.toml → services/azure-storage/Cargo.toml b/crates/reqsign-azure-storage/Cargo.toml → services/azure-storage/Cargo.toml
diff --git a/.../reqsign-azure-storage/src/account_sas.rs → services/azure-storage/src/account_sas.rs b/.../reqsign-azure-storage/src/account_sas.rs → services/azure-storage/src/account_sas.rs
diff --git a/...e-storage/src/client_secret_credential.rs → ...e-storage/src/client_secret_credential.rs b/...e-storage/src/client_secret_credential.rs → ...e-storage/src/client_secret_credential.rs
diff --git a/crates/reqsign-azure-storage/src/config.rs → services/azure-storage/src/config.rs b/crates/reqsign-azure-storage/src/config.rs → services/azure-storage/src/config.rs
diff --git a/...es/reqsign-azure-storage/src/constants.rs → services/azure-storage/src/constants.rs b/...es/reqsign-azure-storage/src/constants.rs → services/azure-storage/src/constants.rs
diff --git a/...s/reqsign-azure-storage/src/credential.rs → services/azure-storage/src/credential.rs b/...s/reqsign-azure-storage/src/credential.rs → services/azure-storage/src/credential.rs
diff --git a/...sign-azure-storage/src/imds_credential.rs → ...ices/azure-storage/src/imds_credential.rs b/...sign-azure-storage/src/imds_credential.rs → ...ices/azure-storage/src/imds_credential.rs
diff --git a/crates/reqsign-azure-storage/src/lib.rs → services/azure-storage/src/lib.rs b/crates/reqsign-azure-storage/src/lib.rs → services/azure-storage/src/lib.rs
diff --git a/crates/reqsign-azure-storage/src/loader.rs → services/azure-storage/src/loader.rs b/crates/reqsign-azure-storage/src/loader.rs → services/azure-storage/src/loader.rs
diff --git a/crates/reqsign-azure-storage/src/signer.rs → services/azure-storage/src/signer.rs b/crates/reqsign-azure-storage/src/signer.rs → services/azure-storage/src/signer.rs
diff --git a/...orage/src/workload_identity_credential.rs → ...orage/src/workload_identity_credential.rs b/...orage/src/workload_identity_credential.rs → ...orage/src/workload_identity_credential.rs
diff --git a/crates/reqsign-azure-storage/tests/main.rs → services/azure-storage/tests/main.rs b/crates/reqsign-azure-storage/tests/main.rs → services/azure-storage/tests/main.rs
@@ -17,7 +17,7 @@ use reqwest::Client;
 fn init_signer() -> Option<(Loader, Signer)> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_AZURE_STORAGE_TEST").is_err()
         || env::var("REQSIGN_AZURE_STORAGE_TEST").unwrap() != "on"
@@ -292,7 +292,7 @@ async fn test_can_list_container_blobs() -> Result<()> {
 #[tokio::test]
 async fn test_head_blob_with_ldms() -> Result<()> {
     let _ = env_logger::builder().is_test(true).try_init();
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_AZURE_STORAGE_TEST").is_err()
         || env::var("REQSIGN_AZURE_STORAGE_TEST").unwrap() != "on"
@@ -344,7 +344,7 @@ async fn test_head_blob_with_ldms() -> Result<()> {
 #[tokio::test]
 async fn test_can_list_container_blobs_with_ldms() -> Result<()> {
     let _ = env_logger::builder().is_test(true).try_init();
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_AZURE_STORAGE_TEST").is_err()
         || env::var("REQSIGN_AZURE_STORAGE_TEST").unwrap() != "on"
@@ -405,7 +405,7 @@ async fn test_can_list_container_blobs_with_ldms() -> Result<()> {
 async fn test_head_blob_with_client_secret() -> Result<()> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_AZURE_STORAGE_TEST").is_err()
         || env::var("REQSIGN_AZURE_STORAGE_TEST").unwrap() != "on"
@@ -471,7 +471,7 @@ async fn test_head_blob_with_client_secret() -> Result<()> {
 async fn test_can_list_container_blobs_client_secret() -> Result<()> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_AZURE_STORAGE_TEST").is_err()
         || env::var("REQSIGN_AZURE_STORAGE_TEST").unwrap() != "on"

diff --git a/crates/reqsign-google/Cargo.toml → services/google/Cargo.toml b/crates/reqsign-google/Cargo.toml → services/google/Cargo.toml
diff --git a/crates/reqsign-google/src/constants.rs → services/google/src/constants.rs b/crates/reqsign-google/src/constants.rs → services/google/src/constants.rs
diff --git a/crates/reqsign-google/src/credential.rs → services/google/src/credential.rs b/crates/reqsign-google/src/credential.rs → services/google/src/credential.rs
diff --git a/...google/src/credential/external_account.rs → ...google/src/credential/external_account.rs b/...google/src/credential/external_account.rs → ...google/src/credential/external_account.rs
diff --git a/...redential/impersonated_service_account.rs → ...redential/impersonated_service_account.rs b/...redential/impersonated_service_account.rs → ...redential/impersonated_service_account.rs
diff --git a/...-google/src/credential/service_account.rs → .../google/src/credential/service_account.rs b/...-google/src/credential/service_account.rs → .../google/src/credential/service_account.rs
diff --git a/crates/reqsign-google/src/lib.rs → services/google/src/lib.rs b/crates/reqsign-google/src/lib.rs → services/google/src/lib.rs
diff --git a/crates/reqsign-google/src/signer.rs → services/google/src/signer.rs b/crates/reqsign-google/src/signer.rs → services/google/src/signer.rs
diff --git a/crates/reqsign-google/src/token.rs → services/google/src/token.rs b/crates/reqsign-google/src/token.rs → services/google/src/token.rs
diff --git a/...sign-google/src/token/external_account.rs → ...ices/google/src/token/external_account.rs b/...sign-google/src/token/external_account.rs → ...ices/google/src/token/external_account.rs
diff --git a/...src/token/impersonated_service_account.rs → ...src/token/impersonated_service_account.rs b/...src/token/impersonated_service_account.rs → ...src/token/impersonated_service_account.rs
diff --git a/...qsign-google/src/token/service_account.rs → services/google/src/token/service_account.rs b/...qsign-google/src/token/service_account.rs → services/google/src/token/service_account.rs
diff --git a/...sign-google/testdata/test_credential.json → ...ices/google/testdata/test_credential.json b/...sign-google/testdata/test_credential.json → ...ices/google/testdata/test_credential.json
diff --git a/...oogle/testdata/test_external_account.json → ...oogle/testdata/test_external_account.json b/...oogle/testdata/test_external_account.json → ...oogle/testdata/test_external_account.json
diff --git a/...ta/test_impersonated_service_account.json → ...ta/test_impersonated_service_account.json b/...ta/test_impersonated_service_account.json → ...ta/test_impersonated_service_account.json
diff --git a/...oogle/testdata/testbucket_credential.json → ...oogle/testdata/testbucket_credential.json b/...oogle/testdata/testbucket_credential.json → ...oogle/testdata/testbucket_credential.json
diff --git a/crates/reqsign-google/tests/main.rs → services/google/tests/main.rs b/crates/reqsign-google/tests/main.rs → services/google/tests/main.rs
@@ -13,7 +13,7 @@ use reqwest::Client;
 async fn init_signer() -> Option<(CredentialLoader, TokenLoader, Signer)> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
 
     if env::var("REQSIGN_GOOGLE_TEST").is_err() || env::var("REQSIGN_GOOGLE_TEST").unwrap() != "on"
     {

diff --git a/crates/reqsign-huaweicloud-obs/Cargo.toml → services/huaweicloud-obs/Cargo.toml b/crates/reqsign-huaweicloud-obs/Cargo.toml → services/huaweicloud-obs/Cargo.toml
diff --git a/crates/reqsign-huaweicloud-obs/src/config.rs → services/huaweicloud-obs/src/config.rs b/crates/reqsign-huaweicloud-obs/src/config.rs → services/huaweicloud-obs/src/config.rs
diff --git a/.../reqsign-huaweicloud-obs/src/constants.rs → services/huaweicloud-obs/src/constants.rs b/.../reqsign-huaweicloud-obs/src/constants.rs → services/huaweicloud-obs/src/constants.rs
diff --git a/...reqsign-huaweicloud-obs/src/credential.rs → services/huaweicloud-obs/src/credential.rs b/...reqsign-huaweicloud-obs/src/credential.rs → services/huaweicloud-obs/src/credential.rs
diff --git a/crates/reqsign-huaweicloud-obs/src/lib.rs → services/huaweicloud-obs/src/lib.rs b/crates/reqsign-huaweicloud-obs/src/lib.rs → services/huaweicloud-obs/src/lib.rs
diff --git a/crates/reqsign-huaweicloud-obs/src/signer.rs → services/huaweicloud-obs/src/signer.rs b/crates/reqsign-huaweicloud-obs/src/signer.rs → services/huaweicloud-obs/src/signer.rs
diff --git a/crates/reqsign-oracle/Cargo.toml → services/oracle/Cargo.toml b/crates/reqsign-oracle/Cargo.toml → services/oracle/Cargo.toml
diff --git a/crates/reqsign-oracle/src/config.rs → services/oracle/src/config.rs b/crates/reqsign-oracle/src/config.rs → services/oracle/src/config.rs
diff --git a/crates/reqsign-oracle/src/constants.rs → services/oracle/src/constants.rs b/crates/reqsign-oracle/src/constants.rs → services/oracle/src/constants.rs
diff --git a/crates/reqsign-oracle/src/credential.rs → services/oracle/src/credential.rs b/crates/reqsign-oracle/src/credential.rs → services/oracle/src/credential.rs
diff --git a/crates/reqsign-oracle/src/lib.rs → services/oracle/src/lib.rs b/crates/reqsign-oracle/src/lib.rs → services/oracle/src/lib.rs
diff --git a/crates/reqsign-oracle/src/mod.rs → services/oracle/src/mod.rs b/crates/reqsign-oracle/src/mod.rs → services/oracle/src/mod.rs
diff --git a/crates/reqsign-oracle/src/signer.rs → services/oracle/src/signer.rs b/crates/reqsign-oracle/src/signer.rs → services/oracle/src/signer.rs
diff --git a/crates/reqsign-tencent-cos/Cargo.toml → services/tencent-cos/Cargo.toml b/crates/reqsign-tencent-cos/Cargo.toml → services/tencent-cos/Cargo.toml
diff --git a/crates/reqsign-tencent-cos/src/config.rs → services/tencent-cos/src/config.rs b/crates/reqsign-tencent-cos/src/config.rs → services/tencent-cos/src/config.rs
diff --git a/crates/reqsign-tencent-cos/src/constants.rs → services/tencent-cos/src/constants.rs b/crates/reqsign-tencent-cos/src/constants.rs → services/tencent-cos/src/constants.rs
diff --git a/crates/reqsign-tencent-cos/src/credential.rs → services/tencent-cos/src/credential.rs b/crates/reqsign-tencent-cos/src/credential.rs → services/tencent-cos/src/credential.rs
diff --git a/crates/reqsign-tencent-cos/src/lib.rs → services/tencent-cos/src/lib.rs b/crates/reqsign-tencent-cos/src/lib.rs → services/tencent-cos/src/lib.rs
diff --git a/crates/reqsign-tencent-cos/src/signer.rs → services/tencent-cos/src/signer.rs b/crates/reqsign-tencent-cos/src/signer.rs → services/tencent-cos/src/signer.rs
diff --git a/...s/reqsign-tencent-cos/testdata/.gitignore → services/tencent-cos/testdata/.gitignore b/...s/reqsign-tencent-cos/testdata/.gitignore → services/tencent-cos/testdata/.gitignore
diff --git a/crates/reqsign-tencent-cos/tests/main.rs → services/tencent-cos/tests/main.rs b/crates/reqsign-tencent-cos/tests/main.rs → services/tencent-cos/tests/main.rs
@@ -19,7 +19,7 @@ use reqwest::Client;
 fn init_signer() -> Option<(CredentialLoader, Signer)> {
     let _ = env_logger::builder().is_test(true).try_init();
 
-    dotenv::from_filename(".env").ok();
+    dotenv::from_filename("../../../.env").ok();
     if env::var("REQSIGN_TENCENT_COS_TEST").is_err()
         || env::var("REQSIGN_TENCENT_COS_TEST").unwrap() != "on"
     {