From 8149ce4e62c72f236a285c942283fd6ba01053a7 Mon Sep 17 00:00:00 2001
From: "Matthew R. Becker" <beckermr@users.noreply.github.com>
Date: Sun, 19 Jan 2025 13:27:57 -0600
Subject: [PATCH] feat: try api first, then use git (#327)

* feat: try api first, then use git

* fix: wrong git committer

* fix: set git author and committer
---
 action.yml         |  21 ++-----
 commit_lockfile.py | 141 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 15 deletions(-)
 create mode 100644 commit_lockfile.py

diff --git a/action.yml b/action.yml
index af51cb9..3e80057 100644
--- a/action.yml
+++ b/action.yml
@@ -252,21 +252,12 @@ runs:
         )
       shell: bash -leo pipefail {0}
       run: |
-        git config set user.email '${{ steps.git-user.outputs.user-email }}'
-        git config set user.name '${{ steps.git-user.outputs.user-name }}'
-
-        if [[ '${{ github.event_name }}' == 'issue_comment' ]]; then
-          branch=$(gh pr view --json headRefName --jq '.headRefName')
-          repo=$(gh pr view --json headRepository --jq '.headRepository.name')
-          owner=$(gh pr view --json headRepositoryOwner --jq '.headRepositoryOwner.login')
-        else
-          branch=$(git rev-parse --abbrev-ref HEAD)
-          repo=$(basename -s .git `git config --get remote.origin.url`)
-          owner=$(dirname `git config --get remote.origin.url` | rev | cut -d'/' -f1 | rev)
-        fi
-        git add '${{ inputs.lock-file }}'
-        git commit -m 'relock w/ conda-lock'
-        git push https://x-access-token:${GH_TOKEN}@github.com/${owner}/${repo}.git ${branch}:${branch}
+        # commit changes
+        python ${{ github.action_path }}/commit_lockfile.py \
+          --lock-file='${{ inputs.lock-file }}' \
+          --event-name='${{ github.event_name }}' \
+          --git-user-name='${{ steps.git-user.outputs.user-name }}' \
+          --git-user-email='${{ steps.git-user.outputs.user-email }}'
       env:
         GH_TOKEN: ${{ inputs.github-token }}
 
diff --git a/commit_lockfile.py b/commit_lockfile.py
new file mode 100644
index 0000000..a06431c
--- /dev/null
+++ b/commit_lockfile.py
@@ -0,0 +1,141 @@
+import json
+import os
+import subprocess
+
+import click
+import github
+
+
+def _get_repo_owner_and_name():
+    res = subprocess.run(
+        ["git", "remote", "get-url", "--push", "origin"],
+        check=True,
+        stdout=subprocess.PIPE,
+        text=True,
+    )
+    parts = res.stdout.strip().split("/")
+    if parts[-1].endswith(".git"):
+        parts[-1] = parts[-1][: -len(".git")]
+    return parts[-2], parts[-1]
+
+
+def _get_current_branch():
+    res = subprocess.run(
+        ["git", "rev-parse", "--abbrev-ref", "HEAD"],
+        check=True,
+        stdout=subprocess.PIPE,
+        text=True,
+    )
+    return res.stdout.strip()
+
+
+def _get_owner_repo_branch():
+    res = subprocess.run(
+        [
+            "gh",
+            "pr",
+            "view",
+            "--json",
+            "headRefName",
+            "--json",
+            "headRepository",
+            "--json",
+            "headRepositoryOwner",
+        ],
+        text=True,
+        check=True,
+        stdout=subprocess.PIPE,
+    )
+    data = json.loads(res.stdout.strip())
+    return (
+        data["headRepositoryOwner"]["login"],
+        data["headRepository"]["name"],
+        data["headRefName"],
+    )
+
+
+def _commit_via_cli(git_user_name, git_user_email, lock_file, owner, repo, branch):
+    subprocess.run(
+        ["git", "config", "set", "user.email", git_user_email],
+        check=True,
+    )
+    subprocess.run(
+        ["git", "config", "set", "user.name", git_user_name],
+        check=True,
+    )
+    subprocess.run(
+        ["git", "add", lock_file],
+        check=True,
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "relock w/ conda-lock"],
+        check=True,
+    )
+    subprocess.run(
+        [
+            "git",
+            "push",
+            f"https://x-access-token:{os.environ['GH_TOKEN']}@github.com/{owner}/{repo}.git",
+            f"{branch}:{branch}",
+        ],
+        check=True,
+    )
+
+
+def _commit_via_api(git_user_name, git_user_email, lock_file, owner, repo, branch):
+    gh = github.Github(auth=github.Auth.Token(os.environ["GH_TOKEN"]))
+    repo = gh.get_repo(f"{owner}/{repo}")
+
+    contents = repo.get_contents(lock_file, ref=branch)
+    with open(lock_file, "r") as f:
+        new_lockfile_content = f.read()
+
+    res = repo.update_file(
+        contents.path,
+        "relock w/ conda-lock",
+        new_lockfile_content,
+        contents.sha,
+        branch=branch,
+        author=github.InputGitAuthor(git_user_name, git_user_email),
+        committer=github.InputGitAuthor(git_user_name, git_user_email),
+    )
+    print(
+        f"Updated w/ commit {res['commit'].sha}",
+        flush=True,
+    )
+
+
+@click.command()
+@click.option("--lock-file", required=True, type=click.Path())
+@click.option("--event-name", required=False, default=None, type=str)
+@click.option("--git-user-name", required=True, type=str)
+@click.option("--git-user-email", required=True, type=str)
+def main(
+    lock_file,
+    event_name,
+    git_user_name,
+    git_user_email,
+):
+    if event_name == "issue_comment":
+        repo_owner, repo_name, branch = _get_owner_repo_branch()
+    else:
+        repo_owner, repo_name = _get_repo_owner_and_name()
+        branch = _get_current_branch()
+    print(
+        f"Updating '{lock_file}' in '{repo_owner}/{repo_name}' on branch '{branch}'...",
+        flush=True,
+    )
+
+    try:
+        _commit_via_api(
+            git_user_name, git_user_email, lock_file, repo_owner, repo_name, branch
+        )
+    except Exception:
+        print("Failed to commit via API, trying via CLI...", flush=True)
+        _commit_via_cli(
+            git_user_name, git_user_email, lock_file, repo_owner, repo_name, branch
+        )
+
+
+if __name__ == "__main__":
+    main()