Make reportbot a service.

README.md

@@ -59,11 +59,11 @@ start Jenkins jobs in response to other events.
 
 Environment variable | Description
 -------------------- | --------------------------------------------------------
- `LAS_REPORTBOT_ADDRESS` | The host:port combination to send messages to
- `LAS_REPORTBOT_PREFIX`  | The text to send to the socket before any messages (e.g. API key)
+ `LAS_REPORTBOT_URL` | The full URL to the report API endpoint
+ `LAS_REPORTBOT_KEY` | The authentication key to use
+ `LAS_REPORTBOT_CHANNEL` | The channel to send messages to
 
-LaS can send messages to a ReportBot instance (sending plain text over a TCP
-connection with a specified prefix).
+LaS can send messages to a ReportBot instance.
 
 ## Contributing
 

lineandsinker/services/__init__.py

@@ -2,6 +2,7 @@ import os
 
 from .jenkins import Jenkins
 from .gitea import Gitea
+from .reportbot import ReportBot
 
 
 def gitea_factory():
@@ -16,4 +17,12 @@ def jenkins_factory():
     )
 
 
+def reportbot_factory():
+    return ReportBot(
+        os.environ["LAS_REPORTBOT_URL"],
+        os.environ["LAS_REPORTBOT_KEY"],
+        os.environ["LAS_REPORTBOT_CHANNEL"],
+    )
+
+
 factories = {"gitea": gitea_factory, "jenkins": jenkins_factory}

lineandsinker/services/reportbot.py

@@ -0,0 +1,17 @@
+import requests
+
+from .service import Service
+
+
+class ReportBot(Service):
+    def __init__(self, url, key, channel):
+        super().__init__("reportbot")
+        self._url = url
+        self._key = key
+        self._channel = channel
+
+    def announce(self, message):
+        requests.get(
+            self._url,
+            {"key": self._key, "command": f"CM {self._channel}", "args": message},
+        )

main.py

@@ -1,13 +1,10 @@
-import os
 import re
-import socket
 from functools import wraps
 
 from flask import Flask, abort, request, Response
 
 from lineandsinker.common import get_hook_key
-from lineandsinker.services import gitea_factory, jenkins_factory
-
+from lineandsinker.services import gitea_factory, jenkins_factory, reportbot_factory
 
 url_pattern = re.compile(
     "^/hooks/(?P<service>[^/]+)/(?P<identifier>.*)/(?P<key>[^/]+)$"
@@ -33,21 +30,9 @@ def authenticate(f):
     return wrapper
 
 
-def reportbot_announce(message):
-    try:
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-            host = os.environ["LAS_REPORTBOT_ADDRESS"].split(":")
-            sock.connect((host[0], int(host[1])))
-            sock.sendall(
-                f"{os.environ['LAS_REPORTBOT_PREFIX']} {message}\n".encode("utf-8")
-            )
-            app.logger.info(f"Report bot response: {sock.recv(512)}")
-    except:
-        app.logger.exception("Unable to send report bot message")
-
-
 jenkins_service = jenkins_factory()
 gitea_service = gitea_factory()
+reportbot_service = reportbot_factory()
 repos = dict((name, [ssh, clone]) for name, ssh, clone in gitea_service.get_repos())
 jobs = list(jenkins_service.get_jobs())
 app = Flask(__name__)
@@ -82,11 +67,11 @@ def handle_hook_gitea(repo):
             compare = data["compare_url"]
             pusher = data["pusher"]["login"]
 
-            reportbot_announce(
+            reportbot_service.announce(
                 f"\002[git]\002 {pusher} pushed {commits} commit{'s' if commits != 1 else ''} to {repo}: {compare}"
             )
             for commit in data["commits"][:3]:
-                reportbot_announce(
+                reportbot_service.announce(
                     f"\002[git]\002 {commit['id'][:10]}: {commit['message'][:100]}"
                 )
 
@@ -106,7 +91,7 @@ def handle_docker_registry():
             tag = event["target"]["tag"]
             host = event["request"]["host"]
             user = event["actor"]["name"]
-            reportbot_announce(
+            reportbot_service.announce(
                 f"\002[registry]\002 New manifest pushed to {host}/{repo}:{tag} by {user}"
             )