style: switch rustfmt to hard tabs; document tests-separate rule in TODO

- rustfmt.toml: hard_tabs = true.
- TODO §0.7: tests live in tests/, no #[cfg(test)] modules in code files.
This commit is contained in:
Loki 2026-11-15 22:34:29 +01:00
parent d8393e0f39
commit a90f0da226
Signed by: boba
GPG key ID: 6CDE87BC9A778D97
96 changed files with 6542 additions and 6537 deletions

View file

@ -6,67 +6,67 @@ use rampart::cli::commands;
#[derive(Parser)]
#[command(name = "rampart-cli", about = "Rampart management CLI")]
struct Cli {
#[command(subcommand)]
command: Commands,
#[command(subcommand)]
command: Commands,
}
#[derive(Subcommand)]
enum Commands {
/// Show overall system status
Status,
/// Run full diagnostics
Doctor,
/// Get/set configuration
Config {
#[arg(required = false)]
key: Option<String>,
#[arg(required = false)]
value: Option<String>,
},
/// Manage blacklist
Blacklist {
#[command(subcommand)]
action: BlacklistAction,
},
/// Emergency mode
Emergency {
#[arg(value_enum)]
mode: EmergencyMode,
},
/// Gracefully drain a node
Drain { node: String },
/// Show overall system status
Status,
/// Run full diagnostics
Doctor,
/// Get/set configuration
Config {
#[arg(required = false)]
key: Option<String>,
#[arg(required = false)]
value: Option<String>,
},
/// Manage blacklist
Blacklist {
#[command(subcommand)]
action: BlacklistAction,
},
/// Emergency mode
Emergency {
#[arg(value_enum)]
mode: EmergencyMode,
},
/// Gracefully drain a node
Drain { node: String },
}
#[derive(Subcommand)]
enum BlacklistAction {
Add { target: String, reason: Option<String> },
Remove { target: String },
List,
Add { target: String, reason: Option<String> },
Remove { target: String },
List,
}
#[derive(clap::ValueEnum, Clone)]
enum EmergencyMode {
Enable,
Disable,
Enable,
Disable,
}
#[tokio::main]
async fn main() -> anyhow::Result<()> {
let cli = Cli::parse();
let cli = Cli::parse();
match cli.command {
Commands::Status => commands::node::status::run().await,
Commands::Doctor => commands::doctor::run().await,
Commands::Config { key, value } => commands::config::run(key, value).await,
Commands::Blacklist { action } => match action {
BlacklistAction::Add { target, reason } => commands::blacklist::add(target, reason).await,
BlacklistAction::Remove { target } => commands::blacklist::remove(target).await,
BlacklistAction::List => commands::blacklist::list().await,
},
Commands::Emergency { mode } => match mode {
EmergencyMode::Enable => commands::node::emergency::enable().await,
EmergencyMode::Disable => commands::node::emergency::disable().await,
},
Commands::Drain { node } => commands::node::drain::run(&node).await,
}
match cli.command {
Commands::Status => commands::node::status::run().await,
Commands::Doctor => commands::doctor::run().await,
Commands::Config { key, value } => commands::config::run(key, value).await,
Commands::Blacklist { action } => match action {
BlacklistAction::Add { target, reason } => commands::blacklist::add(target, reason).await,
BlacklistAction::Remove { target } => commands::blacklist::remove(target).await,
BlacklistAction::List => commands::blacklist::list().await,
},
Commands::Emergency { mode } => match mode {
EmergencyMode::Enable => commands::node::emergency::enable().await,
EmergencyMode::Disable => commands::node::emergency::disable().await,
},
Commands::Drain { node } => commands::node::drain::run(&node).await,
}
}

View file

