Updating services

Author: Bryan Sieber

poetry.lock

@@ -12,6 +12,8 @@ pydantic = "^1.9.0"
 uvicorn = {extras = ["standard"], version = "^0.17.4"}
 gunicorn = "^20.1.0"
 prometheus-client = "^0.13.1"
+python-bugzilla = "^3.2.0"
+atlassian-python-api = "^3.20.1"
 
 [tool.poetry.dev-dependencies]
 pre-commit = "^2.17.0"

pyproject.toml

@@ -6,11 +6,20 @@
 
 
 class Settings(BaseSettings):
-    jbi_action_key: str = "jbi"
-    jbi_folder_path: str = "src/jbi/whiteboard_tags/"
     port: str = "80"
     app_reload: bool = True
 
+    # JBI env vars
+    jbi_action_key: str = "jbi"
+    jbi_folder_path: str = "src/jbi/whiteboard_tags/"
+    jira_base_url: str = "https://jira.allizom.org/"
+    bugzilla_base_url: str = "https://bugzilla-dev.allizom.org/"
+
+    # Secrets below
+    jira_username: str
+    jira_password: str
+    bugzilla_api_key: str
+
 
 @lru_cache()
 def get_settings() -> Settings:

src/app/environment.py

@@ -12,7 +12,7 @@
 def heartbeat(request: Request, settings: environment.Settings):
     """Return status of backing services, as required by Dockerflow."""
     data: Dict = {}
-    data.update(jbi_service_health_map(settings))
+    data.update(jbi_service_health_map())
     status_code = 200
     for _, health in data.items():
         if not health.get("up"):

src/app/monitor.py

@@ -1,23 +1,35 @@
-# import bugzilla
-# import jira
+import bugzilla as rh_bugzilla  # type: ignore
+from atlassian import Jira  # type: ignore
 
+from src.app import environment
 
-def get_service(param=None):
-    return param
+settings = environment.get_settings()
 
+jira = Jira(
+    url=settings.jira_base_url,
+    username=settings.jira_username,
+    password=settings.jira_password,
+)
 
-def bugzilla_check_health(settings):
-    health = {"up": False}
+bugzilla = rh_bugzilla.Bugzilla(
+    settings.bugzilla_base_url, api_key=settings.bugzilla_api_key
+)
+
+
+def bugzilla_check_health():
+    health = {"up": bugzilla.logged_in}
     return health
 
 
-def jira_check_health(settings):
+def jira_check_health():
+    server_info = jira.get_server_info(True)
+    print(server_info)
     health = {"up": False}
     return health
 
 
-def jbi_service_health_map(settings):
+def jbi_service_health_map():
     return {
-        "bugzilla": bugzilla_check_health(settings),
-        "jira": jira_check_health(settings),
+        "bugzilla": bugzilla_check_health(),
+        "jira": jira_check_health(),
     }