Merge pull request #220 from openzim/healthcheck-fixes

fix wrong collections URL and success

Author: elfkuzco

healthcheck/src/healthcheck/status/auth.py

@@ -49,7 +49,7 @@ async def _generate_oauth_access_token(self) -> None:
                 Context.cms_oauth_client_id, Context.cms_oauth_client_secret
             ),
             timeout=Context.requests_timeout,
-            check_name="zimfarm-api-authentication",
+            check_name="cms-api-authentication",
         )
         if response.json:
             self._access_token = cast(str, response.json["access_token"])
@@ -58,7 +58,7 @@ async def _generate_oauth_access_token(self) -> None:
             )
 
     async def _generate_local_access_token(self) -> None:
-        check_name = "zimfarm-api-authentication"
+        check_name = "cms-api-authentication"
         if self._refresh_token:
             response = await query_api(
                 f"{Context.cms_api_url}/auth/refresh",
@@ -135,13 +135,13 @@ async def authenticate() -> Result[Token]:
             f"{Context.cms_api_url}/auth/me",
             method="GET",
             headers={"Authorization": f"Bearer {token.access_token}"},
-            check_name="zimfarm-api-authentication",
+            check_name="cms-api-authentication",
         )
 
         if response.success:
             logger.debug(
                 f"Authentication successful using {Context.auth_mode} mode",
-                extra={"checkname": "zimfarm-api-authentication"},
+                extra={"checkname": "cms-api-authentication"},
             )
 
             return Result(

healthcheck/src/healthcheck/status/collections.py

@@ -34,7 +34,7 @@ async def check_collection_catalog_generation(
     session: aiohttp.ClientSession, collection: CollectionLightSchema
 ) -> CollectionCatalogStatus:
     async with session.get(
-        f"{Context.cms_api_url}/{collection.id}/catalog.xml",
+        f"{Context.cms_api_url}/collections/{collection.id}/catalog.xml",
         timeout=aiohttp.ClientTimeout(total=Context.catalog_generation_timeout),
     ) as resp:
         return CollectionCatalogStatus(
@@ -83,7 +83,7 @@ async def check_catalog_generation() -> Result[CatalogStatus]:
             )
 
         return Result(
-            success=bool(failures),
-            status_code=HTTPStatus.OK if len(failures) > 0 else HTTPStatus.NOT_FOUND,
+            success=False if failures else True,
+            status_code=HTTPStatus.NOT_FOUND if failures else HTTPStatus.OK,
             data=CatalogStatus(collections=catalog_statuses),
         )