Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1269,9 +1269,8 @@ impl Node {
info!(log, "image already downloaded: {path}");
return Ok(());
}
let url = format!(
"https://oxide-falcon-assets.s3.us-west-2.amazonaws.com/{iname}"
);
let asset_base = asset_base();
let url = format!("{asset_base}/{iname}");
info!(log, "trying to download {url}");

download_large_file(url.as_str(), path, log).await?;
Expand Down Expand Up @@ -1821,6 +1820,15 @@ pub(crate) fn dataset() -> String {
}
}

pub(crate) fn asset_base() -> String {
match std::env::var("FALCON_ASSET_BASE") {
Ok(s) if !s.is_empty() => s,
_ => {
"https://oxide-falcon-assets.s3.us-west-2.amazonaws.com".to_string()
}
}
}

fn libnet_retry<F>(f: F) -> Result<(), Error>
where
F: Fn() -> Result<(), libnet::Error>,
Expand Down
15 changes: 9 additions & 6 deletions lib/src/ovmf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ use std::fs;
use std::io;
use std::time::Duration;

const OVMF_URL: &str =
"https://oxide-falcon-assets.s3.us-west-2.amazonaws.com/OVMF_CODE.fd";
const OVMF_DIGEST_URL: &str =
"https://oxide-falcon-assets.s3.us-west-2.amazonaws.com/OVMF_CODE.fd.sha256.txt";
fn ovmf_url() -> String {
format!("{}/OVMF_CODE.fd", crate::asset_base())
}

fn ovmf_digest_url() -> String {
format!("{}/OVMF_CODE.fd.sha256.txt", crate::asset_base())
}

pub(crate) async fn ensure_ovmf_fd(
falcon_dir: &str,
Expand All @@ -31,7 +34,7 @@ pub(crate) async fn ensure_ovmf_fd(

async fn download_ovmf(path: &str, log: &Logger) -> Result<()> {
info!(log, "downloading ovmf");
crate::download_large_file(OVMF_URL, path, log).await?;
crate::download_large_file(&ovmf_url(), path, log).await?;
Ok(())
}

Expand Down Expand Up @@ -63,7 +66,7 @@ async fn get_expected_ovmf_digest_impl() -> Result<String> {
.connect_timeout(Duration::from_secs(15))
.timeout(Duration::from_secs(30))
.build()?;
let response = client.get(OVMF_DIGEST_URL).send().await?;
let response = client.get(ovmf_digest_url()).send().await?;
let text = response.text().await?;
Ok(text.trim().to_owned())
}