fix: move healthcheck to unauth router to allow cli healthchecks

Author: rambo

src/rmmtxauthz/web/application.py

@@ -16,7 +16,7 @@
 from .mediamtx import mtxrouter
 from .instructions import router as irouter
 from .interop import interoprouter
-
+from .health import hrouter
 
 LOGGER = logging.getLogger(__name__)
 
@@ -47,6 +47,7 @@ def get_app_no_init() -> FastAPI:
     app.include_router(crudrouter, prefix="/api/v1/users", tags=["users"])
     app.include_router(mtxrouter, prefix="/api/v1/mediamtx", tags=["mediamtx"])
     app.include_router(irouter, prefix="/api/v1", tags=["instructions"])
+    app.include_router(hrouter, prefix="/api/v1", tags=["health"])
     return app
 
 

src/rmmtxauthz/web/health.py

@@ -0,0 +1,21 @@
+"""Health check"""
+
+import logging
+
+from fastapi import APIRouter
+from libpvarki.schemas.product import ProductHealthCheckResponse
+
+from ..db.user import User
+
+LOGGER = logging.getLogger(__name__)
+
+hrouter = APIRouter()
+
+
+@hrouter.get("/healthcheck")
+async def request_healthcheck() -> ProductHealthCheckResponse:
+    """Check that we are healthy, return accordingly"""
+    users_count = 0
+    async for _user in User.list():
+        users_count += 1
+    return ProductHealthCheckResponse(healthy=True, extra=f"DB works, {users_count} users found")

src/rmmtxauthz/web/instructions.py

@@ -9,7 +9,7 @@
 from pydantic import BaseModel, Field, ConfigDict
 from fastapi import APIRouter, Depends, Request, HTTPException
 from libpvarki.middleware import MTLSHeader
-from libpvarki.schemas.product import UserCRUDRequest, ProductHealthCheckResponse
+from libpvarki.schemas.product import UserCRUDRequest
 
 from ..db.user import User
 from ..db.errors import NotFound
@@ -87,13 +87,3 @@ async def user_intructions(user: UserCRUDRequest, request: Request, language: st
     )
 
     return {"callsign": dbuser.username, "instructions": json.dumps(instructions_data), "language": language}
-
-
-@router.get("/healthcheck")
-async def request_healthcheck(request: Request) -> ProductHealthCheckResponse:
-    """Check that we are healthy, return accordingly"""
-    comes_from_rm(request)
-    users_count = 0
-    async for _user in User.list():
-        users_count += 1
-    return ProductHealthCheckResponse(healthy=True, extra=f"DB works, {users_count} users found")