remove protos

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

Author: ovadiagal

rust/Cargo.lock

@@ -16,10 +16,6 @@ dashmap = "6.1.0"
 once_cell = "1.20.2"
 hickory-proto = "0.24"
 parking_lot = "0.12"
-prost = "0.13"
-
-[build-dependencies]
-prost-build = "0.13"
 
 [dev-dependencies]
 tempfile = "3.16.0"

rust/Cargo.toml

@@ -0,0 +1,24 @@
+use std::collections::HashMap;
+
+#[derive(Clone, PartialEq, serde::Deserialize, serde::Serialize)]
+pub struct DnsGatewayConfig {
+    /// Base IPv4 address for virtual IP allocation (e.g. "10.10.0.0").
+    #[serde(default)]
+    pub base_ip: String,
+    /// CIDR prefix length (1-32). A /24 gives 256 IPs.
+    #[serde(default)]
+    pub prefix_len: u32,
+    /// Each entry defines a domain pattern and associated metadata.
+    #[serde(default)]
+    pub domains: Vec<DomainMatcher>,
+}
+
+#[derive(Clone, PartialEq, serde::Deserialize, serde::Serialize)]
+pub struct DomainMatcher {
+    /// Exact domain ("example.com") or wildcard pattern ("*.example.com").
+    #[serde(default)]
+    pub domain: String,
+    /// String key-value pairs exposed in Envoy filter state as `envoy.dns_gateway.metadata.<key>.`
+    #[serde(default)]
+    pub metadata: HashMap<String, String>,
+}

rust/build.rs

@@ -3,12 +3,9 @@
 //! This filter demonstrates:
 //! 1. UDP listener filter structure with `UdpListenerFilterConfig` and `UdpListenerFilter` traits.
 //! 2. DNS query parsing and response.
-//! 3. Using protobof for configuration.
-//!
-//! See dns_gateway.proto for the protobuf definitions of the config.
 
 pub mod cache_lookup;
-mod proto;
+mod config;
 mod virtual_ip_cache;
 
 use envoy_proxy_dynamic_modules_rust_sdk::*;
@@ -74,27 +71,27 @@ impl DnsGatewayFilterConfig {
         };
         let value = &config_json["value"];
 
-        let proto_config: proto::DnsGatewayConfig = match serde_json::from_value(value.clone()) {
+        let gateway_config: config::DnsGatewayConfig = match serde_json::from_value(value.clone()) {
             Ok(cfg) => cfg,
             Err(err) => {
                 eprintln!("Error parsing DnsGatewayConfig: {err}");
                 return None;
             }
         };
 
-        if proto_config.base_ip.is_empty() {
+        if gateway_config.base_ip.is_empty() {
             eprintln!("base_ip is required for DNS gateway");
             return None;
         }
-        let base_ip: Ipv4Addr = match proto_config.base_ip.parse() {
+        let base_ip: Ipv4Addr = match gateway_config.base_ip.parse() {
             Ok(ip) => ip,
             Err(err) => {
                 eprintln!("Invalid base_ip: {err}");
                 return None;
             }
         };
 
-        let prefix_len = match u8::try_from(proto_config.prefix_len) {
+        let prefix_len = match u8::try_from(gateway_config.prefix_len) {
             Ok(v) => v,
             Err(err) => {
                 eprintln!("Invalid prefix_len: {err}");
@@ -108,7 +105,7 @@ impl DnsGatewayFilterConfig {
 
         init_cache(u32::from(base_ip), prefix_len);
 
-        let domains: Arc<[DomainMatcher]> = proto_config
+        let domains: Arc<[DomainMatcher]> = gateway_config
             .domains
             .into_iter()
             .map(|d| DomainMatcher {
@@ -397,7 +394,7 @@ mod tests {
 
     #[test]
     fn test_config_parsing_missing_prefix_len() {
-        // proto3 defaults missing uint32 to 0, which fails the 1..=32 range check.
+        // serde defaults missing uint32 to 0, which fails the 1..=32 range check.
         let config = r#"{
             "value": {
                 "base_ip": "10.10.0.0",