difftreelog
refactor more repl abstractions
in: trunk
11 files changed
cmds/fleet/src/better_nix_eval.rsdiffbeforeafterboth365#[derive(Clone)]365#[derive(Clone)]366pub struct NixSession(Arc<tokio::sync::Mutex<PooledConnection<NixSessionPoolInner>>>);366pub struct NixSession(Arc<tokio::sync::Mutex<PooledConnection<NixSessionPoolInner>>>);367368#[derive(Clone)]369pub struct NixExprBuilder {370 out: String,371 used_fields: Vec<Field>,372}373impl NixExprBuilder {374 pub fn object() -> Self {375 NixExprBuilder {376 out: "{ ".to_owned(),377 used_fields: Vec::new(),378 }379 }380 pub fn string(s: &str) -> Self {381 NixExprBuilder {382 out: nixlike::serialize(s)383 .expect("no problems with serializing_string")384 .trim_end()385 .to_owned(),386 used_fields: Vec::new(),387 }388 }389 pub fn serialized(v: impl Serialize) -> Self {390 let serialized = nixlike::serialize(v).expect("invalid value for apply");391 Self {392 out: serialized.trim_end().to_owned(),393 used_fields: Vec::new(),394 }395 }396 pub fn field(f: Field) -> Self {397 Self {398 out: format!("sess_field_{}", f.0.value.expect("no value")),399 used_fields: vec![f],400 }401 }402 pub fn end_obj(&mut self) {403 self.out.push('}');404 }405 pub fn obj_key(&mut self, name: Self, value: Self) {406 self.out.push_str(r#""${"#);407 self.extend(name);408 self.out.push_str(r#"}" = "#);409 self.extend(value);410 self.out.push_str("; ");411 }412413 pub fn extend(&mut self, e: Self) {414 self.out.push_str(&e.out);415 self.used_fields.extend(e.used_fields);416 }417418 pub fn session(&self) -> NixSession {419 let mut session = None;420 for ele in &self.used_fields {421 if session.is_none() {422 session = Some(ele.0.session.clone());423 continue;424 }425 let session = &session.as_ref().expect("checked").0;426 let ele_sess = &ele.0.session.0;427 assert!(428 Arc::ptr_eq(session, ele_sess),429 "can't mix fields from different session"430 );431 }432 session.expect("expr without fields used")433 }434 pub fn index_attr(&mut self, s: &str) {435 let escaped = nixlike::serialize(s).expect("string");436 self.out.push('.');437 self.out.push_str(escaped.trim_end());438 }439}367440368#[macro_export]441#[macro_export]369macro_rules! nix_path {442macro_rules! nix_expr_inner {370 (@o($o:ident) $var:ident $($tt:tt)*) => {{443 (Obj { $($ident:ident: $($val:tt)+),* $(,)? }) => {{371 $o.push(Index::var(stringify!($var)));444 use $crate::better_nix_eval::NixExprBuilder;445 let mut out = NixExprBuilder::object();446 $(447 out.obj_key(448 NixExprBuilder::string(stringify!($ident)),449 $crate::nix_expr_inner!($($val)+),450 );451 )*452 out.end_obj();453 out454 }};455 (@field($o:ident) . $var:ident $($tt:tt)*) => {{456 $o.index_attr(stringify!($var));457 nix_expr_inner!(@field($o) $($tt)*);458 }};459 (@field($o:ident) [{ $v:expr }] $($tt:tt)*) => {{460 $o.push(Index::attr(&$v));461 nix_expr_inner!(@o($o) $($tt)*);462 }};463 (@field($o:ident) [ $($var:tt)+ ] $($tt:tt)*) => {{464 $o.push(Index::Expr($crate::nix_expr_inner!($($var)+)));465 nix_expr_inner!(@o($o) $($tt)*);466 }};467 (@field($o:ident) ($($var:tt)*) $($tt:tt)*) => {468 $o.push(Index::ExprApply($crate::nix_expr_inner!($($var)+)));469 nix_expr_inner!(@o($o) $($tt)*);470 };471 (@field($o:ident)) => {};472 ($field:ident $($tt:tt)*) => {{473 use $crate::{better_nix_eval::NixExprBuilder, nix_expr_inner};474 #[allow(unused_mut, reason = "might be used if indexed")]475 let mut out = NixExprBuilder::field($field);476 nix_expr_inner!(@field(out) $($tt)*);477 out478 }};479 ($v:literal) => {{480 use $crate::better_nix_eval::NixExprBuilder;481 NixExprBuilder::string($v)482 }};483 ({$v:expr}) => {{484 use $crate::better_nix_eval::NixExprBuilder;485 NixExprBuilder::serialized(&$v)486 }}487}488#[macro_export]372 nix_path!(@o($o) $($tt)*);489macro_rules! nix_expr {373 }};374 (@o($o:ident) . $var:ident $($tt:tt)*) => {{490 ($($tt:tt)+) => {{375 $o.push(Index::attr(stringify!($var)));491 use $crate::{better_nix_eval::{NixExprBuilder, Field}, nix_expr_inner};376 nix_path!(@o($o) $($tt)*);492 let expr = nix_expr_inner!($($tt)+);493 Field::new(expr.session(), expr.out)377 }};494 }};495}496497#[macro_export]498macro_rules! nix_go {378 (@o($o:ident) . $var:literal $($tt:tt)*) => {{499 (@o($o:ident) . $var:ident $($tt:tt)*) => {{379 $o.push(Index::attr($var));500 $o.push(Index::attr(stringify!($var)));380 nix_path!(@o($o) $($tt)*);501 nix_go!(@o($o) $($tt)*);381 }};502 }};382 (@o($o:ident) . { $var:expr } $($tt:tt)*) => {{503 (@o($o:ident) [{ $v:expr }] $($tt:tt)*) => {{383 $o.push(Index::attr($var));504 $o.push(Index::attr(&$v));384 nix_path!(@o($o) $($tt)*);505 nix_go!(@o($o) $($tt)*);385 }};506 }};386 (@o($o:ident) [ $var:literal ] $($tt:tt)*) => {{507 (@o($o:ident) [ $($var:tt)+ ] $($tt:tt)*) => {{387 $o.push(Index::idx($var));508 $o.push(Index::Expr($crate::nix_expr_inner!($($var)+)));388 nix_path!(@o($o) $($tt)*);509 nix_go!(@o($o) $($tt)*);389 }};510 }};390 (@o($o:ident) ($e:expr) $($tt:tt)*) => {511 (@o($o:ident) ($($var:tt)*) $($tt:tt)*) => {391 $o.push(Index::apply($e));512 $o.push(Index::ExprApply($crate::nix_expr_inner!($($var)+)));392 nix_path!(@o($o) $($tt)*);513 nix_go!(@o($o) $($tt)*);393 };514 };394 (@o($o:ident)) => {};515 (@o($o:ident)) => {};395 ($($tt:tt)+) => {{516 ($field:ident $($tt:tt)+) => {{396 use $crate::{nix_path, better_nix_eval::Index};517 use $crate::{nix_go, better_nix_eval::Index};518 let field = $field.clone();397 let mut out = vec![];519 let mut out = vec![];398 nix_path!(@o(out) $($tt)*);520 nix_go!(@o(out) $($tt)*);399 out521 field.select(out).await?400 }}522 }}401}523}524#[macro_export]525macro_rules! nix_go_json {526 ($($tt:tt)*) => {{527 $crate::nix_go!($($tt)*).as_json().await?528 }};529}402530403#[derive(Clone)]531#[derive(Clone)]404pub enum Index {532pub enum Index {405 Var(String),533 Var(String),406 String(String),534 String(String),407 Apply(String),535 Apply(String),408 Idx(u32),536 Expr(NixExprBuilder),537 ExprApply(NixExprBuilder),409}538}410impl Index {539impl Index {411 pub fn var(v: impl AsRef<str>) -> Self {540 pub fn var(v: impl AsRef<str>) -> Self {419 pub fn attr(v: impl AsRef<str>) -> Self {548 pub fn attr(v: impl AsRef<str>) -> Self {420 Self::String(v.as_ref().to_owned())549 Self::String(v.as_ref().to_owned())421 }550 }422 pub fn idx(v: u32) -> Self {423 Self::Idx(v)424 }425 pub fn apply(v: impl Serialize) -> Self {551 pub fn apply(v: impl Serialize) -> Self {426 let serialized = nixlike::serialize(v).expect("invalid value for apply");552 let serialized = nixlike::serialize(v).expect("invalid value for apply");427 Self::Apply(serialized.trim_end().to_owned())553 Self::Apply(serialized.trim_end().to_owned())440 Index::Apply(o) => {566 Index::Apply(o) => {441 write!(f, "<apply>({o})")567 write!(f, "<apply>({o})")442 }568 }443 Index::Idx(i) => {569 Index::Expr(e) => {444 write!(f, "[{i}]")570 write!(f, "[{}]", e.out)445 }571 }572 Index::ExprApply(e) => {573 write!(f, "<apply>({})", e.out)574 }446 }575 }447 }576 }448}577}460 Ok(())589 Ok(())461 }590 }462}591}463pub struct Field {592struct FieldInner {464 full_path: Vec<Index>,593 full_path: Option<Vec<Index>>,465 session: NixSession,594 session: NixSession,466 value: Option<u32>,595 value: Option<u32>,467}596}597fn context(full_path: Option<&[Index]>, query: &str) -> String {598 if let Some(full_path) = &full_path {599 format!("full path: {}", PathDisplay(full_path))600 } else {601 format!("query: {query:?}")602 }603}604#[derive(Clone)]605pub struct Field(Arc<FieldInner>);468impl Field {606impl Field {469 fn root(session: NixSession) -> Self {607 fn root(session: NixSession) -> Self {470 Self {608 Self(Arc::new(FieldInner {471 full_path: vec![],609 full_path: Some(vec![]),472 session,610 session,473 value: None,611 value: None,474 }612 }))475 }613 }614 async fn new(session: NixSession, query: &str) -> Result<Self> {615 let vid = session616 .0617 .lock()618 .await619 .execute_assign(query)620 .await621 .with_context(|| context(None, query))?;622 Ok(Self(Arc::new(FieldInner {623 full_path: None,624 session,625 value: Some(vid),626 })))627 }476 pub async fn field(session: NixSession, field: &str) -> Result<Self> {628 pub async fn field(session: NixSession, field: &str) -> Result<Self> {477 Self::root(session)629 Self::root(session).select([Index::var(field)]).await478 .select([Index::var(field)])486 field.as_json().await636 field.as_json().await487 }637 }488 pub async fn select<'a>(&self, name: impl IntoIterator<Item = Index>) -> Result<Self> {638 pub async fn select<'a>(&self, name: impl IntoIterator<Item = Index>) -> Result<Self> {639 let mut used_fields = Vec::new();489 let mut name = name.into_iter();640 let mut name = name.into_iter();490641491 let mut full_path = self.full_path.clone();642 let mut full_path = self.0.full_path.clone();492 let mut query = if let Some(id) = self.value {643 let mut query = if let Some(id) = self.0.value {493 format!("sess_field_{id}")644 format!("sess_field_{id}")494 } else {645 } else {495 let first = name.next();646 let first = name.next();496 if let Some(Index::Var(i)) = first {647 if let Some(Index::Var(i)) = first {648 if let Some(full_path) = &mut full_path {497 full_path.push(Index::Var(i.clone()));649 full_path.push(Index::Var(i.clone()));650 }498 i.clone()651 i.clone()499 } else {652 } else {500 panic!("first path item should be variable, got {first:?}")653 panic!("first path item should be variable, got {first:?}")501 }654 }502 };655 };503 for v in name {656 for v in name {657 if let Some(full_path) = &mut full_path {504 full_path.push(v.clone());658 full_path.push(v.clone());659 }505 match v {660 match v {506 Index::Var(_) => panic!("var item may only be first"),661 Index::Var(_) => panic!("var item may only be first"),507 Index::String(s) => {662 Index::String(s) => {513 // In cases like `a {}.b` first `{}.b` will be evaluated, so `a {}` should be encased in `()`668 // In cases like `a {}.b` first `{}.b` will be evaluated, so `a {}` should be encased in `()`514 query = format!("({query} {a})");669 query = format!("({query} {a})");515 }670 }671 Index::Expr(e) => {672 let index = Field::new(self.0.session.clone(), &e.out).await?;673 used_fields.push(index.clone());674 query.push('.');675 let index = format!("${{sess_field_{}}}", index.0.value.expect("value"));676 query.push_str(&index);677 }516 Index::Idx(idx) => {678 Index::ExprApply(e) => {679 let index = Field::new(self.0.session.clone(), &e.out).await?;680 used_fields.push(index.clone());681 query.push(' ');682 let index = format!("sess_field_{}", index.0.value.expect("value"));683 query.push_str(&index);517 query = format!("builtins.elemAt ({query}) {idx}");684 query = format!("({query})");518 }685 }519 }686 }520 }687 }521688522 let vid = self689 let vid = self690 .0523 .session691 .session524 .0692 .0525 .lock()693 .lock()526 .await694 .await527 .execute_assign(&query)695 .execute_assign(&query)528 .await696 .await529 .with_context(|| format!("full path: {}", PathDisplay(&full_path)))?;697 .with_context(|| {698 if let Some(full_path) = &full_path {699 format!("full path: {}", PathDisplay(full_path))700 } else {701 format!("query: {query:?}")702 }703 })?;530 Ok(Self {704 Ok(Self(Arc::new(FieldInner {531 full_path,705 full_path,532 session: self.session.clone(),706 session: self.0.session.clone(),533 value: Some(vid),707 value: Some(vid),534 })708 })))535 }709 }536 pub async fn as_json<V: DeserializeOwned>(&self) -> Result<V> {710 pub async fn as_json<V: DeserializeOwned>(&self) -> Result<V> {537 let id = self.value.expect("can't serialize root field");711 let id = self.0.value.expect("can't serialize root field");712 let query = format!("sess_field_{id}");538 self.session713 self.0714 .session539 .0715 .0540 .lock()716 .lock()541 .await717 .await542 .execute_expression_to_json(&format!("sess_field_{id}"))718 .execute_expression_to_json(&query)543 .await719 .await544 .with_context(|| format!("full path: {}", PathDisplay(&self.full_path)))720 .with_context(|| context(self.0.full_path.as_deref(), &query))545 }721 }546 pub async fn list_fields(&self) -> Result<Vec<String>> {722 pub async fn list_fields(&self) -> Result<Vec<String>> {547 let id = self.value.expect("can't list root fields");723 let id = self.0.value.expect("can't list root fields");724 let query = format!("builtins.attrNames sess_field_{id}");548 self.session725 self.0726 .session549 .0727 .0550 .lock()728 .lock()551 .await729 .await552 .execute_expression_to_json(&format!("builtins.attrNames sess_field_{id}"))730 .execute_expression_to_json(&query)553 .await731 .await554 .with_context(|| format!("full path: {}", PathDisplay(&self.full_path)))732 .with_context(|| context(self.0.full_path.as_deref(), &query))555 }733 }556 pub async fn build(&self) -> Result<HashMap<String, PathBuf>> {734 pub async fn build(&self) -> Result<HashMap<String, PathBuf>> {557 let id = self.value.expect("can't use build on not-value");735 let id = self.0.value.expect("can't use build on not-value");736 let query = format!(":b sess_field_{id}");558 let vid = self737 let vid = self738 .0559 .session739 .session560 .0740 .0561 .lock()741 .lock()562 .await742 .await563 .execute_expression_raw(&format!(":b sess_field_{id}"), &mut NixHandler::default())743 .execute_expression_raw(&query, &mut NixHandler::default())564 .await?;744 .await?;565 ensure!(!vid.is_empty(), "build failed: {}", PathDisplay(&self.full_path));745 ensure!(746 !vid.is_empty(),747 "build failed: {}",748 context(self.0.full_path.as_deref(), &query),749 );566 let Some(vid) = vid.strip_prefix("This derivation produced the following outputs:\n")750 let Some(vid) = vid.strip_prefix("This derivation produced the following outputs:\n")567 else {751 else {576 Ok(outputs)760 Ok(outputs)577 }761 }578}762}579impl Drop for Field {763impl Drop for FieldInner {580 fn drop(&mut self) {764 fn drop(&mut self) {581 if let Some(id) = self.value {765 if let Some(id) = self.value {582 if let Ok(mut lock) = self.session.0.try_lock() {766 if let Ok(mut lock) = self.session.0.try_lock() {cmds/fleet/src/cmds/build_systems.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/build_systems.rs
+++ b/cmds/fleet/src/cmds/build_systems.rs
@@ -4,8 +4,8 @@
use crate::command::MyCommand;
use crate::host::Config;
-use crate::nix_path;
-use anyhow::{anyhow, Result, Context};
+use crate::nix_go;
+use anyhow::{anyhow, Result};
use clap::Parser;
use itertools::Itertools;
use tokio::{task::LocalSet, time::sleep};
@@ -290,12 +290,10 @@
async fn build_task(self, config: Config, host: String) -> Result<()> {
info!("building");
let action = Action::from(self.subcommand.clone());
- let drv = config
- .fleet_field
- .select(nix_path!(.buildSystems((serde_json::json!({
- "localSystem": config.local_system.clone(),
- }))).{action.build_attr()}.{&host}))
- .await.context("system attribute")?;
+ let fleet_field = &config.fleet_field;
+ let drv = nix_go!(fleet_field.buildSystems(Obj {
+ localSystem: { config.local_system.clone() }
+ }));
let outputs = drv.build().await.map_err(|e| {
if action.build_attr() == "sdImage" {
info!("sd-image build failed");
cmds/fleet/src/cmds/info.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/info.rs
+++ b/cmds/fleet/src/cmds/info.rs
@@ -1,7 +1,7 @@
use std::collections::BTreeSet;
use crate::host::Config;
-use crate::nix_path;
+use crate::nix_go_json;
use anyhow::{ensure, Result};
use clap::Parser;
@@ -37,12 +37,9 @@
InfoCmd::ListHosts { ref tagged } => {
'host: for host in config.list_hosts().await? {
if !tagged.is_empty() {
- let tags: Vec<String> = config
- .fleet_field
- .select(nix_path!(.configuredSystems.{&host.name}.config.tags))
- .await?
- .as_json()
- .await?;
+ let fleet_field = &config.fleet_field;
+ let tags: Vec<String> =
+ nix_go_json!(fleet_field.configuredSystems[{ host.name }].config.tags);
for tag in tagged {
if !tags.contains(tag) {
continue 'host;
@@ -64,20 +61,12 @@
let mut out = <BTreeSet<String>>::new();
let host = config.system_config(&host).await?;
if external {
- out.extend(
- host.select(nix_path!(.network.externalIps))
- .await?
- .as_json::<Vec<String>>()
- .await?,
- );
+ let data: Vec<String> = nix_go_json!(host.network.externalIps);
+ out.extend(data);
}
if internal {
- out.extend(
- host.select(nix_path!(.network.internalIps))
- .await?
- .as_json::<Vec<String>>()
- .await?,
- );
+ let data: Vec<String> = nix_go_json!(host.network.internalIps);
+ out.extend(data);
}
for ip in out {
data.push(ip);
cmds/fleet/src/cmds/secrets/mod.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/secrets/mod.rs
+++ b/cmds/fleet/src/cmds/secrets/mod.rs
@@ -1,9 +1,10 @@
use crate::{
fleetdata::{FleetSecret, FleetSharedSecret},
- host::Config, nix_path,
+ host::Config,
+ nix_go, nix_go_json,
};
-use anyhow::{bail, ensure, Context, Result};
-use chrono::Utc;
+use anyhow::{anyhow, bail, ensure, Context, Result};
+use chrono::{DateTime, Utc};
use clap::Parser;
use futures::{StreamExt, TryStreamExt};
use owo_colors::OwoColorize;
@@ -17,8 +18,8 @@
use tracing::{error, info, info_span, warn};
#[derive(Parser)]
-pub enum Secrets {
- /// Force load keys for all defined hosts
+pub enum Secret {
+ /// Force load host keys for all defined hosts
ForceKeys,
/// Add secret, data should be provided in stdin
AddShared {
@@ -29,14 +30,20 @@
/// Override secret if already present
#[clap(long)]
force: bool,
+ /// Secret public part
#[clap(long)]
public: Option<String>,
+ /// Load public part from specified file
#[clap(long)]
public_file: Option<PathBuf>,
+ /// Create a notification on secret expiration
+ #[clap(long)]
+ expires_at: Option<DateTime<Utc>>,
+
/// Secret with this name already exists, override its value while keeping the same owners.
#[clap(long)]
- readd: bool,
+ re_add: bool,
},
/// Add secret, data should be provided in stdin
Add {
@@ -81,12 +88,33 @@
prefer_identities: Vec<String>,
},
List {},
+ InvokeGenerator,
}
-impl Secrets {
+impl Secret {
pub async fn run(self, config: &Config) -> Result<()> {
match self {
- Secrets::ForceKeys => {
+ Secret::InvokeGenerator => {
+ let config_field = &config.config_unchecked_field;
+
+ let generate_impure =
+ nix_go!(config_field.sharedSecrets["kube-apiserver.pem"].generateImpure);
+ let on = nix_go!(generate_impure.on);
+ let call_package = nix_go!(
+ config_field.buildableSystems(Obj {
+ localSystem: { config.local_system.clone() }
+ })[on]
+ .config
+ .nixpkgs
+ .pkgs
+ .callPackage
+ );
+ let generator = nix_go!(call_package(generate_impure.generator));
+ let built = generator.build().await?;
+ // .as_json().await?;
+ dbg!(&built);
+ }
+ Secret::ForceKeys => {
for host in config.list_hosts().await? {
if config.should_skip(&host.name) {
continue;
@@ -94,19 +122,20 @@
config.key(&host.name).await?;
}
}
- Secrets::AddShared {
+ Secret::AddShared {
mut machines,
name,
force,
public,
public_file,
- readd,
+ expires_at,
+ re_add,
} => {
let exists = config.has_shared(&name);
- if exists && !force && !readd {
+ if exists && !force && !re_add {
bail!("secret already defined");
}
- if readd {
+ if re_add {
// Fixme: use clap to limit this usage
ensure!(!force, "--force and --readd are not compatible");
ensure!(exists, "secret doesn't exists");
@@ -137,7 +166,7 @@
.map(|r| Box::new(r) as Box<dyn age::Recipient + Send>)
.collect();
let mut encryptor = age::Encryptor::with_recipients(recipients)
- .expect("recipients provided")
+ .ok_or_else(|| anyhow!("no recipients provided"))?
.wrap_output(&mut encrypted)?;
io::copy(&mut Cursor::new(input), &mut encryptor)?;
encryptor.finish()?;
@@ -150,7 +179,7 @@
owners: machines,
secret: FleetSecret {
created_at: Utc::now(),
- expires_at: None,
+ expires_at,
secret,
public: match (public, public_file) {
(Some(v), None) => Some(v),
@@ -164,7 +193,7 @@
},
);
}
- Secrets::Add {
+ Secret::Add {
machine,
name,
force,
@@ -211,7 +240,7 @@
}
// TODO: Instead of using sudo, decode secret on remote machine
#[allow(clippy::await_holding_refcell_ref)]
- Secrets::Read {
+ Secret::Read {
name,
machine,
plaintext,
@@ -228,7 +257,7 @@
println!("{}", z85::encode(&data));
}
}
- Secrets::UpdateShared {
+ Secret::UpdateShared {
name,
machines,
mut add_machines,
@@ -321,7 +350,7 @@
secret.secret.secret = encrypted;
config.replace_shared(name, secret);
}
- Secrets::Regenerate { prefer_identities } => {
+ Secret::Regenerate { prefer_identities } => {
{
let expected_shared_set = config
.list_configured_shared()
@@ -337,10 +366,9 @@
for name in &config.list_shared() {
info!("updating secret: {name}");
let mut data = config.shared_secret(name)?;
- let expected_owners: Vec<String> = config
- .config_field
- .get_json_deep(nix_path!(sharedSecrets.{name}.expectedOwners))
- .await?;
+ let config_field = &config.config_field;
+ let expected_owners: Vec<String> =
+ nix_go_json!(config_field.sharedSecrets[{ name }].expectedOwners);
if expected_owners.is_empty() {
warn!("secret was removed from fleet config: {name}, removing from data");
to_remove.push(name.to_string());
@@ -350,10 +378,8 @@
let expected_set = expected_owners.iter().collect::<HashSet<_>>();
let should_remove = set.difference(&expected_set).next().is_some();
if set != expected_set {
- let owner_dependent: bool = config
- .config_field
- .get_json_deep(nix_path!(.sharedSecrets.{name}.ownerDependent))
- .await?;
+ let owner_dependent: bool =
+ nix_go_json!(config_field.sharedSecrets[{ name }].ownerDependent);
if !owner_dependent {
warn!("reencrypting secret '{name}' for new owner set");
// TODO: force regeneration
@@ -401,7 +427,7 @@
config.remove_shared(&k);
}
}
- Secrets::List {} => {
+ Secret::List {} => {
let _span = info_span!("loading secrets").entered();
let configured = config.list_configured_shared().await?;
#[derive(Tabled)]
cmds/fleet/src/command.rsdiffbeforeafterboth--- a/cmds/fleet/src/command.rs
+++ b/cmds/fleet/src/command.rs
@@ -337,6 +337,8 @@
if !text.is_empty()
&& text != "querying info about missing paths"
&& text != "copying 0 paths"
+ // Too much spam on lazy-trees branch
+ && !(text.starts_with("copying '") && text.ends_with("' to the store"))
{
let span = info_span!("job");
span.pb_start();
cmds/fleet/src/host.rsdiffbeforeafterboth--- a/cmds/fleet/src/host.rs
+++ b/cmds/fleet/src/host.rs
@@ -16,7 +16,7 @@
better_nix_eval::{Field, NixSessionPool},
command::MyCommand,
fleetdata::{FleetData, FleetSecret, FleetSharedSecret},
- nix_path,
+ nix_go, nix_go_json,
};
pub struct FleetConfigInternals {
@@ -29,6 +29,8 @@
pub fleet_field: Field,
/// fleet_config.configUnchecked
pub config_field: Field,
+ /// fleet_config.unchecked
+ pub config_unchecked_field: Field,
}
#[derive(Clone)]
@@ -95,12 +97,8 @@
}
pub async fn list_hosts(&self) -> Result<Vec<ConfigHost>> {
- let names = self
- .fleet_field
- .select(nix_path!(.configuredHosts))
- .await?
- .list_fields()
- .await?;
+ let fleet_field = &self.fleet_field;
+ let names = nix_go!(fleet_field.configuredHosts).list_fields().await?;
let mut out = vec![];
for name in names {
out.push(ConfigHost { name })
@@ -108,9 +106,8 @@
Ok(out)
}
pub async fn system_config(&self, host: &str) -> Result<Field> {
- self.fleet_field
- .select(nix_path!(.configuredSystems.{host}.config))
- .await
+ let fleet_field = &self.fleet_field;
+ Ok(nix_go!(fleet_field.configuredSystems[{ host }].config))
}
pub(super) fn data(&self) -> MutexGuard<FleetData> {
@@ -121,11 +118,8 @@
}
/// Shared secrets configured in fleet.nix or in flake
pub async fn list_configured_shared(&self) -> Result<Vec<String>> {
- self.config_field
- .select(nix_path!(.sharedSecrets))
- .await?
- .list_fields()
- .await
+ let config_field = &self.config_field;
+ nix_go!(config_field.sharedSecrets).list_fields().await
}
/// Shared secrets configured in fleet.nix
pub fn list_shared(&self) -> Vec<String> {
@@ -211,11 +205,10 @@
Ok(secret.clone())
}
pub async fn shared_secret_expected_owners(&self, secret: &str) -> Result<Vec<String>> {
- self.config_field
- .select(nix_path!(.sharedSecrets.{secret}.expectedOwners))
- .await?
- .as_json()
- .await
+ let config_field = &self.config_field;
+ Ok(nix_go_json!(
+ config_field.sharedSecrets[{ secret }].expectedOwners
+ ))
}
pub fn save(&self) -> Result<()> {
@@ -269,21 +262,15 @@
if self.local_system == "detect" {
let builtins_field = Field::field(root_field.clone(), "builtins").await?;
- let system = builtins_field
- .select(nix_path!(.currentSystem))
- .await?;
- self.local_system = system.as_json().await?;
+ self.local_system = nix_go_json!(builtins_field.currentSystem);
}
let local_system = self.local_system.clone();
let fleet_root = Field::field(root_field, "fleetConfigurations").await?;
- let fleet_field = fleet_root
- .select(nix_path!(.default))
- .await?;
- let config_field = fleet_field
- .select(nix_path!(.configUnchecked))
- .await?;
+ let fleet_field = nix_go!(fleet_root.default);
+ let config_field = nix_go!(fleet_field.configUnchecked);
+ let config_unchecked_field = nix_go!(fleet_field.unchecked);
let mut fleet_data_path = directory.clone();
fleet_data_path.push("fleet.nix");
@@ -298,6 +285,7 @@
nix_args,
fleet_field,
config_field,
+ config_unchecked_field,
})))
}
}
cmds/fleet/src/main.rsdiffbeforeafterboth--- a/cmds/fleet/src/main.rs
+++ b/cmds/fleet/src/main.rs
@@ -1,5 +1,5 @@
#![recursion_limit = "512"]
-#![feature(try_blocks)]
+#![feature(try_blocks, lint_reasons)]
pub(crate) mod cmds;
pub(crate) mod command;
@@ -17,7 +17,7 @@
use anyhow::{bail, Result};
use clap::Parser;
-use cmds::{build_systems::BuildSystems, info::Info, secrets::Secrets};
+use cmds::{build_systems::BuildSystems, info::Info, secrets::Secret};
use futures::future::LocalBoxFuture;
use futures::stream::FuturesUnordered;
use futures::TryStreamExt;
@@ -73,7 +73,7 @@
BuildSystems(BuildSystems),
/// Secret management
#[clap(subcommand)]
- Secrets(Secrets),
+ Secret(Secret),
/// Upload prefetch directory to the nix store
Prefetch(Prefetch),
/// Config parsing
@@ -92,7 +92,7 @@
async fn run_command(config: &Config, command: Opts) -> Result<()> {
match command {
Opts::BuildSystems(c) => c.run(config).await?,
- Opts::Secrets(s) => s.run(config).await?,
+ Opts::Secret(s) => s.run(config).await?,
Opts::Info(i) => i.run(config).await?,
Opts::Prefetch(p) => p.run(config).await?,
};
flake.lockdiffbeforeafterboth--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1694529238,
- "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -38,11 +38,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1698350982,
- "narHash": "sha256-zoEV8Ad3bOAejp0ys/mOpaHSWrzK+GupZwGGYfuWuEY=",
+ "lastModified": 1703705939,
+ "narHash": "sha256-9s2Ep3NyRDj9HUgfv2TQUwQEanRUAmeXkvKIr/o1XbY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "dd83f9de26ff7c0326468b659ea4729fa5cf6262",
+ "rev": "1ada32da4ba24d7310653c9ac54888bee463f455",
"type": "github"
},
"original": {
@@ -67,11 +67,11 @@
]
},
"locked": {
- "lastModified": 1698199907,
- "narHash": "sha256-n8RtHBIb0rLuYs4RDehW6mj6r6Yam/ODY1af/VCcurw=",
+ "lastModified": 1703643208,
+ "narHash": "sha256-UL4KO8JxnD5rOycwHqBAf84lExF1/VnYMDC7b/wpPDU=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "22b8d29fd22cfaa2c311e0d6fd8a0ed9c2a1152b",
+ "rev": "ce117f3e0de8262be8cd324ee6357775228687cf",
"type": "github"
},
"original": {
flake.nixdiffbeforeafterboth--- a/flake.nix
+++ b/flake.nix
@@ -3,35 +3,52 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/master";
- rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; };
- flake-utils = { url = "github:numtide/flake-utils"; };
+ rust-overlay = {
+ url = "github:oxalica/rust-overlay";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ flake-utils = {url = "github:numtide/flake-utils";};
};
- outputs = { self, rust-overlay, flake-utils, nixpkgs }: with nixpkgs.lib; rec {
- lib = import ./lib { inherit flake-utils; };
- } // flake-utils.lib.eachDefaultSystem (system:
- let
- pkgs = import nixpkgs
- {
- inherit system; overlays = [ (import rust-overlay) ];
- };
- llvmPkgs = pkgs.buildPackages.llvmPackages_11;
- rust = (pkgs.rustChannelOf { date = "2023-10-20"; channel = "nightly"; }).default.override { extensions = [ "rust-src" "rust-analyzer" ]; };
- rustPlatform = pkgs.makeRustPlatform { cargo = rust; rustc = rust; };
- in
- {
- packages = (import ./pkgs) pkgs pkgs;
- devShell = (pkgs.mkShell.override { stdenv = llvmPkgs.stdenv; }) {
- nativeBuildInputs = with pkgs; [
- rust
- lld
- cargo-edit
- cargo-udeps
- cargo-fuzz
+ outputs = {
+ self,
+ rust-overlay,
+ flake-utils,
+ nixpkgs,
+ }:
+ with nixpkgs.lib;
+ {
+ lib = import ./lib {inherit flake-utils;};
+ }
+ // flake-utils.lib.eachDefaultSystem (system: let
+ pkgs =
+ import nixpkgs
+ {
+ inherit system;
+ overlays = [(import rust-overlay)];
+ };
+ llvmPkgs = pkgs.buildPackages.llvmPackages_11;
+ rust =
+ (pkgs.rustChannelOf {
+ date = "2023-12-26";
+ channel = "nightly";
+ })
+ .default
+ .override {extensions = ["rust-src" "rust-analyzer"];};
+ in {
+ packages = (import ./pkgs) pkgs pkgs;
+ devShell = (pkgs.mkShell.override {stdenv = llvmPkgs.stdenv;}) {
+ nativeBuildInputs = with pkgs; [
+ rust
+ lld
+ cargo-edit
+ cargo-udeps
+ cargo-fuzz
+ cargo-watch
- pkg-config
- openssl
- bacon
- ];
- };
- });
+ pkg-config
+ openssl
+ bacon
+ ];
+ };
+ });
}
lib/default.nixdiffbeforeafterboth--- a/lib/default.nix
+++ b/lib/default.nix
@@ -10,80 +10,99 @@
fleetLib = import ./fleetLib.nix {
inherit nixpkgs hostNames;
};
- in
- let
- withData = data: rec {
- root = nixpkgs.lib.evalModules {
- modules = (import ../modules/fleet/_modules.nix) ++ [config data];
- specialArgs = {
- inherit nixpkgs fleetLib;
- };
- };
- failedAssertions = map (x: x.message) (nixpkgs.lib.filter (x: !x.assertion) root.config.assertions);
- rootAssertWarn =
- if failedAssertions != []
- then throw "Failed assertions:\n${nixpkgs.lib.concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}"
- else nixpkgs.lib.showWarnings root.config.warnings root;
- configuredHosts = rootAssertWarn.config.hosts;
- configuredSecrets = rootAssertWarn.config.secrets;
- configuredSystems = configuredSystemsWithExtraModules [];
- configuredSystemsWithExtraModules = extraModules:
- nixpkgs.lib.listToAttrs (
- map
- (
- name: {
- inherit name;
- value = nixpkgs.lib.nixosSystem {
- system = configuredHosts.${name}.system;
- modules = configuredHosts.${name}.modules ++ extraModules;
- specialArgs = {
- inherit fleetLib;
- fleet = fleetLib.hostsToAttrs (host: configuredSystems.${host}.config);
- };
+ in let
+ root = nixpkgs.lib.evalModules {
+ modules = (import ../modules/fleet/_modules.nix) ++ [config data];
+ specialArgs = {
+ inherit nixpkgs fleetLib;
+ };
+ };
+ failedAssertions = map (x: x.message) (nixpkgs.lib.filter (x: !x.assertion) root.config.assertions);
+ checkedRoot =
+ if failedAssertions != []
+ then throw "Fleet failed assertions:\n${nixpkgs.lib.concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}"
+ else nixpkgs.lib.showWarnings root.config.warnings root;
+ withData = {
+ root,
+ data,
+ }: rec {
+ configuredHosts = root.config.hosts;
+ configuredUncheckedHosts = root.config.hosts;
+ configuredSystems = configuredSystemsWithExtraModules [];
+ configuredSystemsWithExtraModules = extraModules:
+ nixpkgs.lib.listToAttrs (
+ map
+ (
+ name: {
+ inherit name;
+ value = nixpkgs.lib.nixosSystem {
+ system = configuredHosts.${name}.system;
+ modules = configuredHosts.${name}.modules ++ extraModules;
+ specialArgs = {
+ inherit fleetLib;
+ fleet = fleetLib.hostsToAttrs (host: configuredSystems.${host}.config);
};
- }
- )
- (builtins.attrNames rootAssertWarn.config.hosts)
- );
- buildSystems = {localSystem}: let
- buildConfigurationModule = {config, ...}: {
- # Equivalent to nixpkgs.localSystem
- # nixpkgs.system = localSystem;
- nixpkgs.buildPlatform.system = localSystem;
- };
- in {
- toplevel = builtins.mapAttrs (_name: value: value.config.system.build.toplevel) (configuredSystemsWithExtraModules [
- buildConfigurationModule
- ({...}: {
- buildTarget = "toplevel";
- })
- ]);
- sdImage = builtins.mapAttrs (_name: value: value.config.system.build.sdImage) (configuredSystemsWithExtraModules [
- buildConfigurationModule
- #(nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
- ({...}: {
- buildTarget = "sd-image";
- })
- ]);
- installationCd = builtins.mapAttrs (_name: value: value.config.system.build.isoImage) (configuredSystemsWithExtraModules [
- buildConfigurationModule
- (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
- ({lib, ...}: {
- buildTarget = "installation-cd";
- # Needed for https://github.com/NixOS/nixpkgs/issues/58959
- boot.supportedFilesystems = lib.mkForce ["btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs"];
- })
- ]);
+ };
+ }
+ )
+ (builtins.attrNames root.config.hosts)
+ );
+ buildableSystems = {localSystem}: let
+ buildConfigurationModule = {config, ...}: {
+ # Equivalent to nixpkgs.localSystem
+ # nixpkgs.system = localSystem;
+ nixpkgs.buildPlatform.system = localSystem;
+ };
+ in
+ configuredSystemsWithExtraModules [
+ buildConfigurationModule
+ ];
+ buildSystems = {localSystem}: let
+ buildConfigurationModule = {config, ...}: {
+ # Equivalent to nixpkgs.localSystem
+ # nixpkgs.system = localSystem;
+ nixpkgs.buildPlatform.system = localSystem;
};
- configUnchecked = root.config;
- };
- defaultData = withData data;
- in rec {
- inherit (defaultData) configuredHosts configuredSecrets configuredSystems buildSystems configUnchecked;
- injectData = data: let
- injectedData = withData data;
in {
- inherit (injectedData) configuredHosts configuredSecrets configuredSystems buildSystems configUnchecked;
+ toplevel = builtins.mapAttrs (_name: value: value.config.system.build.toplevel) (configuredSystemsWithExtraModules [
+ buildConfigurationModule
+ ({...}: {
+ buildTarget = "toplevel";
+ })
+ ]);
+ sdImage = builtins.mapAttrs (_name: value: value.config.system.build.sdImage) (configuredSystemsWithExtraModules [
+ buildConfigurationModule
+ #(nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
+ ({...}: {
+ buildTarget = "sd-image";
+ })
+ ]);
+ installationCd = builtins.mapAttrs (_name: value: value.config.system.build.isoImage) (configuredSystemsWithExtraModules [
+ buildConfigurationModule
+ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+ ({lib, ...}: {
+ buildTarget = "installation-cd";
+ # Needed for https://github.com/NixOS/nixpkgs/issues/58959
+ boot.supportedFilesystems = lib.mkForce ["btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs"];
+ })
+ ]);
};
+ configUnchecked = root.config;
+ };
+ defaultData = withData {
+ inherit data;
+ root = checkedRoot;
+ };
+ uncheckedData = withData {inherit data root;};
+ in rec {
+ inherit (defaultData) configuredHosts configuredSystems buildSystems configUnchecked buildableSystems;
+ unchecked = {
+ inherit (uncheckedData) configuredHosts configuredSystems buildSystems configUnchecked buildableSystems;
+ };
+ injectData = data: let
+ injectedData = withData data;
+ in {
+ inherit (injectedData) configuredHosts configuredSystems buildSystems configUnchecked;
};
+ };
}
modules/fleet/secrets.nixdiffbeforeafterboth--- a/modules/fleet/secrets.nix
+++ b/modules/fleet/secrets.nix
@@ -15,6 +15,9 @@
type = bool;
description = "Is this secret owner-dependent, and needs to be regenerated on ownership set change, or it may be just reencrypted";
};
+ generateImpure = mkOption {
+ type = unspecified;
+ };
generator = mkOption {
type = nullOr (submodule {
packages = mkOption {