cabotage support

Author: JacobCoffee

Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.11-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+COPY miss_islington miss_islington
+
+CMD ["python", "-m", "miss_islington"]

miss_islington/__main__.py

@@ -71,11 +71,19 @@ async def repo_installation_added(event, gh, *args, **kwargs):
     print(f"App installed by {event.data['installation']['account']['login']}, installation_id: {event.data['installation']['id']}")
 
 
-sentry_sdk.init(dsn=os.environ.get("SENTRY_DSN"), integrations=[AioHttpIntegration()])
-app = web.Application()
-app.router.add_post("/", main)
-port = os.environ.get("PORT")
-if port is not None:
-    port = int(port)
-
-web.run_app(app, port=port)
+async def health_check(request):
+    """Health check endpoint for container orchestration."""
+    return web.Response(status=200, text="OK")
+
+
+if __name__ == "__main__":  # pragma: no cover
+    sentry_sdk.init(dsn=os.environ.get("SENTRY_DSN"), integrations=[AioHttpIntegration()])
+    app = web.Application()
+    app.router.add_post("/", main)
+    app.router.add_get("/health", health_check)
+
+    if os.path.isdir("/var/run/cabotage"):
+        web.run_app(app, path="/var/run/cabotage/cabotage.sock")
+    else:
+        port = os.environ.get("PORT")
+        web.run_app(app, port=int(port) if port else None)

miss_islington/tasks.py

@@ -19,8 +19,8 @@
 app = celery.Celery("backport_cpython")
 
 app.conf.update(
-    broker_url=os.environ["HEROKU_REDIS_MAROON_URL"],
-    result_backend=os.environ["HEROKU_REDIS_MAROON_URL"],
+    broker_url=os.environ.get("REDIS_URL", ""),
+    result_backend=os.environ.get("REDIS_URL", ""),
     broker_connection_retry_on_startup=True,
     broker_use_ssl={"ssl_cert_reqs": ssl.CERT_NONE},
     redis_backend_use_ssl={"ssl_cert_reqs": ssl.CERT_NONE},

runtime.txt

@@ -0,0 +1,17 @@
+import os
+
+os.environ.setdefault("REDIS_URL", "redis://localhost")
+
+from aiohttp import web
+
+from miss_islington import __main__ as main
+
+
+# simple heallth check to amke sure /health works
+async def test_health_check(aiohttp_client):
+    app = web.Application()
+    app.router.add_get("/health", main.health_check)
+    client = await aiohttp_client(app)
+    response = await client.get("/health")
+    assert response.status == 200
+    assert await response.text() == "OK"

tests/test___main__.py

@@ -7,7 +7,7 @@
 import redis
 import kombu
 
-os.environ["HEROKU_REDIS_MAROON_URL"] = "someurl"
+os.environ.setdefault("REDIS_URL", "redis://localhost")
 
 from miss_islington import backport_pr
 

tests/test_backport_pr.py

@@ -4,7 +4,7 @@
 from gidgethub import sansio
 import pytest
 
-os.environ.setdefault("HEROKU_REDIS_MAROON_URL", "someurl")
+os.environ.setdefault("REDIS_URL", "redis://localhost")
 
 from miss_islington import delete_branch, tasks