Fix config sub-router prefixes and router tags

backend/app/routers/action_config.py

@@ -11,19 +11,16 @@ from app.exceptions import (
     ActionNotFoundError,
     ActionReadonlyError,
     ConfigWriteError,
-    JailNameError,
-    JailNotFoundInConfigError,
 )
 from app.models.config import (
     ActionConfig,
     ActionCreateRequest,
     ActionListResponse,
     ActionUpdateRequest,
-    AssignActionRequest,
 )
 from app.services import action_config_service
 
-router: APIRouter = APIRouter()
+router: APIRouter = APIRouter(prefix="/actions", tags=["Action Config"])
 
 _ActionNamePath = Annotated[
     str,
@@ -54,7 +51,7 @@ def _not_found(name: str) -> HTTPException:
     )
 
 @router.get(
-    "/actions",
+    "/",
     response_model=ActionListResponse,
     summary="List all available actions with active/inactive status",
 )
@@ -91,7 +88,7 @@ async def list_actions(
 
 
 @router.get(
-    "/actions/{name}",
+    "/{name}",
     response_model=ActionConfig,
     summary="Return full parsed detail for a single action",
 )
@@ -133,7 +130,7 @@ async def get_action(
 
 
 @router.put(
-    "/actions/{name}",
+    "/{name}",
     response_model=ActionConfig,
     summary="Update an action's .local override with new lifecycle command values",
 )
@@ -182,7 +179,7 @@ async def update_action(
 
 
 @router.post(
-    "/actions",
+    "/",
     response_model=ActionConfig,
     status_code=status.HTTP_201_CREATED,
     summary="Create a new user-defined action",
@@ -233,7 +230,7 @@ async def create_action(
 
 
 @router.delete(
-    "/actions/{name}",
+    "/{name}",
     status_code=status.HTTP_204_NO_CONTENT,
     summary="Delete a user-created action's .local file",
 )
@@ -279,108 +276,6 @@ async def delete_action(
 
 
 
-@router.post(
-    "/jails/{name}/action",
-    status_code=status.HTTP_204_NO_CONTENT,
-    summary="Add an action to a jail",
-)
-async def assign_action_to_jail(
-    request: Request,
-    _auth: AuthDep,
-    config_dir: Fail2BanConfigDirDep,
-    socket_path: Fail2BanSocketDep,
-    name: _NamePath,
-    body: AssignActionRequest,
-    reload: bool = Query(default=False, description="Reload fail2ban after assigning."),
-) -> None:
-    """Append an action entry to the jail's ``.local`` config.
-
-    Existing keys in the jail's ``.local`` file are preserved.  If the file
-    does not exist it is created.  The action is not duplicated if it is
-    already present.
-
-    Args:
-        request: FastAPI request object.
-        _auth: Validated session.
-        name: Jail name.
-        body: Action to add plus optional per-jail parameters.
-        reload: When ``true``, trigger a fail2ban reload after writing.
-
-    Raises:
-        HTTPException: 400 if *name* or *action_name* contain invalid characters.
-        HTTPException: 404 if the jail or action does not exist.
-        HTTPException: 500 if writing fails.
-    """
-    try:
-        await action_config_service.assign_action_to_jail(config_dir, socket_path, name, body, do_reload=reload)
-    except (JailNameError, ActionNameError) as exc:
-        raise _bad_request(str(exc)) from exc
-    except JailNotFoundInConfigError:
-        raise _not_found(name) from None
-    except ActionNotFoundError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=f"Action not found: {exc.name!r}",
-        ) from exc
-    except ConfigWriteError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to write jail override: {exc}",
-        ) from exc
-
-
-
-
-@router.delete(
-    "/jails/{name}/action/{action_name}",
-    status_code=status.HTTP_204_NO_CONTENT,
-    summary="Remove an action from a jail",
-)
-async def remove_action_from_jail(
-    request: Request,
-    _auth: AuthDep,
-    config_dir: Fail2BanConfigDirDep,
-    socket_path: Fail2BanSocketDep,
-    name: _NamePath,
-    action_name: Annotated[str, Path(description="Action base name to remove.")],
-    reload: bool = Query(default=False, description="Reload fail2ban after removing."),
-) -> None:
-    """Remove an action from the jail's ``.local`` config.
-
-    If the jail has no ``.local`` file or the action is not listed there,
-    the call is silently idempotent.
-
-    Args:
-        request: FastAPI request object.
-        _auth: Validated session.
-        name: Jail name.
-        action_name: Base name of the action to remove.
-        reload: When ``true``, trigger a fail2ban reload after writing.
-
-    Raises:
-        HTTPException: 400 if *name* or *action_name* contain invalid characters.
-        HTTPException: 404 if the jail is not found in config files.
-        HTTPException: 500 if writing fails.
-    """
-    try:
-        await action_config_service.remove_action_from_jail(
-            config_dir,
-            socket_path,
-            name,
-            action_name,
-            do_reload=reload,
-        )
-    except (JailNameError, ActionNameError) as exc:
-        raise _bad_request(str(exc)) from exc
-    except JailNotFoundInConfigError:
-        raise _not_found(name) from None
-    except ConfigWriteError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to write jail override: {exc}",
-        ) from exc
-
-
 # ---------------------------------------------------------------------------
 # fail2ban log viewer endpoints
 # ---------------------------------------------------------------------------