Skip to content

Kris/various nix fixes #6344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krisajenkins wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Kris/various nix fixes #6344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2096243
Update the rust-overlay flake input for Rust 1.97.1.
krisajenkins Sep 28, 2026
5353edb
Pinning the wasm-bindgen version for nix users.
krisajenkins Oct 11, 2026
3d99808
Resolve test tools from PATH instead of hardcoding /bin/cat and /usr/…
krisajenkins Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions crates/cli/src/schema_extract/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ fn inspector(script: &str) -> (tempfile::TempDir, PathBuf) {
(dir, path)
}

// Inspectors run with an empty environment, so their scripts must name tools by
// absolute path. Resolve them from the test's own PATH rather than assuming a
// filesystem layout: Nix build sandboxes have neither /bin/cat nor /usr/bin/head.
#[cfg(unix)]
fn tool(name: &str) -> String {
std::env::var_os("PATH")
.and_then(|paths| {
std::env::split_paths(&paths)
.map(|dir| dir.join(name))
.find(|path| path.is_file())
})
.unwrap_or_else(|| panic!("`{name}` not found on PATH"))
.display()
.to_string()
}

#[cfg(unix)]
#[tokio::test]
async fn local_inspection_passes_exact_bytes_host_and_requires_success() {
Expand All @@ -95,7 +111,8 @@ async fn local_inspection_passes_exact_bytes_host_and_requires_success() {
});
let json = serde_json::to_string(&SerdeWrapper(raw)).unwrap();
let (dir, extractor) = inspector(&format!(
"[ \"$1\" = extract-schema ] && [ \"$3\" = --host-type ] && [ \"$4\" = js ] || exit 2\n[ \"$(/bin/cat \"$2\")\" = exact-artifact ] || exit 3\nprintf '%s' '{}'", json.replace('\'', "'\\''")
"[ \"$1\" = extract-schema ] && [ \"$3\" = --host-type ] && [ \"$4\" = js ] || exit 2\n[ \"$({cat} \"$2\")\" = exact-artifact ] || exit 3\nprintf '%s' '{}'", json.replace('\'', "'\\''"),
cat = tool("cat"),
));
let result = inspect_with(
extractor,
Expand Down Expand Up @@ -126,7 +143,8 @@ async fn synchronous_generate_adapter_uses_same_exact_byte_protocol_inside_a_run
});
let json = serde_json::to_string(&SerdeWrapper(raw)).unwrap();
let (_dir, extractor) = inspector(&format!(
"[ \"$1\" = extract-schema ] && [ \"$3\" = --host-type ] && [ \"$4\" = wasm ] || exit 2\n[ \"$(/bin/cat \"$2\")\" = generate-exact ] || exit 3\nprintf '%s' '{}'", json.replace('\'', "'\\''")
"[ \"$1\" = extract-schema ] && [ \"$3\" = --host-type ] && [ \"$4\" = wasm ] || exit 2\n[ \"$({cat} \"$2\")\" = generate-exact ] || exit 3\nprintf '%s' '{}'", json.replace('\'', "'\\''"),
cat = tool("cat"),
));
let module = inspect_blocking(extractor, b"generate-exact".to_vec(), "Wasm".into()).unwrap();
assert_eq!(module.environment(), &schema());
Expand All @@ -135,15 +153,23 @@ async fn synchronous_generate_adapter_uses_same_exact_byte_protocol_inside_a_run
#[cfg(unix)]
#[tokio::test]
async fn invalid_and_oversize_inspector_output_never_becomes_diagnostics() {
for script in [
"printf 'generated-inspector-secret'",
"exec /usr/bin/head -c 16777217 /dev/zero",
for (script, expected) in [
(
"printf 'generated-inspector-secret'".to_owned(),
"returned invalid schema data",
),
(
format!("exec {} -c 16777217 /dev/zero", tool("head")),
"exceeds output limit",
),
] {
let (_dir, extractor) = inspector(script);
let (_dir, extractor) = inspector(&script);
let error = inspect_with(extractor, b"input".to_vec(), "Wasm".into(), Duration::from_secs(5))
.await
.unwrap_err();
assert!(!format!("{error:#}").contains("generated-inspector-secret"));
let error = format!("{error:#}");
assert!(error.contains(expected), "{error}");
assert!(!error.contains("generated-inspector-secret"));
}
}

Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@
rustStable
rustNightly
pkgs.cargo-insta
# Pinned to match WASM_BINDGEN_VERSION in
# crates/bindings-typescript/scripts/generate-test-utils-wasm.mjs.
pkgs.wasm-bindgen-cli_0_2_104
];
};
}
Expand Down
Loading