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

refactor(config,cli,server): rename the server: config block to serve:

Browse source 
Introduces the `serve:` host-role block in its RFC-002 shape — `graphs:` is a
served-set list, replacing the single `server.graph` scalar. The legacy
`server:` block is folded into `serve:` under the legacy schema and rejected
under `version: 1` (pointing at the new spelling, noting the scalar->list
change). Serving a true subset (`serve.graphs` with more than one entry) is
rejected with a route-unification hint; one entry (single-graph) and none
(serve all) preserve today's behavior.

Renames the accessors (server_* -> serve_*) and repoints the server boot call
sites; migrates the init scaffold to `serve:`. `servers:` (the remote endpoint
map) is deliberately unaffected — the key scan is exact-match.
This commit is contained in:
Ragnor Comerford 2026-06-04 21:38:25 +02:00
parent 56ff5eb9ec
commit 304ac5ec23
No known key found for this signature in database
3 changed files with 138 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/omnigraph-server/src/lib.rs
View file

@ -921,7 +921,7 @@ pub fn load_server_settings(
for warning in config.deprecation_warnings() {
warn!("{warning}");
}
let bind = cli_bind.unwrap_or_else(|| config.server_bind().to_string());
let bind = cli_bind.unwrap_or_else(|| config.serve_bind().to_string());
// Either `--unauthenticated` or `OMNIGRAPH_UNAUTHENTICATED=1` flips
// this. Treat any non-empty, non-"0"/"false" string as truthy —
// standard 12-factor "any value is true" reading of the env var.
@ -948,7 +948,7 @@ pub fn load_server_settings(
// `resolve_target_uri` precedence.
let has_cli_uri = cli_uri.is_some();
let has_cli_target = cli_target.is_some();
let has_server_graph = config.server_graph_name().is_some();
let has_server_graph = config.serve_graph_name().is_some();
let has_graphs_map = !config.graphs.is_empty();
let has_explicit_config = config_path.is_some();
@ -961,7 +961,7 @@ pub fn load_server_settings(
let selected: Option<&str> = if has_cli_uri {
None
} else {
cli_target.as_deref().or_else(|| config.server_graph_name())
cli_target.as_deref().or_else(|| config.serve_graph_name())
};
// omnigraph-server serves embedded graphs only — refuse a remote target
// (`server:`/remote `uri:`) before resolving or opening it.
@ -971,11 +971,8 @@ pub fn load_server_settings(
selected,
selected.or(cli_uri.as_deref()).unwrap_or("<graph>"),
)?;
let raw_uri = config.resolve_target_uri(
cli_uri,
cli_target.as_deref(),
config.server_graph_name(),
)?;
let raw_uri =
config.resolve_target_uri(cli_uri, cli_target.as_deref(), config.serve_graph_name())?;
let uri = normalize_root_uri(&raw_uri).wrap_err_with(|| {
format!("normalize single-graph URI '{raw_uri}' from server settings")
})?;
@ -1044,7 +1041,7 @@ pub fn load_server_settings(
let config_path = config_path
.cloned()
.expect("has_explicit_config implies config_path is Some");
let server_policy_file = config.resolve_server_policy_file();
let server_policy_file = config.resolve_serve_policy_file();
ServerConfigMode::Multi {
graphs,
config_path,