refactor: remove hatsu_openapi crate

importantimport · Sep 14, 2024 · 1e868cb · 1e868cb
1 parent d4b1ef7
commit 1e868cb
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,7 +61,6 @@ members = [
     "crates/db_schema",
     "crates/feed",
     "crates/nodeinfo",
-    "crates/openapi",
     "crates/tracing",
     "crates/utils",
     "crates/well_known",
@@ -79,7 +78,6 @@ hatsu_db_migration = { path = "./crates/db_migration" }
 hatsu_db_schema = { path = "./crates/db_schema" }
 hatsu_feed = { path = "./crates/feed" }
 hatsu_nodeinfo = { path = "./crates/nodeinfo" }
-hatsu_openapi = { path = "./crates/openapi" }
 hatsu_tracing = { path = "./crates/tracing" }
 hatsu_utils = { path = "./crates/utils" }
 hatsu_well_known = { path = "./crates/well_known" }
@@ -146,7 +144,6 @@ uuid = { version = "1.8", features = [
 hatsu_api_apub = { workspace = true }
 hatsu_apub = { workspace = true }
 hatsu_backend = { workspace = true }
-# hatsu_cron = { workspace = true }
 hatsu_db_migration = { workspace = true }
 hatsu_db_schema = { workspace = true }
 hatsu_tracing = { workspace = true }

diff --git a/crates/backend/Cargo.toml b/crates/backend/Cargo.toml
@@ -22,7 +22,6 @@ hatsu_api_apub = { workspace = true }
 hatsu_api_mastodon = { workspace = true }
 hatsu_cron = { workspace = true }
 hatsu_nodeinfo = { workspace = true }
-hatsu_openapi = { workspace = true }
 hatsu_well_known = { workspace = true }
 hatsu_utils = { workspace = true }
 activitypub_federation = { workspace = true }

diff --git a/crates/backend/src/lib.rs b/crates/backend/src/lib.rs
@@ -8,6 +8,7 @@ use tower_http::{
 use tracing::Level;
 
 mod favicon;
+mod openapi;
 mod routes;
 
 pub struct Server {

diff --git a/crates/openapi/src/apidoc.rs → crates/backend/src/openapi.rs b/crates/openapi/src/apidoc.rs → crates/backend/src/openapi.rs
diff --git a/crates/backend/src/routes.rs b/crates/backend/src/routes.rs
@@ -4,15 +4,15 @@ use utoipa::OpenApi;
 use utoipa_axum::router::OpenApiRouter;
 use utoipa_scalar::{Scalar, Servable};
 
-use crate::favicon;
+use crate::{favicon, openapi::ApiDoc};
 
 // ./hatsu --version
 async fn root() -> Response<String> {
     Response::new(AppEnv::info())
 }
 
 pub fn routes() -> Router {
-    let (api_router, api) = OpenApiRouter::with_openapi(hatsu_openapi::ApiDoc::openapi())
+    let (api_router, api) = OpenApiRouter::with_openapi(ApiDoc::openapi())
         .merge(hatsu_api::routes())
         .merge(hatsu_api_admin::routes())
         .merge(hatsu_api_apub::routes())

diff --git a/crates/openapi/Cargo.toml b/crates/openapi/Cargo.toml
diff --git a/crates/openapi/src/lib.rs b/crates/openapi/src/lib.rs