apunkt/omnigraph
1
0
Fork 0
mirror of https://github.com/ModernRelay/omnigraph.git synced 2026-06-27 02:39:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(cli): serialize the resolved locator so config view --resolved omits no field

Browse source 
config view --resolved hand-listed locator fields and dropped an embedded graph's
region/endpoint/policy_file/selected — exactly the fields one debugs an S3 endpoint or
per-graph policy with. Derive Serialize on GraphLocator (internally tagged `kind:`) and
serialize+prune in print_resolved_locator, so every field is reported and a new field
can't be forgotten by hand.
This commit is contained in:
Ragnor Comerford 2026-06-05 12:38:29 +02:00
parent 938248dfcf
commit 34c0af8469
No known key found for this signature in database
3 changed files with 21 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

71
crates/omnigraph-cli/src/main.rs
View file

@ -898,68 +898,19 @@ fn print_config_origins(provenance: &Provenance, json: bool) -> Result<()> {
}
}
/// Print a resolved [`GraphLocator`] (embedded vs remote) in human or JSON form.
/// Print a resolved [`GraphLocator`] (embedded vs remote). Serializes the typed
/// locator (internally tagged `kind:`) and prunes null/empty values, so every
/// field — including an Embedded graph's `region`/`endpoint`/`policy_file` — is
/// reported and no field can be forgotten by hand.
fn print_resolved_locator(locator: &GraphLocator, json: bool) -> Result<()> {
match locator {
GraphLocator::Embedded {
uri,
branch,
snapshot,
graph_id,
..
} => {
if json {
print_json(&serde_json::json!({
"kind": "embedded",
"uri": uri,
"graph_id": graph_id,
"branch": branch,
"snapshot": snapshot,
}))
} else {
println!("embedded");
println!(" uri: {uri}");
println!(" graph_id: {graph_id}");
if let Some(branch) = branch {
println!(" branch: {branch}");
}
if let Some(snapshot) = snapshot {
println!(" snapshot: {snapshot}");
}
Ok(())
}
}
GraphLocator::Remote {
endpoint,
server,
graph_id,
branch,
snapshot,
} => {
if json {
print_json(&serde_json::json!({
"kind": "remote",
"endpoint": endpoint,
"server": server,
"graph_id": graph_id,
"branch": branch,
"snapshot": snapshot,
}))
} else {
println!("remote");
println!(" endpoint: {endpoint}");
println!(" server: {server}");
println!(" graph_id: {graph_id}");
if let Some(branch) = branch {
println!(" branch: {branch}");
}
if let Some(snapshot) = snapshot {
println!(" snapshot: {snapshot}");
}
Ok(())
}
}
let mut value = serde_yaml::to_value(locator)?;
prune_empty(&mut value);
if json {
println!("{}", serde_json::to_string_pretty(&value)?);
} else {
print!("{}", serde_yaml::to_string(&value)?);
}
Ok(())
}
#[derive(Debug, Clone)]