allow all org members to automerge

modules/web01/clan-merge.nix

@@ -14,17 +14,7 @@
       while sleep 10; do
         ${self.packages.${pkgs.system}.clan-merge}/bin/clan-merge \
           --bot-name clan-bot \
-          --allowed-users \
-              clan-bot \
-              hsjobeki \
-              DavHau \
-              lassulus \
-              Mic92 \
-              Qubasa \
-          --repos\
-              clan-infra \
-              clan-core \
-              clan-homepage
+          --repos clan-infra clan-core clan-homepage
       done
     '';
   };

pkgs/clan-merge/clan_merge/__init__.py

@@ -1,6 +1,7 @@
 import argparse
 import json
 import urllib.request
+import urllib.error
 from os import environ
 from typing import Optional
 
@@ -37,11 +38,23 @@ def is_ci_green(pr: dict) -> bool:
             return False
     return True
 
+def is_org_member(user: str, token: str) -> bool:
+    url = "https://git.clan.lol/api/v1/orgs/clan/members/" + user + f"?token={token}"
+    try:
+        urllib.request.urlopen(url)
+        return True
+    except urllib.error.HTTPError as e:
+        if e.code == 404:
+            return False
+        else:
+            raise
 
-def decide_merge(pr: dict, allowed_users: list[str], bot_name: str) -> bool:
+
+
+def merge_allowed(pr: dict, bot_name: str, token: str) -> bool:
     assignees = pr["assignees"] if pr["assignees"] else []
     if (
-        pr["user"]["login"] in allowed_users
+        is_org_member(pr["user"]["login"], token)
         and pr["mergeable"] is True
         and not pr["title"].startswith("WIP:")
         and pr["state"] == "open"
@@ -61,10 +74,10 @@ def list_prs(repo: str) -> list:
     return data
 
 
-def list_prs_to_merge(prs: list, allowed_users: list[str], bot_name: str) -> list:
+def list_prs_to_merge(prs: list, bot_name: str, gitea_token: str) -> list:
     prs_to_merge = []
     for pr in prs:
-        if decide_merge(pr, allowed_users, bot_name) is True:
+        if merge_allowed(pr, bot_name, gitea_token):
             prs_to_merge.append(pr)
     return prs_to_merge
 
@@ -72,12 +85,6 @@ def list_prs_to_merge(prs: list, allowed_users: list[str], bot_name: str) -> lis
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Merge PRs on clan.lol")
     # parse a list of allowed users
-    parser.add_argument(
-        "--allowed-users",
-        nargs="+",
-        help="list of users allowed to merge",
-        required=True,
-    )
     # option for bot-name
     parser.add_argument(
         "--bot-name",
@@ -107,13 +114,12 @@ def clan_merge(
         gitea_token = load_token()
     if args is None:
         args = parse_args()
-    allowed_users = args.allowed_users
     repos = args.repos
     dry_run = args.dry_run
     bot_name = args.bot_name
     for repo in repos:
         prs = list_prs(repo)
-        prs_to_merge = list_prs_to_merge(prs, allowed_users, bot_name)
+        prs_to_merge = list_prs_to_merge(prs, bot_name, gitea_token)
         for pr in prs_to_merge:
             url = (
                 "https://git.clan.lol/api/v1/repos/clan/"

pkgs/clan-merge/tests/test_cli.py

@@ -13,7 +13,7 @@ def test_no_args(capsys: pytest.CaptureFixture) -> None:
 
 def test_decide_merge_allowed(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(clan_merge, "is_ci_green", lambda x: True)
-    allowed_users = ["foo"]
+    monkeypatch.setattr(clan_merge, "is_org_member", lambda y, x: True)
     bot_name = "some-bot-name"
     pr = dict(
         id=1,
@@ -23,12 +23,12 @@ def test_decide_merge_allowed(monkeypatch: pytest.MonkeyPatch) -> None:
         state="open",
         assignees=[dict(login=bot_name)],
     )
-    assert clan_merge.decide_merge(pr, allowed_users, bot_name=bot_name) is True
+    assert clan_merge.merge_allowed(pr, bot_name=bot_name, token="test") is True
 
 
 def test_decide_merge_not_allowed(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(clan_merge, "is_ci_green", lambda x: True)
-    allowed_users = ["foo"]
+    monkeypatch.setattr(clan_merge, "is_org_member", lambda y, x: True)
     pr1 = dict(
         id=1,
         user=dict(login="bar"),
@@ -69,15 +69,16 @@ def test_decide_merge_not_allowed(monkeypatch: pytest.MonkeyPatch) -> None:
         state="open",
         assignees=[dict(login="clan-bot")],
     )
-    assert clan_merge.decide_merge(pr1, allowed_users, bot_name="some-bot") is False
-    assert clan_merge.decide_merge(pr2, allowed_users, bot_name="some-bot") is False
-    assert clan_merge.decide_merge(pr3, allowed_users, bot_name="some-bot") is False
-    assert clan_merge.decide_merge(pr4, allowed_users, bot_name="some-bot") is False
-    assert clan_merge.decide_merge(pr5, allowed_users, bot_name="some-bot") is False
+    assert not clan_merge.merge_allowed(pr1, bot_name="some-bot", token="test")
+    assert not clan_merge.merge_allowed(pr2, bot_name="some-bot", token="test")
+    assert not clan_merge.merge_allowed(pr3, bot_name="some-bot", token="test")
+    assert not clan_merge.merge_allowed(pr4, bot_name="some-bot", token="test")
+    assert not clan_merge.merge_allowed(pr5, bot_name="some-bot", token="test")
 
 
 def test_list_prs_to_merge(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(clan_merge, "is_ci_green", lambda x: True)
+    monkeypatch.setattr(clan_merge, "is_org_member", lambda user, x: user == "foo")
     bot_name = "some-bot-name"
     prs = [
         dict(
@@ -111,4 +112,4 @@ def test_list_prs_to_merge(monkeypatch: pytest.MonkeyPatch) -> None:
             assignees=[dict(login=bot_name)],
         ),
     ]
-    assert clan_merge.list_prs_to_merge(prs, ["foo"], bot_name=bot_name) == [prs[0]]
+    assert clan_merge.list_prs_to_merge(prs, bot_name=bot_name, gitea_token="test") == [prs[0]]