mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #87 from DeterminateSystems/colemickens/dnixd-netrc

Browse source 
avoid touching netrc-file when dnixd is available
This commit is contained in:
Cole Mickens 2024-08-28 15:25:57 -05:00 committed by GitHub
parent deeb8d1d79 9f46b60a8c
commit 48ec31e71d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
magic-nix-cache/src/main.rs
View file

@ -195,10 +195,16 @@ async fn main_cli() -> Result<()> {
let metrics = Arc::new(telemetry::TelemetryReport::new()); let metrics = Arc::new(telemetry::TelemetryReport::new());
let dnixd_uds_socket_dir: &Path = Path::new(&DETERMINATE_STATE_DIR);
let dnixd_uds_socket_path = dnixd_uds_socket_dir.join(DETERMINATE_NIXD_SOCKET_NAME);
let dnixd_available = dnixd_uds_socket_path.exists();
// NOTE: we expect this to point to a user nix.conf
// we always open/append to it to be able to append the extra-substituter for github-actions cache
// but we don't write to it for initializing flakehub_cache unless dnixd is unavailable
if let Some(parent) = Path::new(&args.nix_conf).parent() { if let Some(parent) = Path::new(&args.nix_conf).parent() {
create_dir_all(parent).with_context(|| "Creating parent directories of nix.conf")?; create_dir_all(parent).with_context(|| "Creating parent directories of nix.conf")?;
} }
let mut nix_conf = std::fs::OpenOptions::new() let mut nix_conf = std::fs::OpenOptions::new()
.create(true) .create(true)
.append(true) .append(true)
@ -231,16 +237,18 @@ async fn main_cli() -> Result<()> {
.await .await
{ {
Ok(state) => { Ok(state) => {
nix_conf if !dnixd_available {
.write_all( nix_conf
format!( .write_all(
"extra-substituters = {}?trusted=1\nnetrc-file = {}\n", format!(
&flakehub_cache_server, "extra-substituters = {}?trusted=1\nnetrc-file = {}\n",
flakehub_api_server_netrc.display() &flakehub_cache_server,
flakehub_api_server_netrc.display()
)
.as_bytes(),
) )
.as_bytes(), .with_context(|| "Writing to nix.conf")?;
) }
.with_context(|| "Writing to nix.conf")?;
tracing::info!("FlakeHub cache is enabled."); tracing::info!("FlakeHub cache is enabled.");
Some(state) Some(state)
@ -325,10 +333,7 @@ async fn main_cli() -> Result<()> {
original_paths, original_paths,
}); });
let dnixd_uds_socket_dir: &Path = Path::new(&DETERMINATE_STATE_DIR); if dnixd_available {
let dnixd_uds_socket_path = dnixd_uds_socket_dir.join(DETERMINATE_NIXD_SOCKET_NAME);
if dnixd_uds_socket_path.exists() {
tracing::info!("Subscribing to Determinate Nixd build events."); tracing::info!("Subscribing to Determinate Nixd build events.");
crate::pbh::subscribe_uds_post_build_hook(dnixd_uds_socket_path, state.clone()).await?; crate::pbh::subscribe_uds_post_build_hook(dnixd_uds_socket_path, state.clone()).await?;
} else { } else {