git.delta.rocks / jrsonnet / refs/commits / 347bd4a9df43

--- a/cmds/fleet/src/main.rs
+++ b/cmds/fleet/src/main.rs
@@ -203,7 +203,13 @@
 		.map(|a| extra_args::parse_os(&a))
 		.transpose()?
 		.unwrap_or_default();
-	let config = opts.fleet_opts.build(nix_args).await?;
+	let config = opts
+		.fleet_opts
+		.build(
+			nix_args,
+			matches!(opts.command, Opts::Deploy(_) | Opts::BuildSystems(_)),
+		)
+		.await?;
 
 	match run_command(&config, opts.fleet_opts, opts.command).await {
 		Ok(()) => {

181	}181	}
182182
183	// TODO: Config should be detached from opts.183	// TODO: Config should be detached from opts.
184	pub async fn build(&self, nix_args: Vec<OsString>) -> Result<Config> {184	pub async fn build(&self, nix_args: Vec<OsString>, assert: bool) -> Result<Config> {
185		let directory = current_dir()?;185		let directory = current_dir()?;
186186
187		let pool = NixSessionPool::new(187		let pool = NixSessionPool::new(
204204
205		let config_field = nix_go!(fleet_field.config);205		let config_field = nix_go!(fleet_field.config);
206206
207		if assert {
207		assert_warn("fleet config evaluation", &config_field).await?;208			assert_warn("fleet config evaluation", &config_field).await?;
209		}
208210
209		let import = nix_go!(builtins_field.import);211		let import = nix_go!(builtins_field.import);
210		let overlays = nix_go!(config_field.nixpkgs.overlays);212		let overlays = nix_go!(config_field.nixpkgs.overlays);

--- a/crates/nix-eval/src/util.rs
+++ b/crates/nix-eval/src/util.rs
@@ -1,17 +1,19 @@
+use std::time::Instant;
+
 use anyhow::bail;
 use tracing::{debug, warn};
-use std::time::Instant;
 
 use crate::{nix_go_json, Value};
 
+#[tracing::instrument(level = "info", skip(val))]
 pub async fn assert_warn(action: &str, val: &Value) -> anyhow::Result<()> {
 	let before_errors = Instant::now();
 	let errors: Vec<String> = nix_go_json!(val.errors);
 	debug!("errors evaluation took {:?}", before_errors.elapsed());
 	if !errors.is_empty() {
 		bail!(
-			"{action} failed with error{}{}",
-			(errors.len() != 1).then_some("s:\n- ").unwrap_or(": "),
+			"failed with error{}{}",
+			if errors.len() != 1 { "s:\n- " } else { ": " },
 			errors.join("\n- "),
 		);
 	}
@@ -21,8 +23,8 @@
 	debug!("warnings evaluation took {:?}", before_errors.elapsed());
 	if !warnings.is_empty() {
 		warn!(
-			"{action} completed with warning{}{}",
-			(warnings.len() != 1).then_some("s:\n- ").unwrap_or(": "),
+			"completed with warning{}{}",
+			if warnings.len() != 1 { "s:\n- " } else { ": " },
 			warnings.join("\n- "),
 		);
 	}

--- a/modules/secrets-data.nix
+++ b/modules/secrets-data.nix
@@ -52,6 +52,7 @@
         default = null;
       };
     };
+    config = {};
   };
 
   hostSecretData = {
@@ -78,6 +79,7 @@
         default = null;
       };
     };
+    config = {};
   };
 in {
   options.data = mkDataOption ({config, ...}: {