@ -1,8 +1,8 @@
use axum::{
Router,
http::HeaderValue,
middleware,
routing::{get, post},
Router,
http::HeaderValue,
middleware,
routing::{get, post},
};
use dashmap::DashMap;
#[cfg(feature = "store-redis")]
@ -14,84 +14,84 @@ use tracing_subscriber::EnvFilter;
#[tokio::main]
async fn main() -> anyhow::Result<()> {
tracing_subscriber::fmt()
.with_env_filter(EnvFilter::from_default_env().add_directive("rampart=info".parse()?))
.init();
tracing_subscriber::fmt()
.with_env_filter(EnvFilter::from_default_env().add_directive("rampart=info".parse()?))
.init();
// Manager живёт исключительно на redis-хранилище: без фичи стартовать
// нечего — fail-fast вместо полумёртвого API (features additive, TODO SOLID D).
if !cfg!(feature = "store-redis") {
anyhow::bail!("rampart-manager requires a redis state store: built without store-redis feature");
}
// Manager живёт исключительно на redis-хранилище: без фичи стартовать
// нечего — fail-fast вместо полумёртвого API (features additive, TODO SOLID D).
if !cfg!(feature = "store-redis") {
anyhow::bail!("rampart-manager requires a redis state store: built without store-redis feature");
}
#[cfg(feature = "store-redis")]
let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379/0".to_string());
#[cfg(feature = "store-redis")]
let redis_client = redis::Client::open(redis_url)?;
#[cfg(feature = "store-redis")]
let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379/0".to_string());
#[cfg(feature = "store-redis")]
let redis_client = redis::Client::open(redis_url)?;
let jwt_secret = std::env::var("JWT_SECRET").map_err(|_| anyhow::anyhow!("JWT_SECRET must be set"))?;
if jwt_secret.len() < 32 {
return Err(anyhow::anyhow!("JWT_SECRET must be at least 32 bytes"));
}
let jwt_audience = std::env::var("JWT_AUDIENCE").unwrap_or_else(|_| "rampart".to_string());
let jwt_expiration = std::env::var("JWT_EXPIRATION_SECS")
.unwrap_or_else(|_| "86400".to_string())
.parse::<u64>()
.map_err(|_| anyhow::anyhow!("JWT_EXPIRATION_SECS must be a valid u64"))?;
let jwt_secret = std::env::var("JWT_SECRET").map_err(|_| anyhow::anyhow!("JWT_SECRET must be set"))?;
if jwt_secret.len() < 32 {
return Err(anyhow::anyhow!("JWT_SECRET must be at least 32 bytes"));
}
let jwt_audience = std::env::var("JWT_AUDIENCE").unwrap_or_else(|_| "rampart".to_string());
let jwt_expiration = std::env::var("JWT_EXPIRATION_SECS")
.unwrap_or_else(|_| "86400".to_string())
.parse::<u64>()
.map_err(|_| anyhow::anyhow!("JWT_EXPIRATION_SECS must be a valid u64"))?;
let api_password = std::env::var("API_PASSWORD").map_err(|_| anyhow::anyhow!("API_PASSWORD must be set"))?;
if api_password == "changeme" {
return Err(anyhow::anyhow!("API_PASSWORD must not be the default 'changeme'"));
}
let api_password = std::env::var("API_PASSWORD").map_err(|_| anyhow::anyhow!("API_PASSWORD must be set"))?;
if api_password == "changeme" {
return Err(anyhow::anyhow!("API_PASSWORD must not be the default 'changeme'"));
}
let state = Arc::new(AppState {
#[cfg(feature = "store-redis")]
redis_client,
jwt_secret,
jwt_audience,
jwt_expiration,
api_password,
login_limiter: DashMap::new(),
});
let state = Arc::new(AppState {
#[cfg(feature = "store-redis")]
redis_client,
jwt_secret,
jwt_audience,
jwt_expiration,
api_password,
login_limiter: DashMap::new(),
});
#[cfg(feature = "store-redis")]
tokio::spawn(sync::heartbeat::start_heartbeat_check(state.clone()));
#[cfg(feature = "store-redis")]
tokio::spawn(sync::heartbeat::start_heartbeat_check(state.clone()));
let public = Router::new()
.route("/api/v1/health", get(api::inventory::health::health_check))
.route("/api/v1/auth/login", post(api::auth::login));
let public = Router::new()
.route("/api/v1/health", get(api::inventory::health::health_check))
.route("/api/v1/auth/login", post(api::auth::login));
// Redis-зависимые маршруты существуют только вместе с фичей; сам manager
// без неё bail'ит выше, поэтому 501-заглушки были бы недостижимым кодом.
let protected = Router::new();
#[cfg(feature = "store-redis")]
let protected = protected
.route("/api/v1/servers", get(api::inventory::servers::list_servers))
.route(
"/api/v1/blacklist",
get(api::blacklist::list_blacklist)
.post(api::blacklist::add_blacklist)
.delete(api::blacklist::remove_blacklist),
)
.route("/api/v1/nodes", get(api::inventory::nodes::list_nodes));
let protected = protected.route_layer(middleware::from_fn_with_state(state.clone(), auth::auth_middleware));
// Redis-зависимые маршруты существуют только вместе с фичей; сам manager
// без неё bail'ит выше, поэтому 501-заглушки были бы недостижимым кодом.
let protected = Router::new();
#[cfg(feature = "store-redis")]
let protected = protected
.route("/api/v1/servers", get(api::inventory::servers::list_servers))
.route(
"/api/v1/blacklist",
get(api::blacklist::list_blacklist)
.post(api::blacklist::add_blacklist)
.delete(api::blacklist::remove_blacklist),
)
.route("/api/v1/nodes", get(api::inventory::nodes::list_nodes));
let protected = protected.route_layer(middleware::from_fn_with_state(state.clone(), auth::auth_middleware));
let cors = match std::env::var("CORS_ORIGIN") {
Ok(origin) if origin.is_empty() || origin == "*" => CorsLayer::new().allow_origin(tower_http::cors::Any),
Ok(origin) => CorsLayer::new().allow_origin(HeaderValue::from_str(&origin)?),
Err(_) => CorsLayer::new().allow_origin(HeaderValue::from_static("http://localhost:5173")),
};
let cors = match std::env::var("CORS_ORIGIN") {
Ok(origin) if origin.is_empty() || origin == "*" => CorsLayer::new().allow_origin(tower_http::cors::Any),
Ok(origin) => CorsLayer::new().allow_origin(HeaderValue::from_str(&origin)?),
Err(_) => CorsLayer::new().allow_origin(HeaderValue::from_static("http://localhost:5173")),
};
let app = Router::new()
.merge(public)
.merge(protected)
.layer(cors)
.with_state(state);
let app = Router::new()
.merge(public)
.merge(protected)
.layer(cors)
.with_state(state);
let addr = "0.0.0.0:8080";
tracing::info!("Manager API listening on {addr}");
let listener = tokio::net::TcpListener::bind(addr).await?;
let app = app.into_make_service_with_connect_info::<std::net::SocketAddr>();
axum::serve(listener, app).await?;
Ok(())
let addr = "0.0.0.0:8080";
tracing::info!("Manager API listening on {addr}");
let listener = tokio::net::TcpListener::bind(addr).await?;
let app = app.into_make_service_with_connect_info::<std::net::SocketAddr>();
axum::serve(listener, app).await?;
Ok(())
}

