Proxy status

Author: robertnovac1

e2e/test_proxy.py

@@ -26,11 +26,10 @@ def test_status(self):
         """/_status should return 200 if proxy can reach to the backend"""
         response = ImmunisationApi.make_request_with_backoff(http_method="GET",
                                                              url=f"{self.proxy_url}/_status",
-                                                             headers={"apikey": self.status_api_key})
-        print(f"Calling {self.proxy_url}/_status with api key: {self.status_api_key}")
+                                                             headers={"apikey": self.status_api_key},
+                                                             is_status_check=True)
         self.assertEqual(response.status_code, 200, response.text)
         body = response.json()
-        print(f"Status code {response.status_code}  {body['status']}")
 
         self.assertEqual(body["status"].lower(), "pass",
                          f"service is not healthy: status: {body['status']}")

e2e/utils/immunisation_api.py

@@ -56,6 +56,7 @@ def make_request_with_backoff(
         expected_connection_failure: bool = False,
         max_retries: int = 5,
         delay_seconds: float = 2.0,
+        is_status_check: bool = False,
         **kwargs
     ):
         for attempt in range(max_retries):
@@ -71,6 +72,13 @@ def make_request_with_backoff(
                         f"URL: {url}"
                     )
 
+                # Sometimes it can take time for the new endpoint to activate
+                if is_status_check:
+                    body = response.json()
+                    if body["status"].lower() != "pass":
+                        raise RuntimeError(f"Server status check at {url} returned status code {response.status_code}, "
+                                           f"but status is: {body['status']}")
+
                 # Check if the response matches the expected status code to identify potential issues
                 if response.status_code != expected_status_code:
                     if response.status_code >= 500: