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

Merge pull request #96 from DeterminateSystems/grahamc/defaults

Browse source 
What if we used clap's defaults support?
This commit is contained in:
Graham Christensen 2024-08-30 14:02:39 -04:00 committed by GitHub
parent 979ad69132 3ca2a4bf5b
commit b499ff2a0f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,23 +97,23 @@ struct Args {
diagnostic_endpoint: String,
/// The FlakeHub API server.
#[arg(long)]
flakehub_api_server: Option<reqwest::Url>,
#[arg(long, default_value = "https://api.flakehub.com")]
flakehub_api_server: reqwest::Url,
/// The path of the `netrc` file that contains the FlakeHub JWT token.
#[arg(long)]
flakehub_api_server_netrc: Option<PathBuf>,
/// The FlakeHub binary cache server.
#[arg(long)]
flakehub_cache_server: Option<reqwest::Url>,
#[arg(long, default_value = "https://cache.flakehub.com")]
flakehub_cache_server: reqwest::Url,
#[arg(long)]
flakehub_flake_name: Option<String>,
/// The location of `nix.conf`.
#[arg(long)]
nix_conf: Option<PathBuf>,
#[arg(long, default_value_os_t = default_nix_conf())]
nix_conf: PathBuf,
/// Whether to use the GHA cache.
#[arg(long)]
@ -154,6 +154,15 @@ impl Args {
}
}
fn default_nix_conf() -> PathBuf {
xdg::BaseDirectories::new()
.with_context(|| "identifying XDG base directories")
.expect(
"Could not identify your home directory. Try setting the HOME environment variable.",
)
.get_config_file("nix/nix.conf")
}
/// The global server state.
struct StateInner {
/// State for uploading to the GHA cache.
@ -199,13 +208,7 @@ async fn main_cli() -> Result<()> {
let dnixd_uds_socket_path = dnixd_uds_socket_dir.join(DETERMINATE_NIXD_SOCKET_NAME);
let dnixd_available = dnixd_uds_socket_path.exists();
let nix_conf_path: PathBuf = match args.nix_conf {
Some(nc) => nc,
None => {
let xdg = xdg::BaseDirectories::new().with_context(|| "failed to get xdg base dirs")?;
xdg.get_config_file("nix/nix.conf")
}
};
let nix_conf_path: PathBuf = args.nix_conf;
// 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
@ -224,10 +227,7 @@ async fn main_cli() -> Result<()> {
let narinfo_negative_cache = Arc::new(RwLock::new(HashSet::new()));
let flakehub_state = if args.use_flakehub {
let flakehub_cache_server = args.flakehub_cache_server.unwrap_or(
reqwest::Url::parse("https://cache.flakehub.com")
.expect("failed to parse default flakehub cache url"),
);
let flakehub_cache_server = args.flakehub_cache_server;
let flakehub_api_server_netrc = if dnixd_available {
let dnixd_netrc_path = PathBuf::from(DETERMINATE_STATE_DIR).join("netrc");
@ -240,10 +240,7 @@ async fn main_cli() -> Result<()> {
})?
};
let flakehub_api_server = &args.flakehub_api_server.unwrap_or(
reqwest::Url::parse("https://api.flakehub.com")
.expect("failed to parse default flakehub api server"),
);
let flakehub_api_server = &args.flakehub_api_server;
let flakehub_flake_name = args.flakehub_flake_name;