updated Warg and refactored#6
Conversation
crates/wasm-pkg-loader/src/main.rs
Outdated
| let config = ClientConfig::from_default_file()?; | ||
| let is_missing_config = config.is_none(); | ||
| let mut config = config.unwrap_or_default(); | ||
|
|
||
| // if default registry is not configured, fallback to Warg home URL | ||
| if config.get_default_registry().is_none() { | ||
| match warg_client::Config::from_default_file()? { | ||
| Some(warg_client::Config { home_url, .. }) if home_url.is_some() => { | ||
| let url = url::Url::parse(&home_url.unwrap())?; | ||
| config.default_registry( | ||
| url.host_str() | ||
| .ok_or_else(|| anyhow!("invalid Warg home url"))?, | ||
| ); | ||
| } | ||
| _ => {} | ||
| }; | ||
| } | ||
|
|
||
| // if not configured and not using Warg home URL as default registry, | ||
| // then set the `wasi` default registry | ||
| if is_missing_config && config.get_default_registry().is_none() { | ||
| config.namespace_registry("wasi", "bytecodealliance.org"); | ||
| }; | ||
|
|
There was a problem hiding this comment.
Just caught up on that thread. I think this is in inline with what was discussed there.
If global wasm-pkg-tools config file is not defined but the global warg config file is defined, then it falls back to using the warg config given this tool can use the warg_client.
If there is no global config for either, it uses bytecodealliance.org.
There was a problem hiding this comment.
Having two different sources for "default registry" interacting this way seems potentially confusing. It might make sense to consolidate config between warg and this library a bit to end up with a similar UX; that's what I'm trying to hash out in the discussion thread.
There was a problem hiding this comment.
Complete agreement. Do you think this implementation makes sense for this PR? And then we work on the rest in follow on PRs?
There was a problem hiding this comment.
I don't think we want to land this kind of fundamental config logic without discussion: #10
There was a problem hiding this comment.
@lann I think we have a path forward on the config, from our discussions. As for this PR and this config, how should we proceed?
There was a problem hiding this comment.
Can we just revert this chunk of the PR?
- This allows us to have a simpler `FileSystemClient::new_with_default_config()` that gets the expected `auth_token`. Would simplify bytecodealliance/cargo-component#288, bytecodealliance/wac#103, bytecodealliance/wasm-pkg-tools#6, esoterra/wow#3 - Added client download as a stream methods - Validates the content digest as downloading from the registry
|
Oh yeah sorry I snuck some CI in behind your back there 😅 |
2 participants
No description provided.