ref(server): Reorganize the HTTP web module (#247)

Splits the HTTP module internally into smaller submodules that should
make it easier to find and place functionality. The web listener, app,
and middlewarers are now in separate modules.

Additionally, `ApiResult` and its error has moved into an
`endpoints::common` module. We can later replace this with an error type
with individual variants.

Author: jan-auer

objectstore-server/src/auth/service.rs

@@ -16,7 +16,6 @@ use crate::auth::AuthContext;
 /// ```
 /// use axum::http::StatusCode;
 /// use objectstore_server::auth::AuthAwareService;
-/// use objectstore_server::error::ApiResult;
 ///
 /// async fn my_endpoint(service: AuthAwareService) -> Result<StatusCode, StatusCode> {
 ///     service.delete_object(todo!("pass some ID"))

objectstore-server/src/cli.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 use argh::FromArgs;
 
 use crate::config::Config;
-use crate::{healthcheck, http, observability};
+use crate::{healthcheck, observability, web};
 
 /// Objectstore API webserver.
 #[derive(Debug, FromArgs)]
@@ -77,7 +77,7 @@ pub fn execute() -> Result<()> {
 
     let result = runtime.block_on(async move {
         match args.command {
-            Command::Run(RunCommand {}) => http::server(config).await,
+            Command::Run(RunCommand {}) => web::server(config).await,
             Command::Healthcheck(HealthcheckCommand {}) => healthcheck::healthcheck(config).await,
             Command::Version(VersionCommand {}) => unreachable!(),
         }

objectstore-server/src/error.rs …jectstore-server/src/endpoints/common.rsobjectstore-server/src/error.rs renamed to objectstore-server/src/endpoints/common.rs objectstore-server/src/error.rs renamed to objectstore-server/src/endpoints/common.rs

@@ -6,6 +6,7 @@ use axum::Router;
 
 use crate::state::ServiceState;
 
+mod common;
 mod health;
 mod objects;
 

objectstore-server/src/endpoints/mod.rs

@@ -13,7 +13,7 @@ use objectstore_types::Metadata;
 use serde::Serialize;
 
 use crate::auth::AuthAwareService;
-use crate::error::ApiResult;
+use crate::endpoints::common::ApiResult;
 use crate::extractors::Xt;
 use crate::state::ServiceState;
 

objectstore-server/src/endpoints/objects.rs

@@ -7,10 +7,9 @@ pub mod auth;
 pub mod cli;
 pub mod config;
 pub mod endpoints;
-pub mod error;
 pub mod extractors;
 pub mod healthcheck;
-pub mod http;
 pub mod killswitches;
 pub mod observability;
 pub mod state;
+pub mod web;