netdog: add commit subcommand

Signed-off-by: Kyle Sessions <kssessio@amazon.com>

Author: KCSesh

sources/netdog/src/cli/commit.rs

@@ -0,0 +1,66 @@
+use crate::cli::{error, Result};
+use argh::FromArgs;
+use snafu::ResultExt;
+use std::io::Read;
+use std::path::Path;
+
+/// Validate and commit network configuration from stdin
+#[derive(FromArgs, PartialEq, Debug)]
+#[argh(subcommand, name = "commit")]
+pub struct CommitArgs {}
+
+pub fn run(_args: CommitArgs) -> Result<()> {
+    // Read content from stdin
+    let mut content = String::new();
+    std::io::stdin()
+        .read_to_string(&mut content)
+        .context(error::StdinReadSnafu)?;
+
+    // Validate content
+    crate::net_config::deserialize_config(&content).context(error::StdinNetConfigParseSnafu)?;
+
+    // Write to file after successful validation
+    let config_dir = Path::new("/.bottlerocket");
+    let config_file = config_dir.join("net.toml");
+
+    // Ensure directory exists
+    if !config_dir.exists() {
+        return error::NetConfigDirMissingSnafu { path: config_dir }.fail();
+    }
+
+    std::fs::write(&config_file, content).context(error::PathReadSnafu { path: &config_file })?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io::Cursor;
+
+    #[test]
+    fn test_commit_invalid_version() {
+        let invalid_config = "version = 99\n\n[eth0]\ndhcp4 = true";
+        let mut stdin = Cursor::new(invalid_config.as_bytes());
+
+        let mut content = String::new();
+        stdin.read_to_string(&mut content).unwrap();
+
+        let result = crate::net_config::deserialize_config(&content);
+
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_commit_valid_config() {
+        let valid_config = "version = 3\n\n[enp0s16]\ndhcp4 = true\ndhcp6 = false\nprimary = true\n\n[enp0s17]\ndhcp4 = true\ndhcp6 = false";
+        let mut stdin = Cursor::new(valid_config.as_bytes());
+
+        let mut content = String::new();
+        stdin.read_to_string(&mut content).unwrap();
+
+        let result = crate::net_config::deserialize_config(&content);
+
+        assert!(result.is_ok());
+    }
+}

sources/netdog/src/cli/mod.rs

@@ -1,3 +1,4 @@
+pub(crate) mod commit;
 pub(crate) mod generate_hostname;
 pub(crate) mod generate_net_config;
 pub(crate) mod node_ip;
@@ -10,6 +11,7 @@ use crate::{
     DEFAULT_NET_CONFIG_FILE, KERNEL_CMDLINE, PRIMARY_INTERFACE, PRIMARY_MAC_ADDRESS,
     PRIMARY_SYSCTL_CONF, SYSCTL_MARKER_FILE, SYSTEMD_SYSCTL, SYS_CLASS_NET, USR_NET_CONFIG_FILE,
 };
+pub(crate) use commit::CommitArgs;
 pub(crate) use generate_hostname::GenerateHostnameArgs;
 pub(crate) use generate_net_config::GenerateNetConfigArgs;
 pub(crate) use node_ip::NodeIpArgs;
@@ -319,6 +321,15 @@ mod error {
             link: PathBuf,
             source: io::Error,
         },
+
+        #[snafu(display("Failed to read from stdin: {}", source))]
+        StdinRead { source: std::io::Error },
+
+        #[snafu(display("Failed to parse network config from stdin: {}", source))]
+        StdinNetConfigParse { source: net_config::Error },
+
+        #[snafu(display("Network config directory '{}' does not exist", path.display()))]
+        NetConfigDirMissing { path: PathBuf },
     }
 }
 

sources/netdog/src/main.rs

@@ -70,6 +70,7 @@ struct Args {
 #[derive(FromArgs, PartialEq, Debug)]
 #[argh(subcommand)]
 enum SubCommand {
+    Commit(cli::CommitArgs),
     NodeIp(cli::NodeIpArgs),
     GenerateHostname(cli::GenerateHostnameArgs),
     GenerateNetConfig(cli::GenerateNetConfigArgs),
@@ -81,6 +82,7 @@ enum SubCommand {
 async fn run() -> cli::Result<()> {
     let args: Args = argh::from_env();
     match args.subcommand {
+        SubCommand::Commit(args) => cli::commit::run(args)?,
         SubCommand::NodeIp(_) => cli::node_ip::run()?,
         SubCommand::GenerateHostname(_) => cli::generate_hostname::run().await?,
         SubCommand::GenerateNetConfig(_) => cli::generate_net_config::run()?,

sources/netdog/src/net_config/mod.rs

@@ -103,7 +103,7 @@ where
 
 /// Deserialize the network config, using the version key to determine which config struct to
 /// deserialize into
-fn deserialize_config(config_str: &str) -> Result<Box<dyn Interfaces>> {
+pub fn deserialize_config(config_str: &str) -> Result<Box<dyn Interfaces>> {
     #[derive(Debug, Deserialize)]
     struct ConfigToml {
         version: u8,