From 5984f956e24a31a3f9f9ccca8e24461f8010b01e Mon Sep 17 00:00:00 2001
From: 4t145 <u4t145@163.com>
Date: Fri, 18 Oct 2024 16:35:49 +0800
Subject: [PATCH] cargo clippy fix and fmt, cicd add dry run

---
 .github/workflows/cicd.yml              | 23 ++++++++++++++++++++++-
 tardis/Cargo.toml                       |  2 +-
 tardis/src/os/os_client.rs              |  4 ++--
 tardis/tests/test_config_with_remote.rs |  2 +-
 tardis/tests/test_reldb_client.rs       |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index dd52880..094dbd8 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -112,10 +112,31 @@ jobs:
         with:
           name: code-coverage-report
           path: cobertura.xml
+  publish-macros-dry-run:
+    needs: [check]
+    runs-on: ubuntu-latest
+    steps:
+          - name: Check out the repo
+            uses: actions/checkout@v3
+
+          - name: Init rust envrionment
+            uses: actions-rs/toolchain@v1
+            with:
+              toolchain: stable
 
+          - name: Cargo login
+            run: cargo login ${{ secrets.CRATES_TOKEN }}
+
+          - name: Cargo package macros
+            working-directory: tardis-macros
+            run: cargo package
+
+          - name: Cargo publish macros
+            working-directory: tardis-macros
+            run: cargo publish --dry-run
   publish-macros:
     if: startsWith(github.ref, 'refs/tags/')
-    needs: [check]
+    needs: [publish-macros-dry-run]
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
diff --git a/tardis/Cargo.toml b/tardis/Cargo.toml
index df2b5eb..41ebf43 100644
--- a/tardis/Cargo.toml
+++ b/tardis/Cargo.toml
@@ -98,7 +98,7 @@ tokio = { version = "1", features = [
 ] }
 tokio-util = { version = "0.7.12" }
 # Tardis Macros
-tardis-macros = { version = "0.1.0-rc.17", workspace = true, optional = true }
+tardis-macros = { version = "0.1.0-rc.17",  optional = true }
 # Log
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/tardis/src/os/os_client.rs b/tardis/src/os/os_client.rs
index 3e3cbfe..2516450 100644
--- a/tardis/src/os/os_client.rs
+++ b/tardis/src/os/os_client.rs
@@ -55,7 +55,7 @@ impl TardisOSClient {
                     expiration: None,
                 };
                 let default_bucket = if !default_bucket.is_empty() {
-                    Some(*Bucket::new(default_bucket, region.clone(), credentials.clone())?.with_path_style())
+                    Some(Bucket::new(default_bucket, region.clone(), credentials.clone())?.with_path_style())
                 } else {
                     None
                 };
@@ -374,7 +374,7 @@ impl TardisOSOperations for TardisOSS3Client {
 impl TardisOSS3Client {
     fn get_bucket(&self, bucket_name: Option<&str>) -> TardisResult<Box<Bucket>> {
         if let Some(bucket_name) = bucket_name {
-            Ok(*Bucket::new(bucket_name, self.region.clone(), self.credentials.clone())?.with_path_style())
+            Ok(Bucket::new(bucket_name, self.region.clone(), self.credentials.clone())?.with_path_style())
         } else {
             let bucket =
                 self.default_bucket.as_ref().ok_or_else(|| TardisError::not_found("[Tardis.OSClient] No default bucket configured", "404-tardis-os-default-bucket-not-exist"))?;
diff --git a/tardis/tests/test_config_with_remote.rs b/tardis/tests/test_config_with_remote.rs
index 5b6f9ce..ffc6883 100644
--- a/tardis/tests/test_config_with_remote.rs
+++ b/tardis/tests/test_config_with_remote.rs
@@ -14,7 +14,7 @@ use tardis::test::test_container::nacos_server::NacosServer;
 use tardis::TardisFuns;
 
 use testcontainers::runners::AsyncRunner;
-use testcontainers::{ContainerAsync, GenericImage};
+use testcontainers::ContainerAsync;
 use testcontainers_modules::rabbitmq::RabbitMq;
 use testcontainers_modules::redis::Redis;
 use tracing::{info, warn};
diff --git a/tardis/tests/test_reldb_client.rs b/tardis/tests/test_reldb_client.rs
index 5636e18..2777389 100644
--- a/tardis/tests/test_reldb_client.rs
+++ b/tardis/tests/test_reldb_client.rs
@@ -929,7 +929,7 @@ pub mod entities {
             }
 
             fn create_index_statement() -> Vec<IndexCreateStatement> {
-                vec![Index::create().name(&format!("idx-{}-{}", Entity.table_name(), Column::OwnPaths.to_string())).table(Entity).col(Column::OwnPaths).to_owned()]
+                vec![Index::create().name(format!("idx-{}-{}", Entity.table_name(), Column::OwnPaths.to_string())).table(Entity).col(Column::OwnPaths).to_owned()]
             }
         }