From 72b9a126b81d9d41557c233387708c2bb640d13b Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Sun, 19 May 2024 20:43:46 -0400 Subject: feat(tvix/glue): Implement builtins.storePath This one's relatively simple - we just check if the store path exists, and if it does we make a new contextful string containing the store path as its only context element. Automatic testing seems tricky for this (I think?) so I tested it manually: tvix-repl> builtins.storePath /nix/store/yn46i4xx5alh7gs6fpkxk430i34rp2q9-hello-2.12.1 => "/nix/store/yn46i4xx5alh7gs6fpkxk430i34rp2q9-hello-2.12.1" :: string Change-Id: I8a0d9726e4102ab872c53c2419679c2c855a5a18 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11696 Tested-by: BuildkiteCI Autosubmit: aspen Reviewed-by: flokli --- tvix/eval/src/value/string.rs | 6 ++++ tvix/glue/src/builtins/errors.rs | 6 +++- tvix/glue/src/builtins/import.rs | 40 ++++++++++++++++++++++ tvix/glue/src/tests/empty-file | 0 .../src/tests/tvix_tests/eval-okay-storePath.exp | 1 + .../src/tests/tvix_tests/eval-okay-storePath.nix | 9 +++++ tvix/glue/src/tvix_store_io.rs | 2 +- 7 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 tvix/glue/src/tests/empty-file create mode 100644 tvix/glue/src/tests/tvix_tests/eval-okay-storePath.exp create mode 100644 tvix/glue/src/tests/tvix_tests/eval-okay-storePath.nix diff --git a/tvix/eval/src/value/string.rs b/tvix/eval/src/value/string.rs index 0b37d483b394..4f869eb00d7d 100644 --- a/tvix/eval/src/value/string.rs +++ b/tvix/eval/src/value/string.rs @@ -54,6 +54,12 @@ impl From> for NixContext { } } +impl From<[NixContextElement; N]> for NixContext { + fn from(value: [NixContextElement; N]) -> Self { + Self(HashSet::from(value)) + } +} + impl NixContext { /// Creates an empty context that can be populated /// and passed to form a contextful [NixString], albeit diff --git a/tvix/glue/src/builtins/errors.rs b/tvix/glue/src/builtins/errors.rs index f6d5745c56e2..af8a24e6abb8 100644 --- a/tvix/glue/src/builtins/errors.rs +++ b/tvix/glue/src/builtins/errors.rs @@ -4,7 +4,7 @@ use nix_compat::{ store_path::BuildStorePathError, }; use reqwest::Url; -use std::rc::Rc; +use std::{path::PathBuf, rc::Rc}; use thiserror::Error; use tvix_castore::import; @@ -65,8 +65,12 @@ pub enum FetcherError { pub enum ImportError { #[error("non-file '{0}' cannot be imported in 'flat' mode")] FlatImportOfNonFile(String), + #[error("hash mismatch at ingestion of '{0}', expected: '{1}', got: '{2}'")] HashMismatch(String, NixHash, NixHash), + + #[error("path '{}' is not in the Nix store", .0.display())] + PathNotInStore(PathBuf), } impl From for tvix_eval::ErrorKind { diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs index 4a15afa8142d..4a8a29b417df 100644 --- a/tvix/glue/src/builtins/import.rs +++ b/tvix/glue/src/builtins/import.rs @@ -104,11 +104,13 @@ async fn filtered_ingest( #[builtins(state = "Rc")] mod import_builtins { + use std::os::unix::ffi::OsStrExt; use std::rc::Rc; use super::*; use nix_compat::nixhash::{CAHash, NixHash}; + use nix_compat::store_path::StorePath; use tvix_eval::generators::Gen; use tvix_eval::{generators::GenCo, ErrorKind, Value}; use tvix_eval::{NixContextElement, NixString}; @@ -280,6 +282,44 @@ mod import_builtins { .into(), ) } + + #[builtin("storePath")] + async fn builtin_store_path( + state: Rc, + co: GenCo, + path: Value, + ) -> Result { + let p = std::str::from_utf8(match &path { + Value::String(s) => s.as_bytes(), + Value::Path(p) => p.as_os_str().as_bytes(), + _ => { + return Err(ErrorKind::TypeError { + expected: "string or path", + actual: path.type_of(), + }) + } + })?; + + let path_exists = if let Ok((store_path, sub_path)) = StorePath::from_absolute_path_full(p) + { + if !sub_path.as_os_str().is_empty() { + false + } else { + state.store_path_exists(store_path.as_ref()).await? + } + } else { + false + }; + + if !path_exists { + return Err(ImportError::PathNotInStore(p.into()).into()); + } + + Ok(Value::String(NixString::new_context_from( + [NixContextElement::Plain(p.into())].into(), + p, + ))) + } } pub use import_builtins::builtins as import_builtins; diff --git a/tvix/glue/src/tests/empty-file b/tvix/glue/src/tests/empty-file new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tvix/glue/src/tests/tvix_tests/eval-okay-storePath.exp b/tvix/glue/src/tests/tvix_tests/eval-okay-storePath.exp new file mode 100644 index 000000000000..e7d20f6631b1 --- /dev/null +++ b/tvix/glue/src/tests/tvix_tests/eval-okay-storePath.exp @@ -0,0 +1 @@ +{ contextMatches = true; hasContext = true; } diff --git a/tvix/glue/src/tests/tvix_tests/eval-okay-storePath.nix b/tvix/glue/src/tests/tvix_tests/eval-okay-storePath.nix new file mode 100644 index 000000000000..99205cb9e028 --- /dev/null +++ b/tvix/glue/src/tests/tvix_tests/eval-okay-storePath.nix @@ -0,0 +1,9 @@ +let + path = builtins.unsafeDiscardStringContext "${../empty-file}"; + storePath = builtins.storePath path; + context = builtins.getContext storePath; +in +{ + hasContext = builtins.hasContext storePath; + contextMatches = context == { "${path}" = { path = true; }; }; +} diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 7b8ef3ff0ac2..f32dea512ee3 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -421,7 +421,7 @@ impl EvalIO for TvixStoreIO { { if self .tokio_handle - .block_on(async { self.store_path_to_node(&store_path, &sub_path).await })? + .block_on(self.store_path_to_node(&store_path, &sub_path))? .is_some() { Ok(true) -- cgit 1.4.1