fix(get-merge-queue-position): misc merge queue fixes

src/helpers/get-merge-queue-position.ts

@@ -13,15 +13,14 @@ limitations under the License.
 
 import { HelperInputs } from '../types/generated';
 import { context } from '@actions/github';
-import { octokit, octokitGraphql } from '../octokit';
+import { octokitGraphql } from '../octokit';
 import { Repository } from '@octokit/graphql-schema';
 
 export class GetMergeQueuePosition extends HelperInputs {
-  sha = '';
   max_queue_size?: string;
 }
 
-export const getMergeQueuePosition = async ({ sha, max_queue_size = '10' }: GetMergeQueuePosition) => {
+export const getMergeQueuePosition = async ({ max_queue_size = '10' }: GetMergeQueuePosition) => {
   const { repository } = await octokitGraphql<{ repository: Repository }>(`
 query {
   repository(owner: "${context.repo.owner}", name: "${context.repo.repo}") {
@@ -38,11 +37,12 @@ query {
   }
 }
 `);
-  const { data: pullRequests } = await octokit.repos.listPullRequestsAssociatedWithCommit({
-    commit_sha: sha,
-    ...context.repo
-  });
-  const pullRequestNumber = pullRequests.find(Boolean)?.number;
+  const prNumberFromMergeQueueRef = Number(
+    context.ref
+      .split('/')
+      .find(part => part.includes('pr-'))
+      ?.match(/\d+/)?.[0]
+  );
   const mergeQueueEntries = repository.mergeQueue?.entries?.nodes;
-  return mergeQueueEntries?.find(entry => entry?.pullRequest?.number === Number(pullRequestNumber))?.position;
+  return mergeQueueEntries?.find(entry => entry?.pullRequest?.number === prNumberFromMergeQueueRef)?.position;
 };

src/utils/get-merge-queue-commit-hashes.ts

@@ -15,6 +15,6 @@ import { paginateAllBranches } from './paginate-all-branches';
 
 export const getMergeQueueCommitHashes = async () => {
   const branches = await paginateAllBranches();
-  const mergeQueueBranches = branches.filter(branch => branch.name.startsWith('gh-readonly-queue/merge-queue/'));
+  const mergeQueueBranches = branches.filter(branch => branch.name.startsWith('gh-readonly-queue/'));
   return mergeQueueBranches.map(branch => branch.commit.sha);
 };

test/helpers/filter-paths.test.ts

@@ -211,7 +211,7 @@ describe('filterPaths', () => {
 
   it('should not call listPullRequestsAssociatedWithCommit if sha is omitted', async () => {
     context.eventName = 'merge_group';
-    context.ref = 'refs/heads/gh-readonly-queue/branch-name/pr-12345-f0d9a4cb862b13cdaab6522f72d6dc17e4336b7f';
+    context.ref = 'refs/heads/gh-readonly-queue/default-branch/pr-12345-f0d9a4cb862b13cdaab6522f72d6dc17e4336b7f';
     await filterPaths({
       paths
     });

test/helpers/get-merge-queue-position.test.ts

@@ -15,16 +15,12 @@ import { Mocktokit } from '../types';
 import { getMergeQueuePosition } from '../../src/helpers/get-merge-queue-position';
 import { octokitGraphql } from '../../src/octokit';
 import { MergeQueueEntry } from '@octokit/graphql-schema';
+import { context } from '@actions/github';
 
 jest.mock('@actions/core');
 jest.mock('@actions/github', () => ({
-  context: { repo: { repo: 'repo', owner: 'owner' }, issue: { number: 123 } },
+  context: { repo: { repo: 'repo', owner: 'owner' } },
   getOctokit: jest.fn(() => ({
-    rest: {
-      repos: {
-        listPullRequestsAssociatedWithCommit: jest.fn(({ commit_sha }) => ({ data: [{ number: Number(commit_sha.split('sha')[1]) }] }))
-      }
-    },
     graphql: jest.fn()
   }))
 }));
@@ -46,21 +42,23 @@ function mockGraphQLResponse(mergeQueueEntries: RecursivePartial<MergeQueueEntry
 
 describe('getMergeQueuePosition', () => {
   it('should return 1 for PR 1st in the queue', async () => {
+    context.ref = 'refs/heads/gh-readonly-queue/default-branch/pr-123-f0d9a4cb862b13cdaab6522f72d6dc17e4336b7f';
     mockGraphQLResponse([
       { position: 1, pullRequest: { number: 123 } },
       { position: 2, pullRequest: { number: 456 } }
     ]);
-    const result = await getMergeQueuePosition({ sha: 'sha123' });
+    const result = await getMergeQueuePosition({});
     expect(result).toBe(1);
   });
 
   it('should return 3 for PR 3rd in the queue', async () => {
+    context.ref = 'refs/heads/gh-readonly-queue/default-branch/pr-789-f0d9a4cb862b13cdaab6522f72d6dc17e4336b7f';
     mockGraphQLResponse([
       { position: 1, pullRequest: { number: 123 } },
       { position: 2, pullRequest: { number: 456 } },
       { position: 3, pullRequest: { number: 789 } }
     ]);
-    const result = await getMergeQueuePosition({ sha: 'sha789' });
+    const result = await getMergeQueuePosition({});
     expect(result).toBe(3);
   });
 });

test/helpers/initiate-deployment.test.ts

@@ -125,11 +125,11 @@ describe('initiateDeployment', () => {
                 commit: { sha: 'normal sha 1' }
               },
               {
-                name: 'gh-readonly-queue/merge-queue/pr-123-79a5ad2b1a46f6b5d77e02573937667979635f27',
+                name: 'gh-readonly-queue/default-branch/pr-123-79a5ad2b1a46f6b5d77e02573937667979635f27',
                 commit: { sha: 'merge queue sha 1' }
               },
               {
-                name: 'gh-readonly-queue/merge-queue/pr-456-79a5ad2b1a46f6b5d77e02573937667979635f27',
+                name: 'gh-readonly-queue/default-branch/pr-456-79a5ad2b1a46f6b5d77e02573937667979635f27',
                 commit: { sha: 'merge queue sha 2' }
               }
             ]

test/helpers/notify-pipeline-complete.test.ts

@@ -114,11 +114,11 @@ describe('notify-pipeline-complete', () => {
                 commit: { sha: 'normal sha 1' }
               },
               {
-                name: 'gh-readonly-queue/merge-queue/pr-123-79a5ad2b1a46f6b5d77e02573937667979635f27',
+                name: 'gh-readonly-queue/default-branch/pr-123-79a5ad2b1a46f6b5d77e02573937667979635f27',
                 commit: { sha: 'merge queue sha 1' }
               },
               {
-                name: 'gh-readonly-queue/merge-queue/pr-456-79a5ad2b1a46f6b5d77e02573937667979635f27',
+                name: 'gh-readonly-queue/default-branch/pr-456-79a5ad2b1a46f6b5d77e02573937667979635f27',
                 commit: { sha: 'merge queue sha 2' }
               }
             ]