fix: 修复grpc协议的配置请求中的默认命名空间id为public与空字符串等价的兼容问题 #184

nacos-group · Dec 8, 2024 · 700c7f4 · 700c7f4
1 parent 5a59930
commit 700c7f4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -1,3 +1,6 @@
+use crate::common::constant::EMPTY_ARC_STRING;
+use std::sync::Arc;
+
 pub mod config_db;
 pub mod config_index;
 pub mod config_sled;
@@ -21,6 +24,15 @@ impl ConfigUtils {
             val
         }
     }
+
+    pub fn default_tenant_arc(val: Arc<String>) -> Arc<String> {
+        if val.as_str() == DEFAULT_TENANT {
+            EMPTY_ARC_STRING.clone()
+        } else {
+            val
+        }
+    }
+
     pub fn is_default_tenant(val: &str) -> bool {
         val == DEFAULT_TENANT
     }

diff --git a/src/grpc/handler/config_change_batch_listen.rs b/src/grpc/handler/config_change_batch_listen.rs
@@ -2,6 +2,7 @@
 
 use std::sync::Arc;
 
+use crate::config::ConfigUtils;
 use crate::grpc::HandlerResult;
 use crate::{
     common::appdata::AppShareData,
@@ -40,7 +41,11 @@ impl PayloadHandler for ConfigChangeBatchListenRequestHandler {
         let request: ConfigBatchListenRequest = serde_json::from_slice(&body_vec)?;
         let mut listener_items = vec![];
         for item in request.config_listen_contexts {
-            let key = ConfigKey::new(&item.data_id, &item.group, &item.tenant);
+            let key = ConfigKey::new(
+                &item.data_id,
+                &item.group,
+                &ConfigUtils::default_tenant(item.tenant),
+            );
             listener_items.push(ListenerItem::new(key, item.md5));
         }
         let cmd = if request.listen {

diff --git a/src/grpc/handler/config_publish.rs b/src/grpc/handler/config_publish.rs
@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use crate::common::string_utils::StringUtils;
 use crate::config::config_type::ConfigType;
+use crate::config::ConfigUtils;
 use crate::grpc::HandlerResult;
 use crate::{
     common::appdata::AppShareData,
@@ -42,7 +43,11 @@ impl PayloadHandler for ConfigPublishRequestHandler {
         let desc =
             StringUtils::map_not_empty(request.get_addition_param("desc").cloned()).map(Arc::new);
         let mut req = SetConfigReq::new(
-            ConfigKey::new(&request.data_id, &request.group, &request.tenant),
+            ConfigKey::new(
+                &request.data_id,
+                &request.group,
+                &ConfigUtils::default_tenant(request.tenant),
+            ),
             request.content,
         );
         req.config_type = config_type;

diff --git a/src/grpc/handler/config_query.rs b/src/grpc/handler/config_query.rs
@@ -3,6 +3,7 @@
 use std::sync::Arc;
 
 use crate::config::config_type::ConfigType;
+use crate::config::ConfigUtils;
 use crate::grpc::api_model::NOT_FOUND;
 use crate::grpc::HandlerResult;
 use crate::{
@@ -42,7 +43,7 @@ impl PayloadHandler for ConfigQueryRequestHandler {
         let cmd = ConfigCmd::GET(ConfigKey::new(
             &request.data_id,
             &request.group,
-            &request.tenant,
+            &ConfigUtils::default_tenant(request.tenant),
         ));
         let mut response = ConfigQueryResponse {
             request_id: request.request_id,

diff --git a/src/grpc/handler/config_remove.rs b/src/grpc/handler/config_remove.rs
@@ -2,6 +2,7 @@
 
 use std::sync::Arc;
 
+use crate::config::ConfigUtils;
 use crate::grpc::HandlerResult;
 use crate::{
     common::appdata::AppShareData,
@@ -38,7 +39,7 @@ impl PayloadHandler for ConfigRemoveRequestHandler {
         let req = DelConfigReq::new(ConfigKey::new(
             &request.data_id,
             &request.group,
-            &request.tenant,
+            &ConfigUtils::default_tenant(request.tenant),
         ));
         match self.app_data.config_route.del_config(req).await {
             Ok(_res) => {