From 64c22b3d372e1f1b7e9c70cc50cd54bb18ac4cf1 Mon Sep 17 00:00:00 2001
From: Dilum Aluthge <dilum@aluthge.com>
Date: Wed, 28 May 2025 10:41:08 -0400
Subject: [PATCH] CI: `PrAssignee.yml`: `.catch()` and return the error object
 if 404 is encountered when checking collaborator status

---
 .github/workflows/PrAssignee.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/PrAssignee.yml b/.github/workflows/PrAssignee.yml
index 0202ae20d8da7..728dcbb902cfa 100644
--- a/.github/workflows/PrAssignee.yml
+++ b/.github/workflows/PrAssignee.yml
@@ -38,7 +38,11 @@ jobs:
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           retries: 5 # retry GitHub API requests up to 5 times, with exponential backoff
-          retry-exempt-status-codes: 403
+          retry-exempt-status-codes: "403,404"
+          # In the above list:
+          #
+          # - 404 is in the list because we will always hit a 404 when the PR author is not
+          #   a committer. This 404 is normal and expected.
           script: |
             const oldPrAssignees = context.payload.pull_request.assignees
               .map(obj => obj.login)
@@ -55,7 +59,26 @@ jobs:
               headers: {
                 'X-GitHub-Api-Version': '2022-11-28'
               }
-            })
+            }).catch((error) => {
+              // So, I'm not sure if the error is being thrown by `@octokit/request.js` or
+              // `@octokit/plugin-retry.js`. I suspect that the initial error is thrown by
+              // `request.js`, and is subsequently propagated by `plugin-retry.js`.
+              //
+              // Anyway, the docs for `request.js` say the following:
+              //
+              // > If an error occurs, the promise is rejected with an `error` object
+              //> containing 3 keys to help with debugging:
+              // >
+              // > - `error.status` The http response status code
+              // > - `error.request` The request options such as `method`, `url` and `data`
+              // > - `error.response` The http response object with `url`, `headers`, and `data`
+              //
+              // Source: https://github.com/octokit/request.js/blob/main/README.md#request
+              //
+              // So, inside this `.catch()`, we simply return that `error` object.
+
+              return error;
+            });
             if (isCollaboratorResponseObj.status == 204) {
               var isCollaborator = true;
             } else if (isCollaboratorResponseObj.status == 404) {