chore: fix comment

Author: ZhiHanZ

Cargo.lock

@@ -500,20 +500,17 @@ impl Debug for StorageRedisConfig {
 pub struct ShareTableConfig {
     pub share_endpoint_address: Option<String>,
     pub share_endpoint_token: RefreshableToken,
-    pub requester_tenant_id: String,
 }
 
 impl ShareTableConfig {
     pub fn init(
         share_endpoint_address: &str,
         token_file: &str,
-        requester_tenant_id: String,
         default_token: String,
     ) -> common_exception::Result<()> {
         GlobalInstance::set(Self::try_create(
             share_endpoint_address,
             token_file,
-            requester_tenant_id,
             default_token,
         )?);
 
@@ -523,7 +520,6 @@ impl ShareTableConfig {
     pub fn try_create(
         share_endpoint_address: &str,
         token_file: &str,
-        requester_tenant_id: String,
         default_token: String,
     ) -> common_exception::Result<ShareTableConfig> {
         let share_endpoint_address = if share_endpoint_address.is_empty() {
@@ -541,7 +537,6 @@ impl ShareTableConfig {
         Ok(ShareTableConfig {
             share_endpoint_address,
             share_endpoint_token,
-            requester_tenant_id,
         })
     }
 
@@ -553,10 +548,6 @@ impl ShareTableConfig {
         ShareTableConfig::instance().share_endpoint_token
     }
 
-    pub fn requester_tenant_id() -> String {
-        ShareTableConfig::instance().requester_tenant_id
-    }
-
     pub fn instance() -> ShareTableConfig {
         GlobalInstance::get()
     }

src/common/storage/src/config.rs

@@ -71,7 +71,6 @@ impl GlobalServices {
             &config.query.share_endpoint_address,
             &config.query.share_endpoint_auth_token_file,
             config.query.tenant_id.clone(),
-            config.query.tenant_id.clone(),
         )?;
 
         CacheManager::init(&config.query)?;

src/query/service/src/global_services.rs

@@ -16,6 +16,8 @@ backon = "0.2"
 base64 = "0.13.0"
 bytes = "1"
 common-auth = { path = "../../common/auth" }
+common-config = { path = "../config" }
+
 http = "0.2"
 log = "0.4"
 moka = "0.9"

src/query/sharing/Cargo.toml

@@ -56,7 +56,6 @@ use crate::SharedSigner;
 pub fn create_share_table_operator(
     share_endpoint_address: Option<String>,
     share_endpoint_token: RefreshableToken,
-    requester_tenant_id: String,
     share_tenant_id: &str,
     share_name: &str,
     table_name: &str,
@@ -69,7 +68,6 @@ pub fn create_share_table_operator(
                     share_endpoint_address, share_tenant_id, share_name, table_name
                 ),
                 share_endpoint_token,
-                requester_tenant_id,
             );
             Operator::new(apply_wrapper(SharedAccessor {
                 signer,

src/query/sharing/src/layer.rs

@@ -22,6 +22,7 @@ use anyhow::anyhow;
 use anyhow::Result;
 use bytes::Bytes;
 use common_auth::RefreshableToken;
+use common_config::GlobalConfig;
 use http::header::AUTHORIZATION;
 use http::header::CONTENT_LENGTH;
 use http::Method;
@@ -45,7 +46,6 @@ pub struct SharedSigner {
     cache: Cache<PresignRequest, PresignedRequest>,
     client: HttpClient,
     token: RefreshableToken,
-    requester_tenant_id: String,
 }
 
 impl Debug for SharedSigner {
@@ -58,7 +58,7 @@ impl Debug for SharedSigner {
 
 impl SharedSigner {
     /// Create a new SharedSigner.
-    pub fn new(endpoint: &str, token: RefreshableToken, req_tenant_id: String) -> Self {
+    pub fn new(endpoint: &str, token: RefreshableToken) -> Self {
         let cache = Cache::builder()
             // Databend Cloud Presign will expire after 3600s (1 hour).
             // We will expire them 10 minutes before to avoid edge cases.
@@ -70,7 +70,6 @@ impl SharedSigner {
             cache,
             client: HttpClient::new(),
             token,
-            requester_tenant_id: req_tenant_id,
         }
     }
 
@@ -153,12 +152,13 @@ impl SharedSigner {
             .collect();
         let bs = Bytes::from(serde_json::to_vec(&reqs)?);
         let auth = self.token.to_header().await?;
+        let requester = GlobalConfig::instance().as_ref().query.tenant_id.clone();
         let req = Request::builder()
             .method(Method::POST)
             .uri(&self.endpoint)
             .header(AUTHORIZATION, auth)
             .header(CONTENT_LENGTH, bs.len())
-            .header(TENANT_HEADER, self.requester_tenant_id.clone())
+            .header(TENANT_HEADER, requester)
             .body(AsyncBody::Bytes(bs))?;
         let resp = self.client.send_async(req).await?;
         let bs = resp.into_body().bytes().await?;

src/query/sharing/src/signer.rs

@@ -98,7 +98,6 @@ impl FuseTable {
             Some(ref from_share) => create_share_table_operator(
                 ShareTableConfig::share_endpoint_address(),
                 ShareTableConfig::share_endpoint_token(),
-                ShareTableConfig::requester_tenant_id(),
                 &from_share.tenant,
                 &from_share.share_name,
                 &table_info.name,