style match lib.rs

Signed-off-by: Gal Ovadia <ggalovadia@gmail.com>

Author: ovadiagal

rust/src/egress_policies/dns_gateway.rs

@@ -30,11 +30,8 @@ impl PolicyMatcher {
     }
 }
 
-pub fn new_udp_filter_config<EC: EnvoyUdpListenerFilterConfig, ELF: EnvoyUdpListenerFilter>(
-    _envoy_filter_config: &mut EC,
-    _name: &str,
-    config: &[u8],
-) -> Option<Box<dyn UdpListenerFilterConfig<ELF>>> {
+impl DnsGatewayFilterConfig {
+    pub fn new(config: &[u8]) -> Option<Self> {
     // Parse config as JSON. The config arrives as a JSON-serialized google.protobuf.Any.
     // Supported wrappers:
     //   - StringValue: {"@type":"...StringValue", "value":"<json string>"}
@@ -81,9 +78,10 @@ pub fn new_udp_filter_config<EC: EnvoyUdpListenerFilterConfig, ELF: EnvoyUdpList
         });
     }
 
-    envoy_log_info!("DnsGateway initialized with {} policies", policies.len());
+        envoy_log_info!("DnsGateway initialized with {} policies", policies.len());
 
-    Some(Box::new(DnsGatewayFilterConfig { policies }))
+        Some(DnsGatewayFilterConfig { policies })
+    }
 }
 
 impl<ELF: EnvoyUdpListenerFilter> UdpListenerFilterConfig<ELF> for DnsGatewayFilterConfig {

rust/src/egress_policies/hostname_lookup.rs

@@ -7,13 +7,11 @@ use super::virtual_ip_cache::get_cache;
 
 pub struct HostnameLookupFilterConfig {}
 
-pub fn new_network_filter_config<EC: EnvoyNetworkFilterConfig, ENF: EnvoyNetworkFilter>(
-    _envoy_filter_config: &mut EC,
-    _name: &str,
-    _config: &[u8],
-) -> Option<Box<dyn NetworkFilterConfig<ENF>>> {
-    envoy_log_info!("HostnameLookup filter initialized");
-    Some(Box::new(HostnameLookupFilterConfig {}))
+impl HostnameLookupFilterConfig {
+    pub fn new(_config: &[u8]) -> Option<Self> {
+        envoy_log_info!("HostnameLookup filter initialized");
+        Some(HostnameLookupFilterConfig {})
+    }
 }
 
 impl<ENF: EnvoyNetworkFilter> NetworkFilterConfig<ENF> for HostnameLookupFilterConfig {

rust/src/egress_policies/mod.rs

@@ -87,6 +87,6 @@ pub mod dns_gateway;
 pub mod hostname_lookup;
 pub mod virtual_ip_cache;
 
-pub use dns_gateway::new_udp_filter_config as new_dns_gateway_config;
-pub use hostname_lookup::new_network_filter_config as new_hostname_lookup_config;
+pub use dns_gateway::DnsGatewayFilterConfig;
+pub use hostname_lookup::HostnameLookupFilterConfig;
 pub use virtual_ip_cache::{get_cache, init_cache, EgressPolicy, VirtualIpCache};

rust/src/lib.rs

@@ -64,6 +64,13 @@ pub mod listener_tls_detector;
 // Implements a system for defining egress policies by hostname.
 pub mod egress_policies;
 
+declare_all_init_functions!(
+    init,
+    http: new_http_filter_config_fn,
+    network: new_network_filter_config_fn,
+    udp_listener: new_udp_listener_filter_config_fn,
+);
+
 /// This implements the [`envoy_proxy_dynamic_modules_rust_sdk::ProgramInitFunction`].
 ///
 /// This is called exactly once when the module is loaded. It can be used to
@@ -76,14 +83,6 @@ fn init() -> bool {
     true
 }
 
-// Register all filter types
-declare_all_init_functions!(
-    init,
-    http: new_http_filter_config_fn,
-    network: new_network_filter_config_fn,
-    udp_listener: new_udp_listener_filter_config_fn,
-);
-
 /// This implements the [`envoy_proxy_dynamic_modules_rust_sdk::NewHttpFilterConfigFunction`].
 ///
 /// This is the entrypoint every time a new HTTP filter is created via the DynamicModuleFilter config.
@@ -109,37 +108,51 @@ fn new_http_filter_config_fn<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter>(
             .map(|config| Box::new(config) as Box<dyn HttpFilterConfig<EHF>>),
         "metrics" => http_metrics::FilterConfig::new(filter_config, envoy_filter_config)
             .map(|config| Box::new(config) as Box<dyn HttpFilterConfig<EHF>>),
-        _ => panic!("Unknown filter name: {filter_name}"),
+        _ => panic!("Unknown HTTP filter name: {filter_name}"),
     }
 }
 
+
+
+/// This implements the [`envoy_proxy_dynamic_modules_rust_sdk::NewNetworkFilterConfigFunction`].
+///
+/// This is the entrypoint every time a new Network filter is created via the DynamicModuleNetworkFilter config.
+///
+/// Each argument matches the corresponding argument in the Envoy config here:
+/// https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/dynamic_modules/v3/dynamic_modules.proto#envoy-v3-api-msg-extensions-dynamic-modules-v3-dynamicmoduleconfig
+///
+/// Returns None if the filter name or config is determined to be invalid by each filter's `new` function.
 fn new_network_filter_config_fn<EC: EnvoyNetworkFilterConfig, ENF: EnvoyNetworkFilter>(
-    envoy_filter_config: &mut EC,
+    _envoy_filter_config: &mut EC,
     filter_name: &str,
     filter_config: &[u8],
 ) -> Option<Box<dyn NetworkFilterConfig<ENF>>> {
     match filter_name {
-        "hostname_lookup" => egress_policies::new_hostname_lookup_config(
-            envoy_filter_config,
-            filter_name,
-            filter_config,
-        ),
+        "hostname_lookup" => egress_policies::HostnameLookupFilterConfig::new(filter_config)
+            .map(|config| Box::new(config) as Box<dyn NetworkFilterConfig<ENF>>),
         _ => panic!("Unknown network filter name: {filter_name}"),
     }
 }
 
+/// This implements the [`envoy_proxy_dynamic_modules_rust_sdk::NewUdpListenerFilterConfigFunction`].
+///
+/// This is the entrypoint every time a new UDP Listener filter is created via the DynamicModuleUdpListenerFilter config.
+///
+/// Each argument matches the corresponding argument in the Envoy config here:
+/// https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/dynamic_modules/v3/dynamic_modules.proto#envoy-v3-api-msg-extensions-dynamic-modules-v3-dynamicmoduleconfig
+///
+/// Returns None if the filter name or config is determined to be invalid by each filter's `new` function.
 fn new_udp_listener_filter_config_fn<
     EC: EnvoyUdpListenerFilterConfig,
     ELF: EnvoyUdpListenerFilter,
 >(
-    envoy_filter_config: &mut EC,
+    _envoy_filter_config: &mut EC,
     filter_name: &str,
     filter_config: &[u8],
 ) -> Option<Box<dyn UdpListenerFilterConfig<ELF>>> {
     match filter_name {
-        "dns_gateway" => {
-            egress_policies::new_dns_gateway_config(envoy_filter_config, filter_name, filter_config)
-        }
+        "dns_gateway" => egress_policies::DnsGatewayFilterConfig::new(filter_config)
+            .map(|config| Box::new(config) as Box<dyn UdpListenerFilterConfig<ELF>>),
         _ => panic!("Unknown UDP listener filter name: {filter_name}"),
     }
 }