fix(maestro): drop SHARED_ prefix from [shared] env vars
ci / rust (pull_request) Successful in 4m13s

The shared section is the implicit global scope, so its fields use
the bare `MAESTRO_<FIELD>` env-var spelling. Only `[daemon]` and
`[registry]` sections get section-prefixed env vars.

Renames:
- MAESTRO_SHARED_TOKEN        → MAESTRO_TOKEN
- MAESTRO_SHARED_REGISTRY_URL → MAESTRO_REGISTRY_URL

`MAESTRO_DAEMON_*` and `MAESTRO_REGISTRY_BIND_ADDR` are unchanged.

This restores the canonical spec name (`MAESTRO_TOKEN`) that operators
already use in their deployment scripts — NAP-233 had renamed it to
`MAESTRO_SHARED_TOKEN`, which silently broke daemon auth against
existing registry deployments still setting `MAESTRO_TOKEN` in env.

Constants renamed alongside: `ENV_SHARED_TOKEN` → `ENV_TOKEN`,
`ENV_SHARED_REGISTRY_URL` → `ENV_REGISTRY_URL`. `EnvOverrides` fields
shed their `shared_` prefix to match.

Touches: daemon/cli/registry crates, e2e harness, design spec.
This commit is contained in:
2026-05-26 13:24:29 +00:00
parent 05bff366f8
commit 094cd1ffce
12 changed files with 39 additions and 44 deletions
+24 -29
View File
@@ -26,9 +26,9 @@ pub use maestro_config::{
pub const DEFAULT_BIND_ADDR: &str = "127.0.0.1:7070";
/// Env var that overrides `[shared].registry_url`.
pub const ENV_SHARED_REGISTRY_URL: &str = "MAESTRO_SHARED_REGISTRY_URL";
pub const ENV_REGISTRY_URL: &str = "MAESTRO_REGISTRY_URL";
/// Env var that overrides `[shared].token`.
pub const ENV_SHARED_TOKEN: &str = "MAESTRO_SHARED_TOKEN";
pub const ENV_TOKEN: &str = "MAESTRO_TOKEN";
/// Env var that overrides `[daemon].daemon_id`.
pub const ENV_DAEMON_ID: &str = "MAESTRO_DAEMON_ID";
/// Env var that overrides `[daemon].daemon_url`.
@@ -90,10 +90,10 @@ impl DaemonConfig {
#[derive(Debug, Clone, Default)]
pub struct EnvOverrides {
pub daemon_id: Option<String>,
pub shared_registry_url: Option<String>,
pub registry_url: Option<String>,
pub bind_addr: Option<String>,
pub daemon_url: Option<String>,
pub shared_token: Option<String>,
pub token: Option<String>,
}
impl EnvOverrides {
@@ -101,10 +101,10 @@ impl EnvOverrides {
pub fn from_env() -> Self {
Self {
daemon_id: std::env::var(ENV_DAEMON_ID).ok(),
shared_registry_url: std::env::var(ENV_SHARED_REGISTRY_URL).ok(),
registry_url: std::env::var(ENV_REGISTRY_URL).ok(),
bind_addr: std::env::var(ENV_DAEMON_BIND_ADDR).ok(),
daemon_url: std::env::var(ENV_DAEMON_URL).ok(),
shared_token: std::env::var(ENV_SHARED_TOKEN).ok(),
token: std::env::var(ENV_TOKEN).ok(),
}
}
}
@@ -139,15 +139,13 @@ pub fn load_config(path: &Path, env: EnvOverrides) -> Result<DaemonConfig, Confi
.or(daemon.daemon_id)
.unwrap_or_else(|| hostname.clone());
let shared_registry_url =
env.shared_registry_url
.or(shared.registry_url)
.ok_or(ConfigError::Missing {
field: "shared.registry_url",
env: ENV_SHARED_REGISTRY_URL,
path: path.to_path_buf(),
})?;
let registry_url = derive_daemon_ws_url(&shared_registry_url)?;
let registry_url = derive_daemon_ws_url(&env.registry_url.or(shared.registry_url).ok_or(
ConfigError::Missing {
field: "shared.registry_url",
env: ENV_REGISTRY_URL,
path: path.to_path_buf(),
},
)?)?;
let daemon_url = env
.daemon_url
@@ -157,14 +155,11 @@ pub fn load_config(path: &Path, env: EnvOverrides) -> Result<DaemonConfig, Confi
env: ENV_DAEMON_URL,
path: path.to_path_buf(),
})?;
let token = env
.shared_token
.or(shared.token)
.ok_or(ConfigError::Missing {
field: "shared.token",
env: ENV_SHARED_TOKEN,
path: path.to_path_buf(),
})?;
let token = env.token.or(shared.token).ok_or(ConfigError::Missing {
field: "shared.token",
env: ENV_TOKEN,
path: path.to_path_buf(),
})?;
let bind_addr = match env.bind_addr {
Some(raw) => raw.parse().map_err(|source| ConfigError::InvalidBindAddr {
@@ -196,7 +191,7 @@ pub fn load_config(path: &Path, env: EnvOverrides) -> Result<DaemonConfig, Confi
}
fn env_has_all_required(env: &EnvOverrides) -> bool {
env.shared_registry_url.is_some() && env.daemon_url.is_some() && env.shared_token.is_some()
env.registry_url.is_some() && env.daemon_url.is_some() && env.token.is_some()
}
pub fn default_state_dir() -> Result<PathBuf, ConfigError> {
@@ -255,9 +250,9 @@ daemon_url = "ws://localhost:7070"
let dir = tempfile::tempdir().unwrap();
let path = dir.path().join("does-not-exist.toml");
let env = EnvOverrides {
shared_registry_url: Some("http://r.example".into()),
registry_url: Some("http://r.example".into()),
daemon_url: Some("ws://x:7070".into()),
shared_token: Some("t".into()),
token: Some("t".into()),
..EnvOverrides::default()
};
let cfg = load_config(&path, env).unwrap();
@@ -296,10 +291,10 @@ bind_addr = "127.0.0.1:1"
.unwrap();
let env = EnvOverrides {
daemon_id: Some("from-env".into()),
shared_registry_url: Some("https://from-env".into()),
registry_url: Some("https://from-env".into()),
bind_addr: Some("0.0.0.0:9999".into()),
daemon_url: Some("ws://from-env:1".into()),
shared_token: Some("from-env".into()),
token: Some("from-env".into()),
};
let cfg = load_config(&path, env).unwrap();
assert_eq!(cfg.daemon_id, "from-env");
@@ -332,7 +327,7 @@ daemon_url = "ws://x"
path: p,
} => {
assert_eq!(field, "shared.token");
assert_eq!(env, ENV_SHARED_TOKEN);
assert_eq!(env, ENV_TOKEN);
assert_eq!(p, path);
}
other => panic!("expected Missing(shared.token), got {other:?}"),
+1 -1
View File
@@ -92,7 +92,7 @@ pub fn run(
)?;
let token = resolve_required(
"token",
"Shared token (MAESTRO_SHARED_TOKEN; paste from the registry)",
"Shared token (MAESTRO_TOKEN; paste from the registry)",
inputs.token,
&mut handle,
&stdin,
+1 -1
View File
@@ -52,7 +52,7 @@ struct ConfigureCmd {
/// Reachable URL clients dial for this daemon's attach WS.
#[arg(long)]
daemon_url: Option<String>,
/// Shared token (MAESTRO_SHARED_TOKEN). Tip: pipe from `pass` / `op` / `secret-tool`.
/// Shared token (MAESTRO_TOKEN). Tip: pipe from `pass` / `op` / `secret-tool`.
#[arg(long)]
token: Option<String>,
/// Stable daemon ID. Defaults to the system hostname.