From 5054f609dde689abd413d0de43daea19fc2197ba Mon Sep 17 00:00:00 2001 From: Andrew Ridgway Date: Wed, 20 May 2026 22:54:31 +1000 Subject: [PATCH] gitea compliant var names --- .env.example | 6 +++--- .gitea/workflows/build_push.yml | 6 +++--- src/pr_reviewer/main.py | 22 +++++++++++----------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.env.example b/.env.example index 166f463..3b35e5e 100644 --- a/.env.example +++ b/.env.example @@ -25,6 +25,6 @@ PER_CREW_TIMEOUT=300 LOG_LEVEL=INFO # Gitea Webhook Configuration -GITEA_URL=http://192.168.178.160:3000 -GITEA_TOKEN=your_gitea_personal_access_token_here -GITEA_SECRET=your_webhook_secret_here \ No newline at end of file +ACCESS_GITEA_URL=http://192.168.178.160:3000 +ACCESS_GITEA_TOKEN=your_gitea_personal_access_token_here +ACCESS_GITEA_SECRET=your_webhook_secret_here \ No newline at end of file diff --git a/.gitea/workflows/build_push.yml b/.gitea/workflows/build_push.yml index a313db4..d4bd2a3 100644 --- a/.gitea/workflows/build_push.yml +++ b/.gitea/workflows/build_push.yml @@ -73,8 +73,8 @@ jobs: --from-literal=LOG_LEVEL=INFO \ --from-literal=TOTAL_FLOW_TIMEOUT=600 \ --from-literal=PER_CREW_TIMEOUT=300 \ - --from-literal=GITEA_URL=${{ vars.GITEA_URL }} \ - --from-literal=GITEA_TOKEN=${{ secrets.GITEA_TOKEN }} \ - --from-literal=GITEA_SECRET=${{ secrets.GITEA_SECRET }} \ + --from-literal=ACCESS_GITEA_URL=${{ vars.ACCESS_GITEA_URL }} \ + --from-literal=ACCESS_GITEA_TOKEN=${{ secrets.ACCESS_GITEA_TOKEN }} \ + --from-literal=ACCESS_GITEA_SECRET=${{ secrets.ACCESS_GITEA_SECRET }} \ --namespace=pr-reviewer kubectl apply -f kube/pr-reviewer_deployment.yaml && kubectl apply -f kube/pr-reviewer_service.yaml diff --git a/src/pr_reviewer/main.py b/src/pr_reviewer/main.py index 781daf1..53203ad 100644 --- a/src/pr_reviewer/main.py +++ b/src/pr_reviewer/main.py @@ -31,9 +31,9 @@ app = FastAPI( TOTAL_FLOW_TIMEOUT = int(os.getenv("TOTAL_FLOW_TIMEOUT", "600")) # Default 10 minutes PER_CREW_TIMEOUT = int(os.getenv("PER_CREW_TIMEOUT", "300")) # Default 5 minutes -GITEA_URL = os.getenv("GITEA_URL", "http://192.168.178.160:3000") -GITEA_TOKEN = os.getenv("GITEA_TOKEN") -WEBHOOK_SECRET = os.getenv("GITEA_SECRET", "") +ACCESS_GITEA_URL = os.getenv("ACCESS_GITEA_URL", "http://192.168.178.160:3000") +ACCESS_GITEA_TOKEN = os.getenv("ACCESS_GITEA_TOKEN") +WEBHOOK_SECRET = os.getenv("ACCESS_GITEA_SECRET", "") @app.get("/api/v1/health") @@ -52,8 +52,8 @@ def verify_signature(payload: bytes, signature: str) -> bool: def fetch_pr_files(repo_full: str, pr_number: int) -> List[Dict[str, Any]]: - headers = {"Authorization": f"token {GITEA_TOKEN}"} - url = f"{GITEA_URL}/api/v1/repos/{repo_full}/pulls/{pr_number}/files" + headers = {"Authorization": f"token {ACCESS_GITEA_TOKEN}"} + url = f"{ACCESS_GITEA_URL}/api/v1/repos/{repo_full}/pulls/{pr_number}/files" resp = requests.get(url, headers=headers) resp.raise_for_status() files_data = resp.json() @@ -64,7 +64,7 @@ def fetch_pr_files(repo_full: str, pr_number: int) -> List[Dict[str, Any]]: status = f["status"] content = None if status in ("added", "modified"): - raw_url = f"{GITEA_URL}/api/v1/repos/{repo_full}/contents/{filename}?ref=pulls/{pr_number}/head" + raw_url = f"{ACCESS_GITEA_URL}/api/v1/repos/{repo_full}/contents/{filename}?ref=pulls/{pr_number}/head" raw_resp = requests.get(raw_url, headers=headers) if raw_resp.ok: raw = raw_resp.json() @@ -82,8 +82,8 @@ def fetch_pr_files(repo_full: str, pr_number: int) -> List[Dict[str, Any]]: def post_pr_comment(repo_full: str, pr_number: int, comment: str) -> None: - headers = {"Authorization": f"token {GITEA_TOKEN}"} - url = f"{GITEA_URL}/api/v1/repos/{repo_full}/issues/{pr_number}/comments" + headers = {"Authorization": f"token {ACCESS_GITEA_TOKEN}"} + url = f"{ACCESS_GITEA_URL}/api/v1/repos/{repo_full}/issues/{pr_number}/comments" resp = requests.post(url, headers=headers, json={"body": comment}) resp.raise_for_status() logger.info(f"Posted review comment to PR #{pr_number} in {repo_full}") @@ -105,14 +105,14 @@ async def gitea_webhook(request: Request) -> Dict[str, Any]: pr_number = pr["number"] repo = data["repository"] repo_full = repo["full_name"] - repo_url = repo.get("html_url", f"{GITEA_URL}/{repo_full}") + repo_url = repo.get("html_url", f"{ACCESS_GITEA_URL}/{repo_full}") if action not in ("opened", "synchronize", "reopened"): logger.info(f"Ignoring PR action: {action}") return {"status": "ignored", "reason": f"action '{action}' not processed"} - if not GITEA_TOKEN: - raise HTTPException(status_code=500, detail="GITEA_TOKEN not configured") + if not ACCESS_GITEA_TOKEN: + raise HTTPException(status_code=500, detail="ACCESS_GITEA_TOKEN not configured") try: files = fetch_pr_files(repo_full, pr_number)