refactor(manage-merge-queue): add debug logging (#657)

ExpediaGroup · Aug 21, 2024 · 28f44ef · 28f44ef
1 parent 3983efb
commit 28f44ef
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 14 deletions.
diff --git a/dist/374.index.js b/dist/374.index.js
diff --git a/dist/374.index.js.map b/dist/374.index.js.map
diff --git a/dist/431.index.js b/dist/431.index.js
diff --git a/dist/431.index.js.map b/dist/431.index.js.map
diff --git a/dist/676.index.js b/dist/676.index.js
diff --git a/dist/676.index.js.map b/dist/676.index.js.map
diff --git a/src/helpers/approvals-satisfied.ts b/src/helpers/approvals-satisfied.ts
@@ -91,7 +91,9 @@ export const approvalsSatisfied = async ({
     return numberOfApprovals >= Number(numberOfRequiredReviews);
   };
 
-  logs.push(`Required code owners: ${requiredCodeOwnersEntriesWithOwners.map(({ owners }) => owners).toString()}`);
+  if (requiredCodeOwnersEntriesWithOwners.length) {
+    logs.push(`Required code owners: ${requiredCodeOwnersEntriesWithOwners.map(({ owners }) => owners).toString()}`);
+  }
 
   const booleans = await Promise.all(requiredCodeOwnersEntriesWithOwners.map(codeOwnersEntrySatisfiesApprovals));
   const approvalsSatisfied = booleans.every(Boolean);

diff --git a/src/helpers/is-user-in-team.ts b/src/helpers/is-user-in-team.ts
@@ -14,6 +14,7 @@ limitations under the License.
 import { HelperInputs } from '../types/generated';
 import { context } from '@actions/github';
 import { octokit } from '../octokit';
+import * as core from '@actions/core';
 
 export class IsUserInTeam extends HelperInputs {
   login? = '';
@@ -25,5 +26,7 @@ export const isUserInTeam = async ({ login = context.actor, team }: IsUserInTeam
     org: context.repo.owner,
     team_slug: team
   });
+  core.debug(`Checking if ${login} is in team ${team}`);
+  core.debug(`Team members: ${response.data.map(({ login }) => login).join(', ')}`);
   return response.data.some(({ login: memberLogin }) => memberLogin === login);
 };
diff --git a/src/helpers/manage-merge-queue.ts b/src/helpers/manage-merge-queue.ts
@@ -73,11 +73,11 @@ export const manageMergeQueue = async ({
   }
   if (pullRequest.labels.find(label => label.name === JUMP_THE_QUEUE_PR_LABEL)) {
     if (allow_only_for_maintainers === 'true') {
-      const isMaintainer = await isUserInTeam({ team: team });
+      const isMaintainer = await isUserInTeam({ login, team: team });
       if (!isMaintainer) {
         await removeLabelIfExists(JUMP_THE_QUEUE_PR_LABEL, pullRequest.number);
         return await createPrComment({
-          body: `Only core maintainers can jump the queue. Please have a core maintainer jump the queue for you`
+          body: `@${login} Only core maintainers can jump the queue. Please have a core maintainer jump the queue for you.`
         });
       }
     }