Merge branch 'master' into update-bytes-to-v1

Cargo.toml

@@ -33,7 +33,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 urlencoding = { version = "2" }
 
 # Tardis
-tardis = { version = "=0.1.0-rc.4" }
+tardis = { version = "=0.1.0-rc.7" }
 # tardis = { path = "../tardis/tardis" }
 # tardis = { git = "https://github.com/ideal-world/tardis.git", rev = "25baf2a" }
 
@@ -54,7 +54,7 @@ schemars = { version = "0.8.6" }
 
 # Test
 reqwest = { version = "0.11", features = ["json", "gzip", "brotli"] }
-testcontainers-modules = { version = "0.1" }
+testcontainers-modules = { version = "0.2" }
 #async-compression 
 async-compression = { version = "0.3.13", default-features = false, features = [
   "tokio",

kernel/src/config/config_by_k8s.rs

@@ -825,7 +825,7 @@ async fn get_filters_from_cdr(kind: &str, name: &str, namespace: &Option<String>
             })
         })
         .flat_map(|filter_obj| {
-            filter_obj.spec.filters.into_iter().map(|filter| SgRouteFilter {
+            filter_obj.spec.filters.into_iter().filter(|filter| filter.enable).map(|filter| SgRouteFilter {
                 code: filter.code,
                 name: filter.name,
                 spec: filter.config,

kernel/tests/test_websocket.rs

@@ -108,7 +108,7 @@ async fn test_webscoket() -> TardisResult<()> {
     let error_client_a = TardisFuns::ws_client("ws://127.0.0.1:8080/ws/broadcast/gerror/a", move |msg| async move {
         if let Message::Text(msg) = msg {
             println!("client_not_found recv:{}", msg);
-            assert_eq!(msg, r#"{"msg":"message not illegal","event":"__sys_error__"}"#);
+            assert_eq!(msg, r#"{"msg":"message illegal","event":"__sys_error__"}"#);
             ERROR_COUNTER.fetch_add(1, Ordering::SeqCst);
         }
         None