5 files changed
--- a/src/cmds/build_systems.rs
+++ b/src/cmds/build_systems.rs
@@ -1,14 +1,33 @@
+use std::process::Command;
+
use crate::{
+ command::CommandExt,
db::{keys::list_hosts, secret::SecretDb, Db, DbData},
- nix::{NixBuild, NixCopy, HOSTS_ATTRIBUTE, SYSTEMS_ATTRIBUTE},
+ nix::SYSTEMS_ATTRIBUTE,
};
use anyhow::Result;
use clap::Clap;
-use log::info;
+use log::{info, warn};
#[derive(Clap)]
-pub struct BuildSystems {}
+pub struct BuildSystems {
+ /// Hosts to skip
+ #[clap(long, number_of_values = 1)]
+ skip: Vec<String>,
+ #[clap(subcommand)]
+ subcommand: Option<Subcommand>,
+}
+#[derive(Clap)]
+enum Subcommand {
+ /// Switch to built system until reboot
+ Test,
+ /// Switch to built system after reboot
+ Boot,
+ /// test + boot
+ Switch,
+}
+
impl BuildSystems {
pub fn run(self) -> Result<()> {
let db = Db::new(".fleet")?;
@@ -16,16 +35,47 @@
let data = SecretDb::open(&db)?.generate_nix_data()?;
for host in hosts.iter() {
+ if self.skip.contains(host) {
+ warn!("Skipping host {}", host);
+ continue;
+ }
info!("Building host {}", host);
- let path = NixBuild::new(format!(
- "{}.{}.config.system.build.toplevel",
- SYSTEMS_ATTRIBUTE, host,
- ))
- .env("SECRET_DATA".into(), data.clone())
- .run()?;
- info!("{:?}", path.path());
- NixCopy::new(path.path().to_owned()).to(format!("ssh://root@{}", host))?;
- std::thread::sleep_ms(9999999)
+ let built = tempfile::tempdir()?;
+ Command::new("nix")
+ .inherit_stdio()
+ .arg("build")
+ .arg(format!(
+ "{}.{}.config.system.build.toplevel",
+ SYSTEMS_ATTRIBUTE, host,
+ ))
+ .arg("--no-link")
+ .arg("--out-link")
+ .arg(built.path())
+ .arg("--impure")
+ .env("SECRET_DATA", data.clone())
+ .run()?;
+ info!("Uploading system closure");
+ let full_path = std::fs::canonicalize(built.path())?;
+ info!("{:?}", full_path);
+ Command::new("nix")
+ .inherit_stdio()
+ .arg("copy")
+ .arg(full_path)
+ .arg("--to")
+ .arg(format!("ssh://root@{}", host))
+ .run()?;
+ match self.subcommand {
+ Some(Subcommand::Test) => {
+ info!("Setting system to test")
+ }
+ Some(Subcommand::Boot) => {
+ info!("Setting system to switch on boot")
+ }
+ Some(Subcommand::Switch) => {
+ info!("Switching to configuration")
+ }
+ _ => {}
+ }
}
Ok(())
}
1use std::{2 ffi::OsStr,3 process::{Command, Stdio},4};56use anyhow::{Context, Result};7use serde::Deserialize;89pub struct CommandOutput(pub Vec<u8>);10impl CommandOutput {11 pub fn into_json<'d, T: Deserialize<'d>>(&'d self) -> Result<T> {12 let str = self.as_str().ok();13 Ok(serde_json::from_slice(&self.0).with_context(|| format!("{:?}", str))?)14 }15 pub fn as_str(&self) -> Result<&str> {16 Ok(std::str::from_utf8(&self.0)?)17 }18}1920pub fn ssh_command<I, S>(host: impl AsRef<OsStr>, command: I) -> Result<CommandOutput>21where22 I: IntoIterator<Item = S>,23 S: AsRef<OsStr>,24{25 let out = Command::new("ssh")26 .stderr(Stdio::inherit())27 .arg(host)28 .args(command)29 .output()?;30 if !out.status.success() {31 anyhow::bail!("command failed");32 }33 Ok(CommandOutput(out.stdout))34}
--- a/src/db/keys.rs
+++ b/src/db/keys.rs
@@ -1,20 +1,21 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, process::Command};
use anyhow::Result;
use log::*;
-use crate::{
- command::ssh_command,
- nix::{NixEval, HOSTS_ATTRIBUTE},
-};
+use crate::{command::CommandExt, nix::HOSTS_ATTRIBUTE};
use serde::{Deserialize, Serialize};
use super::db::DbData;
pub fn list_hosts() -> Result<Vec<String>> {
- Ok(NixEval::new(HOSTS_ATTRIBUTE.into())
- .apply("builtins.attrNames".into())
+ Ok(Command::new("nix")
+ .inherit_stdio()
+ .arg("eval")
+ .arg(HOSTS_ATTRIBUTE)
+ .arg("--apply")
+ .arg("builtins.attrNames")
.run_json()?)
}
@@ -29,10 +30,9 @@
impl KeyDb {
pub fn fetch_key(&mut self, host: &str) -> Result<()> {
info!("Fetching key for {}", host);
- let key = ssh_command(host, &["cat", "/etc/ssh/ssh_host_ed25519_key.pub"])?
- .as_str()?
- .trim()
- .to_owned();
+ let key = Command::ssh_on(host, "cat")
+ .arg("/etc/ssh/ssh_host_ed25519_key.pub")
+ .run_string()?;
self.host_keys.insert(host.to_owned(), key);
Ok(())
}
--- a/src/db/secret.rs
+++ b/src/db/secret.rs
@@ -1,9 +1,10 @@
-use crate::nix::{NixBuild, NixEval, SECRETS_ATTRIBUTE};
+use crate::{command::CommandExt, nix::SECRETS_ATTRIBUTE};
use anyhow::{bail, Result};
use log::info;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::{
collections::{BTreeMap, BTreeSet, HashMap},
+ process::Command,
time::Instant,
time::SystemTime,
};
@@ -18,14 +19,17 @@
renew_in: Option<u64>,
}
pub fn list_secrets() -> Result<HashMap<String, SecretListData>> {
- NixEval::new(format!("{}", SECRETS_ATTRIBUTE))
- .apply(
+ Command::new("nix")
+ .inherit_stdio()
+ .arg("eval")
+ .arg(SECRETS_ATTRIBUTE)
+ .arg("--apply")
+ .arg(
r#"
s: (builtins.mapAttrs (n: {owners, expireIn, ...}: {
inherit owners expireIn;
}) s)
- "#
- .into(),
+ "#,
)
.run_json()
}
@@ -122,9 +126,17 @@
let renew_at = data
.renew_in
.map(|hours| created_at + Duration::hours(hours as i64));
- let built = NixBuild::new(format!("{}.{}.generator", SECRETS_ATTRIBUTE, secret))
- .env("RAGE_KEYS".into(), rage_keys)
- .env("IMPURITY_SOURCE".into(), format!("{:?}", Instant::now()))
+ let built = tempfile::tempdir()?;
+ Command::new("nix")
+ .inherit_stdio()
+ .arg("build")
+ .arg(format!("{}.{}.generator", SECRETS_ATTRIBUTE, secret))
+ .arg("--no-link")
+ .arg("--out-link")
+ .arg(built.path())
+ .arg("--impure")
+ .env("RAGE_KEYS", rage_keys)
+ .env("IMPURITY_SOURCE", format!("{:?}", Instant::now()))
.run()?;
let path = built.path().to_owned();
let mut secret_data = SecretData {
--- a/src/nix.rs
+++ b/src/nix.rs
@@ -1,172 +1,3 @@
-use std::{
- collections::HashMap,
- ffi::OsStr,
- path::PathBuf,
- process::{Command, Stdio},
-};
-
-use anyhow::Result;
-use serde::de::DeserializeOwned;
-
-use crate::command::CommandOutput;
-
pub const HOSTS_ATTRIBUTE: &str = ".#fleetConfigurations.default.configuredHosts";
pub const SECRETS_ATTRIBUTE: &str = ".#fleetConfigurations.default.configuredSecrets";
pub const SYSTEMS_ATTRIBUTE: &str = ".#fleetConfigurations.default.configuredSystems";
-
-pub struct NixCopy {
- closure: PathBuf,
-}
-impl NixCopy {
- pub fn new(closure: PathBuf) -> Self {
- Self { closure }
- }
- fn run_internal(&self, f: impl Fn(&mut Command)) -> Result<CommandOutput> {
- let mut cmd = Command::new("nix");
- cmd.stderr(Stdio::inherit())
- .arg("copy")
- .arg("--substitute-on-destination")
- .arg(&self.closure);
- f(&mut cmd);
-
- let out = cmd.output()?;
- if !out.status.success() {
- anyhow::bail!("nix copy failed");
- }
- Ok(CommandOutput(out.stdout))
- }
- pub fn from(&self, from: impl AsRef<OsStr>) -> Result<()> {
- let from = from.as_ref();
- self.run_internal(|cmd| {
- cmd.arg("--from").arg(from);
- })?;
- Ok(())
- }
- pub fn to(&self, to: impl AsRef<OsStr>) -> Result<()> {
- let to = to.as_ref();
- self.run_internal(|cmd| {
- cmd.arg("--to").arg(to);
- })?;
- Ok(())
- }
-}
-
-pub struct NixBuild {
- attribute: String,
- impure: bool,
- env: HashMap<String, String>,
-}
-
-impl NixBuild {
- pub fn new(attribute: String) -> Self {
- Self {
- attribute,
- impure: false,
- env: HashMap::new(),
- }
- }
- pub fn env(&mut self, name: String, value: String) -> &mut Self {
- self.impure = true;
- self.env.insert(name, value);
- self
- }
- pub fn run(&self) -> Result<tempfile::TempDir> {
- let dir = tempfile::tempdir()?;
- std::fs::remove_dir(dir.path())?;
- let mut cmd = Command::new("nix");
- cmd.stderr(Stdio::inherit())
- .arg("build")
- .arg(&self.attribute)
- .arg("--no-link")
- .arg("--out-link")
- .arg(dir.path());
- if self.impure {
- cmd.arg("--impure");
- }
- if !self.env.is_empty() {
- cmd.envs(&self.env);
- }
-
- let out = cmd.output()?;
- if !out.status.success() {
- anyhow::bail!("nix eval failed");
- }
- Ok(dir)
- }
-}
-
-#[derive(Default)]
-pub struct NixEval {
- attribute: String,
- impure: bool,
- apply: Option<String>,
- env: HashMap<String, String>,
-}
-
-impl NixEval {
- pub fn new(attribute: String) -> Self {
- Self {
- attribute,
- ..Default::default()
- }
- }
- pub fn impure(&mut self) -> &mut Self {
- self.impure = true;
- self
- }
- /// This is the only and impure way to pass something to flake
- /// - https://github.com/NixOS/nix/issues/3949
- /// - https://github.com/NixOS/nixpkgs/issues/101101
- pub fn env(&mut self, name: String, value: String) -> &mut Self {
- self.impure = true;
- self.env.insert(name, value);
- self
- }
- pub fn apply(&mut self, apply: String) -> &mut Self {
- self.apply = Some(apply);
- self
- }
- fn run_internal(&self, f: impl Fn(&mut Command)) -> Result<CommandOutput> {
- let mut cmd = Command::new("nix");
- cmd.stderr(Stdio::inherit())
- .arg("eval")
- .arg("--show-trace")
- .arg(&self.attribute);
- if let Some(apply) = &self.apply {
- cmd.arg("--apply").arg(apply);
- };
- if self.impure {
- cmd.arg("--impure");
- }
- if !self.env.is_empty() {
- cmd.envs(&self.env);
- }
- f(&mut cmd);
-
- let out = cmd.output()?;
- if !out.status.success() {
- anyhow::bail!("nix eval failed");
- }
- Ok(CommandOutput(out.stdout))
- }
- pub fn run(&self) -> Result<String> {
- Ok(self.run_internal(|_cmd| {})?.as_str()?.to_owned())
- }
- pub fn run_json<T: DeserializeOwned>(&self) -> Result<T> {
- Ok(serde_json::from_slice(
- &self
- .run_internal(|cmd| {
- cmd.arg("--json");
- })?
- .0,
- )?)
- }
- pub fn run_raw(&self) -> Result<String> {
- Ok(self
- .run_internal(|cmd| {
- cmd.arg("--raw");
- })?
- .as_str()?
- .to_owned())
- }
-}