chore: remove old CLI & Components

googleforgames · Feb 26, 2025 · de0d32d · de0d32d
1 parent d4733c5
commit de0d32d
Show file tree

Hide file tree

Showing 38 changed files with 73 additions and 937 deletions.
diff --git a/docs/src/services/proxy/filters.md b/docs/src/services/proxy/filters.md
@@ -52,7 +52,7 @@ clusters:
     - address: 127.0.0.1:7001
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 2);
+# assert_eq!(config.filters().unwrap().load().len(), 2);
 # }
 ```
 

diff --git a/docs/src/services/proxy/filters/capture.md b/docs/src/services/proxy/filters/capture.md
@@ -45,7 +45,7 @@ clusters:
       - address: 127.0.0.1:7001
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 ```
 
 ## Configuration Options ([Rust Doc](../../../../api/quilkin/filters/capture/struct.Config.html))

diff --git a/docs/src/services/proxy/filters/concatenate.md b/docs/src/services/proxy/filters/concatenate.md
@@ -23,7 +23,7 @@ clusters:
       - address: 127.0.0.1:7001
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 ```
 
 ## Configuration Options ([Rust Doc](../../../../api/quilkin/filters/concatenate/struct.Config.html))

diff --git a/docs/src/services/proxy/filters/debug.md b/docs/src/services/proxy/filters/debug.md
@@ -22,7 +22,7 @@ clusters:
       - address: 127.0.0.1:7001
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 ```
 
 ## Configuration Options ([Rust Doc](../../../../api/quilkin/filters/debug/struct.Config.html))

diff --git a/docs/src/services/proxy/filters/firewall.md b/docs/src/services/proxy/filters/firewall.md
@@ -33,7 +33,7 @@ clusters:
       - address: 127.0.0.1:7001
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 ```
 
 ## Configuration Options ([Rust Doc](../../../../api/quilkin/filters/firewall/struct.Config.html))

diff --git a/docs/src/services/proxy/filters/load_balancer.md b/docs/src/services/proxy/filters/load_balancer.md
@@ -22,7 +22,7 @@ clusters:
       - address: 127.0.0.1:7001
 # ";
 #   let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 # }
 ```
 

diff --git a/docs/src/services/proxy/filters/local_rate_limit.md b/docs/src/services/proxy/filters/local_rate_limit.md
@@ -26,7 +26,7 @@ clusters:
     - address: 127.0.0.1:7001
 # ";
 #   let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 # }
 ```
 To configure a rate limiter, we specify the maximum rate at which the proxy is allowed to forward packets. In the example above, we configured the proxy to forward a maximum of 1000 packets per second).

diff --git a/docs/src/services/proxy/filters/match.md b/docs/src/services/proxy/filters/match.md
@@ -36,7 +36,7 @@ filters:
           name: quilkin.filters.drop.v1alpha1.Drop
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 2);
+# assert_eq!(config.filters().unwrap().load().len(), 2);
 ```
 <!--  ANCHOR_END: example -->
 

diff --git a/docs/src/services/proxy/filters/token_router.md b/docs/src/services/proxy/filters/token_router.md
@@ -34,7 +34,7 @@ clusters:
             - bmt1eTcweA==
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 ```
 
 View the [CaptureBytes](capture.md) filter documentation for more details.
@@ -96,7 +96,7 @@ clusters:
              - bmt1eTcweA==
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 2);
+# assert_eq!(config.filters().unwrap().load().len(), 2);
 ```
 
 On the game client side the [Concatenate](concatenate.md) filter could also be used to add authentication

diff --git a/docs/src/services/xds/providers/filesystem.md b/docs/src/services/xds/providers/filesystem.md
@@ -39,7 +39,7 @@ clusters:
              - 'MXg3aWp5Ng=='
 # ";
 # let config = quilkin::config::Config::from_reader(yaml.as_bytes()).unwrap();
