diff --git a/src/bin/http_health_check.rs b/src/bin/http_health_check.rs index 313f4404..d3f1767c 100644 --- a/src/bin/http_health_check.rs +++ b/src/bin/http_health_check.rs @@ -11,7 +11,7 @@ async fn main() { let args: Vec = env::args().collect(); if args.len() != 2 { eprintln!("Usage: cargo run --bin http_health_check "); - eprintln!("Example: cargo run --bin http_health_check http://127.0.0.1:1212/health_check"); + eprintln!("Example: cargo run --bin http_health_check http://127.0.0.1:1212/api/health_check"); std::process::exit(1); } diff --git a/src/servers/apis/routes.rs b/src/servers/apis/routes.rs index 49f263db..fef412f9 100644 --- a/src/servers/apis/routes.rs +++ b/src/servers/apis/routes.rs @@ -29,6 +29,6 @@ pub fn router(tracker: Arc) -> Router { tracker.config.clone(), v1::middlewares::auth::auth, )) - .route("/health_check", get(health_check_handler)) + .route(&format!("{api_url_prefix}/health_check"), get(health_check_handler)) .layer(CompressionLayer::new()) } diff --git a/src/servers/apis/v1/context/health_check/mod.rs b/src/servers/apis/v1/context/health_check/mod.rs index c62c5e97..b7384951 100644 --- a/src/servers/apis/v1/context/health_check/mod.rs +++ b/src/servers/apis/v1/context/health_check/mod.rs @@ -8,14 +8,14 @@ //! //! # Health Check //! -//! `GET /health_check` +//! `GET /api/health_check` //! //! Returns the API status. //! //! **Example request** //! //! ```bash -//! curl "http://127.0.0.1:1212/health_check" +//! curl "http://127.0.0.1:1212/api/health_check" //! ``` //! //! **Example response** `200` diff --git a/src/servers/apis/v1/routes.rs b/src/servers/apis/v1/routes.rs index 48b79557..3786b353 100644 --- a/src/servers/apis/v1/routes.rs +++ b/src/servers/apis/v1/routes.rs @@ -9,8 +9,10 @@ use crate::core::Tracker; /// Add the routes for the v1 API. pub fn add(prefix: &str, router: Router, tracker: Arc) -> Router { let v1_prefix = format!("{prefix}/v1"); + let router = auth_key::routes::add(&v1_prefix, router, tracker.clone()); let router = stats::routes::add(&v1_prefix, router, tracker.clone()); let router = whitelist::routes::add(&v1_prefix, router, tracker.clone()); + torrent::routes::add(&v1_prefix, router, tracker) } diff --git a/src/servers/health_check_api/handlers.rs b/src/servers/health_check_api/handlers.rs index 109b89bb..2f47c860 100644 --- a/src/servers/health_check_api/handlers.rs +++ b/src/servers/health_check_api/handlers.rs @@ -45,7 +45,7 @@ async fn api_health_check(config: &HttpApi) -> Option> { let addr: SocketAddr = config.bind_address.parse().expect("invalid socket address for API"); if addr.port() != UNKNOWN_PORT { - let health_check_url = format!("http://{addr}/health_check"); + let health_check_url = format!("http://{addr}/api/health_check"); if !get_req_is_ok(&health_check_url).await { return Some(responses::error(format!( diff --git a/tests/servers/api/v1/contract/context/health_check.rs b/tests/servers/api/v1/contract/context/health_check.rs index 3b6c9837..108ae237 100644 --- a/tests/servers/api/v1/contract/context/health_check.rs +++ b/tests/servers/api/v1/contract/context/health_check.rs @@ -8,7 +8,7 @@ use crate::servers::api::v1::client::get; async fn health_check_endpoint_should_return_status_ok_if_api_is_running() { let test_env = running_test_environment(configuration::ephemeral()).await; - let url = format!("http://{}/health_check", test_env.get_connection_info().bind_address); + let url = format!("http://{}/api/health_check", test_env.get_connection_info().bind_address); let response = get(&url, None).await;