fix(ci): Improve Update workflow

*   Use a separate app for approving the PR

    Use curl for now:
    hmarr/auto-approve-action#217

*   Generate a nice commit message showing the changes

*   Fix broken references to outputs

*   Set PR title, author, message correctly

*
Signed-off-by: Erik Swanson <erik@retailnext.net>

.github/workflows/update.yaml

@@ -12,6 +12,7 @@ jobs:
   update:
     name: Update
     runs-on: ubuntu-latest
+    environment: Update
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -29,40 +30,78 @@ jobs:
           
           docker start --attach --interactive pip-compile < ci/pip-compile.sh
           
+          mv requirements.txt requirements.txt.orig
           docker cp pip-compile:/tmp/requirements.txt .
           
           docker rm -f pip-compile
           
-          if [ -n "$(git status --porcelain)" ]; then
-            echo "changes=Y" >> "$GITHUB_OUTPUT";
-          else
-            echo "changes=N" >> "$GITHUB_OUTPUT";
+          if [ -n "$(git status --porcelain requirements.txt)" ]; then
+            docker create --name=generate-message \
+            --entrypoint python \
+            --interactive \
+            --workdir /tmp \
+            $IMAGE
+          
+            docker cp requirements.txt.orig generate-message:/tmp/
+            rm requirements.txt.orig
+            docker cp requirements.txt generate-message:/tmp/
+          
+            EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+            echo "commit-message<<$EOF" >> "$GITHUB_OUTPUT"
+            docker start --attach --interactive generate-message < ci/generate_message.py >> "$GITHUB_OUTPUT"
+            echo "$EOF" >> "$GITHUB_OUTPUT"
+          
+            docker rm -f generate-message
           fi
       - name: Generate Token
         id: generate-token
         uses: tibdex/github-app-token@v1
-        if: ${{ steps.update.output.changes == 'Y' }}
+        if: ${{ steps.update.outputs.commit-message }}
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
       - name: Create Pull Request
         id: create-pull-request
         uses: peter-evans/create-pull-request@v5
-        if: ${{ steps.update.output.changes == 'Y' }}
+        if: ${{ steps.update.outputs.commit-message }}
         with:
           token: ${{ steps.generate-token.outputs.token }}
           add-paths: |
             requirements.txt
           base: main
+          author: "update-pproxy[bot] <136385368+update-pproxy[bot]@users.noreply.github.com>"
+          committer: "update-pproxy[bot] <136385368+update-pproxy[bot]@users.noreply.github.com>"
           branch: update/requirements
-          delete-branch: true
-          branch-suffix: short-commit-hash
+          body: ${{ steps.update.outputs.commit-message}}
           commit-message: |
-            chore(deps): Update requirements.txt
+            chore(deps): Update Python Packages
+            
+            ${{ steps.update.outputs.commit-message }}
           signoff: true
+          title: "chore(deps): Update Python Packages"
           labels: |
             dependencies
       - name: Enable Auto-Merge
-        if: ${{ steps.update.output.changes == 'Y' && steps.create-pull-request.outputs.pull-request-number }}
+        if: ${{ steps.create-pull-request.outputs.pull-request-number }}
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
         run: |
           gh pr merge --auto --squash "${{ steps.create-pull-request.outputs.pull-request-number }}"
+      - name: Generate Token (Approver)
+        id: generate-approver-token
+        uses: tibdex/github-app-token@v1
+        if: ${{ steps.create-pull-request.outputs.pull-request-number }}
+        with:
+          app_id: ${{ secrets.APPROVER_APP_ID }}
+          private_key: ${{ secrets.APPROVER_APP_PRIVATE_KEY }}
+      - name: Approve Pull Request
+        if: ${{ steps.create-pull-request.outputs.pull-request-number }}
+        run: |
+          curl -L \
+            -sS \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ steps.generate-approver-token.outputs.token }}"\
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/pulls/${{ steps.create-pull-request.outputs.pull-request-number }}/reviews \
+            -d '{"commit_id":"${{ steps.create-pull-request.outputs.pull-request-head-sha }}","event":"APPROVE"}'

ci/generate_message.py

@@ -0,0 +1,61 @@
+import pathlib
+import pkg_resources
+
+
+def load_requirements(name: str):
+    with pathlib.Path(name).open() as f:
+        reqs = {}
+        for req in pkg_resources.parse_requirements(f):
+            if len(req.specs) == 1 and len(req.specs[0]) == 2 and req.specs[0][0] == "==":
+                reqs[req.project_name] = req.specs[0][1]
+            else:
+                reqs[req.project_name] = "Unknown"
+        return reqs
+
+
+def compare(old_versions: dict[str, str], new_versions: dict[str, str]):
+    added = []
+    updated = []
+    removed = []
+    for name in old_versions:
+        if name not in new_versions:
+            removed.append(name)
+        elif old_versions[name] != new_versions[name]:
+            updated.append((name, old_versions[name], new_versions[name]))
+    for name in new_versions:
+        if name not in old_versions:
+            added.append(name)
+    added.sort()
+    updated.sort()
+    removed.sort()
+    return added, updated, removed
+
+
+def format_differences(added: list[str], updated: list[tuple[str, str, str]], removed: list[str]):
+    first = True
+    if added:
+        first = False
+        print("Added:")
+        for name in added:
+            print("*   `{}`".format(name))
+    if updated:
+        if first:
+            print("")
+        first = False
+        print("Updated:")
+        for item in updated:
+            print("*   `{}`: `{}` -> `{}`".format(item[0], item[1], item[2]))
+    if removed:
+        if first:
+            print("")
+        first = False
+        print("Removed:")
+        for name in removed:
+            print("*   `{}`".format(name))
+
+
+if __name__ == "__main__":
+    oldR = load_requirements("requirements.txt.orig")
+    newR = load_requirements("requirements.txt")
+    a, u, r = compare(oldR, newR)
+    format_differences(a, u, r)