Fix #382: retry login requests to Bugzilla (#516)

Author: leplatrem

jbi/services/bugzilla.py

@@ -59,7 +59,7 @@ def _call(self, verb, url, *args, **kwargs):
             raise BugzillaClientError(parsed["message"])
         return parsed
 
-    @property
+    @instrumented_method
     def logged_in(self) -> bool:
         """Verify the API key validity."""
         # https://bugzilla.readthedocs.io/en/latest/api/core/v1/user.html#who-am-i
@@ -137,7 +137,7 @@ def get_client():
 def check_health() -> ServiceHealth:
     """Check health for Bugzilla Service"""
     client = get_client()
-    logged_in = client.logged_in
+    logged_in = client.logged_in()
 
     # Check that all JBI webhooks are enabled in Bugzilla,
     # and report disabled ones.

tests/unit/services/test_bugzilla.py

@@ -52,7 +52,7 @@ def test_bugzilla_key_is_passed_in_header(mocked_responses):
         ],
     )
 
-    assert get_client().logged_in
+    assert get_client().logged_in()
 
     assert len(mocked_responses.calls) == 1
     # The following assertion is redundant with matchers but also more explicit.

tests/unit/test_router.py

@@ -155,7 +155,7 @@ def test_read_version(anon_client):
 
 def test_read_heartbeat_all_services_fail(anon_client, mocked_jira, mocked_bugzilla):
     """/__heartbeat__ returns 503 when all the services are unavailable."""
-    mocked_bugzilla.logged_in = False
+    mocked_bugzilla.logged_in.return_value = False
     mocked_jira.get_server_info.return_value = None
 
     resp = anon_client.get("/__heartbeat__")
@@ -193,7 +193,7 @@ def test_read_heartbeat_jira_services_fails(anon_client, mocked_jira, mocked_bug
 def test_read_heartbeat_bugzilla_webhooks_fails(
     anon_client, mocked_jira, mocked_bugzilla
 ):
-    mocked_bugzilla.logged_in = True
+    mocked_bugzilla.logged_in.return_value = True
     mocked_bugzilla.list_webhooks.return_value = [
         EXAMPLE_WEBHOOK.copy(update={"enabled": False})
     ]
@@ -211,7 +211,7 @@ def test_read_heartbeat_bugzilla_services_fails(
     anon_client, mocked_jira, mocked_bugzilla
 ):
     """/__heartbeat__ returns 503 when one service is unavailable."""
-    mocked_bugzilla.logged_in = False
+    mocked_bugzilla.logged_in.return_value = False
     mocked_jira.get_server_info.return_value = {}
     mocked_jira.projects.return_value = [{"key": "DevTest"}]
 
@@ -226,7 +226,7 @@ def test_read_heartbeat_bugzilla_services_fails(
 
 def test_read_heartbeat_success(anon_client, mocked_jira, mocked_bugzilla):
     """/__heartbeat__ returns 200 when checks succeed."""
-    mocked_bugzilla.logged_in = True
+    mocked_bugzilla.logged_in.return_value = True
     mocked_bugzilla.list_webhooks.return_value = [EXAMPLE_WEBHOOK]
     mocked_jira.get_server_info.return_value = {}
     mocked_jira.projects.return_value = [{"key": "DevTest"}]
@@ -297,7 +297,7 @@ def test_jira_heartbeat_missing_permissions(anon_client, mocked_jira, mocked_bug
 
 
 def test_jira_heartbeat_unknown_components(anon_client, mocked_jira, mocked_bugzilla):
-    mocked_bugzilla.logged_in = True
+    mocked_bugzilla.logged_in.return_value = True
     mocked_bugzilla.list_webhooks.return_value = [EXAMPLE_WEBHOOK]
     mocked_jira.get_server_info.return_value = {}
 
@@ -309,7 +309,7 @@ def test_jira_heartbeat_unknown_components(anon_client, mocked_jira, mocked_bugz
 
 def test_head_heartbeat_success(anon_client, mocked_jira, mocked_bugzilla):
     """/__heartbeat__ support head requests"""
-    mocked_bugzilla.logged_in = True
+    mocked_bugzilla.logged_in.return_value = True
     mocked_bugzilla.list_webhooks.return_value = [EXAMPLE_WEBHOOK]
     mocked_jira.get_server_info.return_value = {}
     mocked_jira.projects.return_value = [{"key": "DevTest"}]