mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nar-bridge): move narinfo_str gen to helper

Browse source 
Change-Id: I2d3b135f63f17adc540d63d3ecaef4fb555bca74
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12917
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-12-26 13:16:48 +01:00 committed by clbot
parent 7c0c270932
commit 4f9112f1cd
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tvix/nar-bridge/src/narinfo.rs
View file

@ -5,9 +5,7 @@ use nix_compat::{
nix_http, nixbase32, nix_http, nixbase32,
store_path::StorePath, store_path::StorePath,
}; };
use prost::Message;
use tracing::{instrument, warn, Span}; use tracing::{instrument, warn, Span};
use tvix_castore::proto::{self as castorepb};
use tvix_store::pathinfoservice::PathInfo; use tvix_store::pathinfoservice::PathInfo;
use crate::AppState; use crate::AppState;
@ -61,20 +59,9 @@ pub async fn get(
})? })?
.ok_or(StatusCode::NOT_FOUND)?; .ok_or(StatusCode::NOT_FOUND)?;
let url = format!(
"nar/tvix-castore/{}?narsize={}",
data_encoding::BASE64URL_NOPAD.encode(
&castorepb::Node::from_name_and_node("".into(), path_info.node.clone()).encode_to_vec()
),
path_info.nar_size,
);
let mut narinfo = path_info.to_narinfo();
narinfo.url = &url;
Ok(( Ok((
[("content-type", nix_http::MIME_TYPE_NARINFO)], [("content-type", nix_http::MIME_TYPE_NARINFO)],
narinfo.to_string(), gen_narinfo_str(&path_info),
)) ))
} }
@ -151,3 +138,20 @@ pub async fn put(
} }
} }
} }
/// Constructs a String in NARInfo format for the given [PathInfo].
fn gen_narinfo_str(path_info: &PathInfo) -> String {
use prost::Message;
let mut narinfo = path_info.to_narinfo();
let url = format!(
"nar/tvix-castore/{}?narsize={}",
data_encoding::BASE64URL_NOPAD.encode(
&tvix_castore::proto::Node::from_name_and_node("".into(), path_info.node.to_owned())
.encode_to_vec()
),
path_info.nar_size,
);
narinfo.url = &url;
narinfo.to_string()
}