View file

@ -14,51 +14,51 @@ use rampart::tui::state::AppState;
#[derive(Parser)]
#[command(
name = "rampart-tui",
about = "Rampart live metrics TUI (Prometheus /metrics source)"
name = "rampart-tui",
about = "Rampart live metrics TUI (Prometheus /metrics source)"
)]
struct Cli {
/// URL Prometheus metrics endpoint
#[arg(long, default_value = "http://127.0.0.1:9090/metrics")]
url: String,
/// Период опроса, секунды
#[arg(long, default_value_t = 1)]
refresh_secs: u64,
/// URL Prometheus metrics endpoint
#[arg(long, default_value = "http://127.0.0.1:9090/metrics")]
url: String,
/// Период опроса, секунды
#[arg(long, default_value_t = 1)]
refresh_secs: u64,
}
fn main() -> anyhow::Result<()> {
let cli = Cli::parse();
let Some(fetcher) = HttpFetcher::new(cli.url.clone()) else {
anyhow::bail!("failed to build http client");
};
let runtime = tokio::runtime::Builder::new_current_thread().enable_all().build()?;
let cli = Cli::parse();
let Some(fetcher) = HttpFetcher::new(cli.url.clone()) else {
anyhow::bail!("failed to build http client");
};
let runtime = tokio::runtime::Builder::new_current_thread().enable_all().build()?;
let terminal = ratatui::try_init()?;
let result = runtime.block_on(run(
terminal,
Arc::new(fetcher) as Arc<dyn Fetcher>,
cli.url,
Duration::from_secs(cli.refresh_secs.max(1)),
));
ratatui::restore();
result
let terminal = ratatui::try_init()?;
let result = runtime.block_on(run(
terminal,
Arc::new(fetcher) as Arc<dyn Fetcher>,
cli.url,
Duration::from_secs(cli.refresh_secs.max(1)),
));
ratatui::restore();
result
}
async fn run(
mut terminal: Terminal<CrosstermBackend<std::io::Stdout>>,
fetcher: Arc<dyn Fetcher>,
url: String,
refresh: Duration,
mut terminal: Terminal<CrosstermBackend<std::io::Stdout>>,
fetcher: Arc<dyn Fetcher>,
url: String,
refresh: Duration,
) -> anyhow::Result<()> {
let state = Arc::new(AppState::new(url));
let notify = Arc::new(Notify::new());
tokio::spawn(app::spawn_fetch_loop(
fetcher,
Arc::clone(&state),
refresh,
Arc::clone(&notify),
));
app::run_ui(&mut terminal, state, notify)
.await
.map_err(anyhow::Error::from)
let state = Arc::new(AppState::new(url));
let notify = Arc::new(Notify::new());
tokio::spawn(app::spawn_fetch_loop(
fetcher,
Arc::clone(&state),
refresh,
Arc::clone(&notify),
));
app::run_ui(&mut terminal, state, notify)
.await
.map_err(anyhow::Error::from)
}

View file

@ -2,10 +2,10 @@ use rampart::app::{self, RunExit};
#[tokio::main]
async fn main() -> anyhow::Result<()> {
match app::run().await? {
// Штатное завершение listener: управление возвращается tokio-рантайму.
RunExit::Ok => Ok(()),
// Drain-таймаут: бинарь — единственное место, где допустим process::exit.
exit => std::process::exit(exit.code()),
}
match app::run().await? {
// Штатное завершение listener: управление возвращается tokio-рантайму.
RunExit::Ok => Ok(()),
// Drain-таймаут: бинарь — единственное место, где допустим process::exit.
exit => std::process::exit(exit.code()),
}
}