stdout

wakey-agent/src/cli.rs

@@ -64,9 +64,13 @@ pub struct EnrollArgs {
 
 #[derive(Args)]
 pub struct InitConfigArgs {
-    /// Path to the agent config file to write.
-    #[arg(long, default_value = config::DEFAULT_CONFIG_PATH)]
-    pub config: PathBuf,
+    /// Path to the agent config file to write. If omitted, config is printed to stdout.
+    #[arg(long)]
+    pub config: Option<PathBuf>,
+
+    /// Print config to stdout.
+    #[arg(long, conflicts_with = "config")]
+    pub stdout: bool,
 
     /// Base HTTPS URL of the control plane.
     #[arg(long)]

wakey-agent/src/main.rs

@@ -36,7 +36,6 @@ async fn main() -> Result<()> {
             }
         }
         Command::InitConfig(args) => {
-            ::tracing::info!(config = %args.config.display(), force = args.force, "wakey-agent command: init-config");
             init_config(args)?
         }
         Command::Reload(args) => {
@@ -49,12 +48,18 @@ async fn main() -> Result<()> {
 }
 
 fn init_config(args: InitConfigArgs) -> Result<()> {
-    if args.config.exists() && !args.force {
+    if args.stdout && args.config.is_some() {
+        anyhow::bail!("--stdout cannot be used with --config");
+    }
+
+    if let Some(config) = &args.config {
+        if config.exists() && !args.force {
             anyhow::bail!(
                 "config {} already exists; re-run with --force to overwrite",
-            args.config.display()
+                config.display()
             );
         }
+    }
 
     let cfg = config::AgentConfig {
         server_url: args
@@ -70,8 +75,13 @@ fn init_config(args: InitConfigArgs) -> Result<()> {
         reconnect_max_ms: 30_000,
     };
 
-    config::save_config(&args.config, &cfg)?;
-    println!("config={}", args.config.display());
-    println!("next=wakey-agent serve --config {}", args.config.display());
+    if let Some(path) = &args.config {
+        config::save_config(path, &cfg)?;
+        println!("config={}", path.display());
+        println!("next=wakey-agent serve --config {}", path.display());
+    } else {
+        let rendered = toml::to_string_pretty(&cfg)?;
+        print!("{}", rendered);
+    }
     Ok(())
 }

wakey-control-plane/src/cli.rs

@@ -31,7 +31,7 @@ pub struct Cli {
 pub enum Command {
     /// Run the control-plane daemon.
     Serve(ServeArgs),
-    /// Write a control-plane config scaffold.
+    /// Render a control-plane config scaffold.
     InitConfig(InitConfigArgs),
     /// Create a new enroll token for provisioning a router.
     IssueEnrollToken(IssueEnrollTokenArgs),
@@ -80,8 +80,11 @@ pub struct ServeArgs {
 
 #[derive(Args, Clone)]
 pub struct InitConfigArgs {
-    #[arg(long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config_file: PathBuf,
+    #[arg(long = "config-file", alias = "config")]
+    pub config_file: Option<PathBuf>,
+
+    #[arg(long, conflicts_with = "config_file")]
+    pub stdout: bool,
 
     #[arg(long)]
     pub data_dir: Option<PathBuf>,

wakey-control-plane/src/config/init.rs

@@ -6,13 +6,19 @@ use crate::cli::{InitConfigArgs, ServeArgs};
 use crate::config::resolve::{normalize_public_url, resolve_path};
 use crate::config::types::{WritableConfig, WritableTelemetry};
 
-pub fn write_init_config(args: &InitConfigArgs) -> Result<()> {
-    if args.config_file.exists() && !args.force {
+pub fn write_init_config(args: &InitConfigArgs) -> Result<Option<PathBuf>> {
+    if args.stdout && args.config_file.is_some() {
+        anyhow::bail!("--stdout cannot be used with --config-file");
+    }
+
+    if let Some(config_file) = &args.config_file {
+        if config_file.exists() && !args.force {
             anyhow::bail!(
                 "config {} already exists; re-run with --force to overwrite",
-            args.config_file.display()
+                config_file.display()
             );
         }
+    }
 
     let bind = args.bind.unwrap_or_else(|| {
         "0.0.0.0:8080"
@@ -61,15 +67,21 @@ pub fn write_init_config(args: &InitConfigArgs) -> Result<()> {
         },
     };
 
-    if let Some(parent) = args.config_file.parent() {
+    let rendered = toml::to_string_pretty(&body).context("failed to render config template")?;
+
+    if let Some(config_file) = &args.config_file {
+        if let Some(parent) = config_file.parent() {
             std::fs::create_dir_all(parent)
                 .with_context(|| format!("failed to create config dir {}", parent.display()))?;
         }
 
-    let rendered = toml::to_string_pretty(&body).context("failed to render config template")?;
-    std::fs::write(&args.config_file, rendered)
-        .with_context(|| format!("failed to write config {}", args.config_file.display()))?;
-    Ok(())
+        std::fs::write(config_file, rendered)
+            .with_context(|| format!("failed to write config {}", config_file.display()))?;
+        return Ok(Some(config_file.clone()));
+    }
+
+    print!("{}", rendered);
+    Ok(None)
 }
 
 pub fn bootstrap_config_if_missing(args: &ServeArgs) -> Result<bool> {
@@ -78,7 +90,8 @@ pub fn bootstrap_config_if_missing(args: &ServeArgs) -> Result<bool> {
     }
 
     let init = InitConfigArgs {
-        config_file: args.config_file.clone(),
+        config_file: Some(args.config_file.clone()),
+        stdout: false,
         data_dir: args.data_dir.clone(),
         bind: args.bind,
         public_url: args.public_url.clone(),

wakey-control-plane/src/main.rs

@@ -30,13 +30,10 @@ async fn main() -> Result<()> {
             runtime::serve(daemon).await
         }
         Command::InitConfig(args) => {
-            tracing::init(cli.verbose, &config::TelemetryConfig::default())?;
-            config::write_init_config(&args)?;
-            println!("config={}", args.config_file.display());
-            println!(
-                "next=wakey-control-plane serve --config-file {}",
-                args.config_file.display()
-            );
+            if let Some(path) = config::write_init_config(&args)? {
+                println!("config={}", path.display());
+                println!("next=wakey-control-plane serve --config-file {}", path.display());
+            }
             Ok(())
         }
         Command::IssueEnrollToken(args) => {

wakey-control-plane/src/runtime/admin.rs

@@ -16,7 +16,7 @@ pub async fn issue_enroll_token(args: IssueEnrollTokenArgs) -> Result<()> {
         let ttl_seconds = settings.ttl.as_secs().max(1);
         let endpoint = format!(
             "{}?ttl_seconds={ttl_seconds}",
-            config::issue_token_endpoint(&base)
+            config::issue_token_endpoint(base)
         );
         tracing::info!(endpoint = %endpoint, "requesting live enroll token from running control-plane daemon");
         let client = reqwest::Client::new();