Rework how services are created.

lineandsinker/services/__init__.py

@@ -0,0 +1,19 @@
+import os
+
+from .jenkins import Jenkins
+from .gitea import Gitea
+
+
+def gitea_factory():
+    return Gitea(os.environ["LAS_GITEA_URL"], os.environ["LAS_GITEA_TOKEN"])
+
+
+def jenkins_factory():
+    return Jenkins(
+        os.environ["LAS_JENKINS_URL"],
+        os.environ["LAS_JENKINS_USER"],
+        os.environ["LAS_JENKINS_PASSWORD"],
+    )
+
+
+factories = {"gitea": gitea_factory, "jenkins": jenkins_factory}

lineandsinker/services/gitea.py

@@ -1,5 +1,3 @@
-import os
-
 from jsonref import requests
 
 from ..common import get_hook_url
@@ -8,6 +6,7 @@ from .service import Service
 
 class Gitea(Service):
     def __init__(self, url, token, install_hooks=False):
+        super().__init__("gitea")
         self._url = url
         self._token = token
         self._install_hooks = install_hooks
@@ -20,7 +19,7 @@ class Gitea(Service):
             yield repo["full_name"], repo["ssh_url"], repo["clone_url"]
 
     def _maybe_install_gitea_hook(self, project):
-        hook_url = get_hook_url("gitea", project)
+        hook_url = get_hook_url(self.type, project)
         path = f"repos/{project}/hooks"
         hooks = self._request("get", path).json()
 
@@ -48,10 +47,3 @@ class Gitea(Service):
             kwargs["params"] = {}
         kwargs["params"]["access_token"] = self._token
         return requests.request(method, f"{self._url}api/v1/{api_path}", **kwargs)
-
-
-def gitea_factory():
-    return Gitea(os.environ["LAS_GITEA_URL"], os.environ["LAS_GITEA_TOKEN"])
-
-
-Service.add_factory(gitea_factory)

lineandsinker/services/jenkins.py

@@ -1,4 +1,3 @@
-import os
 import jenkins
 from bs4 import BeautifulSoup
 
@@ -10,6 +9,7 @@ class Jenkins(Service):
     SCM_CLASS = "hudson.plugins.git.GitSCM"
 
     def __init__(self, url, username, password):
+        super().__init__("jenkins")
         self._server = jenkins.Jenkins(url, username=username, password=password)
 
     def get_jobs(self):
@@ -22,14 +22,3 @@ class Jenkins(Service):
 
     def build_job(self, name):
         self._server.build_job(name)
-
-
-def jenkins_factory():
-    return Jenkins(
-        os.environ["LAS_JENKINS_URL"],
-        os.environ["LAS_JENKINS_USER"],
-        os.environ["LAS_JENKINS_PASSWORD"],
-    )
-
-
-Service.add_factory(jenkins_factory)

lineandsinker/services/service.py

@@ -1,10 +1,6 @@
 class Service:
-
-    factories = []
+    def __init__(self, type):
+        self.type = type
 
     def accept_hook(self, identifier, request):
         pass
-
-    @classmethod
-    def add_factory(cls, factory):
-        cls.factories.append(factory)

main.py

@@ -6,7 +6,7 @@ from functools import wraps
 from flask import Flask, abort, request, Response
 
 from lineandsinker.common import get_hook_key
-from lineandsinker.services import gitea, jenkins
+from lineandsinker.services import gitea_factory, jenkins_factory
 
 
 url_pattern = re.compile(
@@ -46,8 +46,8 @@ def reportbot_announce(message):
         app.logger.exception("Unable to send report bot message")
 
 
-jenkins_service = jenkins.jenkins_factory()
-gitea_service = gitea.gitea_factory()
+jenkins_service = jenkins_factory()
+gitea_service = gitea_factory()
 repos = dict((name, [ssh, clone]) for name, ssh, clone in gitea_service.get_repos())
 jobs = list(jenkins_service.get_jobs())
 app = Flask(__name__)