feat(nacos): add fuzzy configuration group filtering

This commit is contained in:
二丫讲梵 authored and GitHub committed 2026-08-06 17:19:27 +08:00
1 parent 939c8d493d
commit cd6a3c8b5c
7 files changed
+313 -29

No files matched your search

+2
View File
@@ -196,6 +196,7 @@ async fn resolve_selector(
let mut query = selector.query.clone().unwrap_or(crate::nacos::types::NacosConfigQuery {
namespace: None,
group: None,
group_contains: false,
data_id: None,
app_name: None,
search: None,
@@ -397,6 +398,7 @@ async fn existing_config(
.list_configs(crate::nacos::types::NacosConfigQuery {
namespace: Some(namespace.clone()),
group: Some(config.group.clone()),
group_contains: false,
data_id: Some(config.data_id.clone()),
app_name: None,
search: None,
+153 -11
View File
@@ -925,19 +925,20 @@ impl NacosOpenApiAdmin {
.await
}
async fn list_configs_by_client_filter(
async fn list_configs_by_client_filters(
&self,
namespace: String,
group: Option<String>,
data_id_filter: Option<String>,
group_filter: Option<String>,
app_name_filter: Option<String>,
page_no: u32,
page_size: u32,
) -> Result<NacosConfigList, String> {
let Some(filter) = data_id_filter.map(|value| value.to_lowercase()).filter(|value| !value.is_empty()) else {
let data_id_filter = data_id_filter.map(|value| value.to_lowercase()).filter(|value| !value.is_empty());
let group_filter = group_filter.map(|value| value.to_lowercase()).filter(|value| !value.is_empty());
if data_id_filter.is_none() && group_filter.is_none() {
return Ok(NacosConfigList { page_no, page_size, total_count: 0, items: Vec::new() });
};
let group = group.unwrap_or_default();
}
let app_name = app_name_filter.unwrap_or_default();
let scan_page_size = page_size.max(self.cfg.page_size).clamp(100, 500);
let mut matched = Vec::new();
@@ -945,15 +946,18 @@ impl NacosOpenApiAdmin {
let mut current_page = 1;
loop {
let value =
self.get_config_list_value(&namespace, "", &group, &app_name, current_page, scan_page_size).await?;
let value = self.get_config_list_value(&namespace, "", "", &app_name, current_page, scan_page_size).await?;
let list = parse_config_list(value, namespace.clone(), current_page, scan_page_size);
let total_count = list.total_count;
let empty = list.items.is_empty();
let before = seen.len();
for item in list.items {
let identity = (item.namespace.clone(), item.group.clone(), item.data_id.clone());
if seen.insert(identity) && item.data_id.to_lowercase().contains(&filter) {
let data_id_matches =
data_id_filter.as_ref().is_none_or(|filter| item.data_id.to_lowercase().contains(filter));
let group_matches =
group_filter.as_ref().is_none_or(|filter| item.group.to_lowercase().contains(filter));
if seen.insert(identity) && data_id_matches && group_matches {
matched.push(item);
}
}
@@ -1406,19 +1410,37 @@ impl NacosAdmin for NacosOpenApiAdmin {
.map(|value| value.trim().to_string())
.filter(|value| !value.is_empty());
let search = data_id_filter.clone().unwrap_or_default();
let group_filter = query.group.clone();
let group_filter = query.group.map(|value| value.trim().to_string()).filter(|value| !value.is_empty());
let group_contains = query.group_contains;
let group = group_filter.clone().unwrap_or_default();
let app_name_filter = query.app_name.map(|value| value.trim().to_string()).filter(|value| !value.is_empty());
let app_name = app_name_filter.clone().unwrap_or_default();
// Nacos v2, v3, and r-nacos do not agree on whether a group filter is
// exact or fuzzy. Scan without that server-side constraint so the UI
// always provides the same case-insensitive contains semantics.
if group_contains && group_filter.is_some() {
return self
.list_configs_by_client_filters(
namespace,
data_id_filter,
group_filter,
app_name_filter,
page_no,
page_size,
)
.await;
}
let value = self.get_config_list_value(&namespace, &search, &group, &app_name, page_no, page_size).await?;
let parsed =
self.enrich_missing_config_formats(parse_config_list(value, namespace.clone(), page_no, page_size)).await;
if data_id_filter.is_some() && parsed.items.is_empty() {
let fallback = self
.list_configs_by_client_filter(
.list_configs_by_client_filters(
namespace,
group_filter,
data_id_filter,
group_filter,
app_name_filter,
page_no,
page_size,
@@ -2128,6 +2150,7 @@ impl NacosAdmin for NacosOpenApiAdmin {
let configs_future = self.list_configs(NacosConfigQuery {
namespace: Some(namespace.clone()),
group: None,
group_contains: false,
data_id: None,
app_name: None,
search: None,
@@ -3264,6 +3287,123 @@ mod tests {
server.await.unwrap();
}
async fn assert_group_filter_uses_client_side_contains_match(
implementation: Option<NacosImplementation>,
version_mode: Option<NacosVersionMode>,
expected_path: &str,
group_param: &str,
) {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let address = listener.local_addr().unwrap();
let expected_path = expected_path.to_string();
let group_param = group_param.to_string();
let server = tokio::spawn(async move {
let (mut socket, _) = listener.accept().await.unwrap();
let target = read_request_target(&mut socket).await;
let url = reqwest::Url::parse(&format!("http://localhost{target}")).unwrap();
let params = url.query_pairs().collect::<HashMap<_, _>>();
assert_eq!(url.path(), expected_path);
assert_eq!(params.get(group_param.as_str()).map(|value| value.as_ref()), Some(""));
write_json_response(
&mut socket,
r#"{"totalCount":2,"pageItems":[{"dataId":"service.yaml","group":"SENSITIVE_GROUP","tenant":"ops","type":"yaml"},{"dataId":"other.yaml","group":"DEFAULT_GROUP","tenant":"ops","type":"yaml"}]}"#,
)
.await;
});
let mut config = test_admin_config(format!("http://{address}"));
config.context_path = "/nacos".to_string();
config.implementation = implementation;
config.version_mode = version_mode;
let admin = NacosOpenApiAdmin::new(config).unwrap();
let list = admin
.list_configs(NacosConfigQuery {
namespace: Some("ops".to_string()),
group: Some("sensitive".to_string()),
group_contains: true,
data_id: None,
app_name: None,
search: None,
page_no: Some(1),
page_size: Some(20),
})
.await
.unwrap();
assert_eq!(list.total_count, 1);
assert_eq!(list.items.len(), 1);
assert_eq!(list.items[0].group, "SENSITIVE_GROUP");
server.await.unwrap();
}
#[tokio::test]
async fn group_filter_uses_consistent_client_side_contains_matching() {
assert_group_filter_uses_client_side_contains_match(
None,
Some(NacosVersionMode::V2),
"/nacos/v1/cs/configs",
"group",
)
.await;
assert_group_filter_uses_client_side_contains_match(
None,
Some(NacosVersionMode::V3),
"/nacos/v3/admin/cs/config/list",
"groupName",
)
.await;
assert_group_filter_uses_client_side_contains_match(
Some(NacosImplementation::RNacos),
None,
"/nacos/v1/cs/configs",
"group",
)
.await;
}
#[tokio::test]
async fn exact_group_filter_keeps_server_side_matching() {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let address = listener.local_addr().unwrap();
let server = tokio::spawn(async move {
let (mut socket, _) = listener.accept().await.unwrap();
let target = read_request_target(&mut socket).await;
let url = reqwest::Url::parse(&format!("http://localhost{target}")).unwrap();
let params = url.query_pairs().collect::<HashMap<_, _>>();
assert_eq!(url.path(), "/nacos/v3/admin/cs/config/list");
assert_eq!(params.get("groupName").map(|value| value.as_ref()), Some("SENSITIVE_GROUP"));
assert_eq!(params.get("dataId").map(|value| value.as_ref()), Some("service.yaml"));
write_json_response(
&mut socket,
r#"{"code":0,"data":{"totalCount":1,"pageItems":[{"dataId":"service.yaml","groupName":"SENSITIVE_GROUP","namespaceId":"ops","type":"yaml"}]}}"#,
)
.await;
});
let mut config = test_admin_config(format!("http://{address}"));
config.context_path = "/nacos".to_string();
config.version_mode = Some(NacosVersionMode::V3);
let admin = NacosOpenApiAdmin::new(config).unwrap();
let list = admin
.list_configs(NacosConfigQuery {
namespace: Some("ops".to_string()),
group: Some("SENSITIVE_GROUP".to_string()),
group_contains: false,
data_id: Some("service.yaml".to_string()),
app_name: None,
search: None,
page_no: Some(1),
page_size: Some(20),
})
.await
.unwrap();
assert_eq!(list.total_count, 1);
assert_eq!(list.items.len(), 1);
assert_eq!(list.items[0].group, "SENSITIVE_GROUP");
server.await.unwrap();
}
#[test]
fn explicit_v3_rejects_legacy_admin_api_paths() {
let mut config = test_admin_config("http://127.0.0.1:8848".to_string());
@@ -4294,6 +4434,7 @@ mod tests {
.list_configs(NacosConfigQuery {
namespace: Some("ops".to_string()),
group: None,
group_contains: false,
data_id: None,
app_name: None,
search: None,
@@ -4344,6 +4485,7 @@ mod tests {
.list_configs(NacosConfigQuery {
namespace: Some("ops".to_string()),
group: None,
group_contains: false,
data_id: None,
app_name: None,
search: None,
+1
View File
@@ -319,6 +319,7 @@ where
.list_configs(NacosConfigQuery {
namespace: Some(namespace.to_string()),
group: request.group.clone(),
group_contains: false,
data_id: None,
app_name: None,
search: None,
+4
View File
@@ -184,6 +184,10 @@ pub struct NacosConfigQuery {
pub namespace: Option<String>,
#[serde(default)]
pub group: Option<String>,
/// Applies case-insensitive contains matching to `group` after listing.
/// Defaults to exact server-side filtering for internal callers.
#[serde(default)]
pub group_contains: bool,
#[serde(default)]
pub data_id: Option<String>,
#[serde(default)]