-# assert_eq!(config.filters.load().len(), 1);
+# assert_eq!(config.filters().unwrap().load().len(), 1);
 ```
 
 [configuration]: ../../../services/proxy/configuration.md
diff --git a/src/cli.rs b/src/cli.rs
@@ -19,39 +19,19 @@ use std::{path::PathBuf, sync::Arc};
 use clap::builder::TypedValueParser;
 use clap::crate_version;
 
-use crate::Config;
 use strum_macros::{Display, EnumString};
 
 pub use self::{
-    agent::Agent,
     generate_config_schema::GenerateConfigSchema,
-    manage::Manage,
-    proxy::Proxy,
     qcmp::Qcmp,
-    relay::Relay,
     service::{Finalizer, Service},
 };
 
-macro_rules! define_port {
-    ($port:expr_2021) => {
-        pub const PORT: u16 = $port;
-
-        pub fn default_port() -> u16 {
-            PORT
-        }
-    };
-}
-
-pub mod agent;
 pub mod generate_config_schema;
-pub mod manage;
-pub mod proxy;
 pub mod qcmp;
-pub mod relay;
-mod service;
+pub(crate) mod service;
 
 const ETC_CONFIG_PATH: &str = "/etc/quilkin/quilkin.yaml";
-const PORT_ENV_VAR: &str = "QUILKIN_PORT";
 
 #[derive(Debug, clap::Parser)]
 #[command(next_help_heading = "Administration Options")]
@@ -186,13 +166,9 @@ impl LogFormats {
 /// The various Quilkin commands.
 #[derive(Clone, Debug, clap::Subcommand)]
 pub enum Commands {
-    Agent(Agent),
     GenerateConfigSchema(GenerateConfigSchema),
-    Manage(Manage),
     #[clap(subcommand)]
     Qcmp(Qcmp),
-    Proxy(Proxy),
-    Relay(Relay),
 }
 
 impl Cli {
@@ -244,47 +220,8 @@ impl Cli {
         self.providers
             .spawn_providers(&config, ready.clone(), locality.clone());
 
-        match self.command {
-            Some(Commands::Agent(agent)) => {
-                let old_ready = agent::Ready {
-                    provider_is_healthy: ready.clone(),
-                    relay_is_healthy: ready.clone(),
-                    ..<_>::default()
-                };
-                agent.run(locality, config, old_ready, shutdown_rx).await
-            }
-
-            Some(Commands::Proxy(runner)) => {
-                let old_ready = proxy::Ready {
-                    xds_is_healthy: parking_lot::RwLock::from(Some(ready.clone())).into(),
-                    ..<_>::default()
-                };
-                runner.run(config, old_ready, None, shutdown_rx).await
-            }
-
-            Some(Commands::Manage(manager)) => {
-                let old_ready = agent::Ready {
-                    provider_is_healthy: ready.clone(),
-                    is_manage: true,
-                    ..<_>::default()
-                };
-                manager.run(locality, config, old_ready, shutdown_rx).await
-            }
-
-            Some(Commands::Relay(relay)) => {
-                let old_ready = relay::Ready {
-                    provider_is_healthy: ready.clone(),
-                    ..<_>::default()
-                };
-
-                relay.run(locality, config, old_ready, shutdown_rx).await
-            }
-            None => {
-                self.service.spawn_services(&config, &shutdown_rx)?;
-                shutdown_rx.changed().await.map_err(From::from)
-            }
-            Some(_) => unreachable!(),
-        }
+        self.service.spawn_services(&config, &shutdown_rx)?;
+        shutdown_rx.changed().await.map_err(From::from)
     }
 
     /// Searches for the configuration file, and panics if not found.
@@ -294,12 +231,7 @@ impl Cli {
 
         let file = loop {
             let Some(path) = paths.next() else {
-                let cfg = if matches!(self.command, Some(Commands::Agent(..))) {
-                    Config::default_agent()
-                } else {
-                    Config::default_non_agent()
-                };
-                return Ok(Arc::new(cfg));
+                return Ok(<_>::default());
             };
 
             match std::fs::File::open(path) {
@@ -315,10 +247,7 @@ impl Cli {
             }
         };
 
-        Ok(Arc::new(crate::Config::from_reader(
-            file,
-            matches!(self.command, Some(Commands::Agent(..))),
-        )?))
+        Ok(Arc::new(crate::Config::from_reader(file)?))
     }
 }
 

diff --git a/src/cli/agent.rs b/src/cli/agent.rs