From 575d432696c2570dfce80aecc67fa67a7dd15d14 Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Thu, 7 Aug 2025 14:45:31 +0300 Subject: [PATCH 1/2] feat: enable log-viewer only when os env ENABLE_LOG_SERVER=true --- webhook_server/app.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/webhook_server/app.py b/webhook_server/app.py index 541d98e8..8b9cff70 100644 --- a/webhook_server/app.py +++ b/webhook_server/app.py @@ -275,11 +275,13 @@ def get_log_viewer_controller() -> LogViewerController: controller_dependency = Depends(get_log_viewer_controller) -# Log Viewer Endpoints -@FASTAPI_APP.get("/logs", operation_id="get_log_viewer_page", response_class=HTMLResponse) -def get_log_viewer_page(controller: LogViewerController = controller_dependency) -> HTMLResponse: - """Serve the main log viewer HTML page.""" - return controller.get_log_page() +# Log Viewer Endpoints - Only register if ENABLE_LOG_SERVER=true +if os.environ.get("ENABLE_LOG_SERVER") == "true": + + @FASTAPI_APP.get("/logs", operation_id="get_log_viewer_page", response_class=HTMLResponse) + def get_log_viewer_page(controller: LogViewerController = controller_dependency) -> HTMLResponse: + """Serve the main log viewer HTML page.""" + return controller.get_log_page() async def _get_log_entries_core( From 74eb9f362c6587279d65e4b850bd321f75141b40 Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Thu, 7 Aug 2025 15:21:48 +0300 Subject: [PATCH 2/2] test: fix log server endpoint tests for conditional registration - Set ENABLE_LOG_SERVER=true in conftest.py to ensure log endpoints are registered during test app initialization - Add async shutdown method mock in test_log_api.py to prevent AttributeError during test teardown - Fixes test failures caused by conditional log server endpoint registration based on environment variable --- webhook_server/tests/conftest.py | 1 + webhook_server/tests/test_log_api.py | 1 + 2 files changed, 2 insertions(+) diff --git a/webhook_server/tests/conftest.py b/webhook_server/tests/conftest.py index 82a83de4..d81b3cea 100644 --- a/webhook_server/tests/conftest.py +++ b/webhook_server/tests/conftest.py @@ -7,6 +7,7 @@ from webhook_server.libs.owners_files_handler import OwnersFileHandler os.environ["WEBHOOK_SERVER_DATA_DIR"] = "webhook_server/tests/manifests" +os.environ["ENABLE_LOG_SERVER"] = "true" from webhook_server.libs.github_api import GithubWebhook diff --git a/webhook_server/tests/test_log_api.py b/webhook_server/tests/test_log_api.py index e2b71feb..5028ced0 100644 --- a/webhook_server/tests/test_log_api.py +++ b/webhook_server/tests/test_log_api.py @@ -494,6 +494,7 @@ def test_get_logs_page(self) -> None: from fastapi.responses import HTMLResponse mock_instance.get_log_page.return_value = HTMLResponse(content="Log Viewer") + mock_instance.shutdown = AsyncMock() # Add async shutdown method from webhook_server.app import FASTAPI_APP