feat(gitlab,azure): try approving before auto-merge

renovatebot · Dec 1, 2024 · 56bd600 · 56bd600
1 parent 7877331
commit 56bd600
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 26 deletions.
diff --git a/lib/modules/platform/azure/index.ts b/lib/modules/platform/azure/index.ts
@@ -513,18 +513,7 @@ export async function createPr({
     );
   }
   if (platformPrOptions?.autoApprove) {
-    await azureApiGit.createPullRequestReviewer(
-      {
-        reviewerUrl: pr.createdBy!.url,
-        vote: AzurePrVote.Approved,
-        isFlagged: false,
-        isRequired: false,
-      },
-      config.repoId,
-      // TODO #22198
-      pr.pullRequestId!,
-      pr.createdBy!.id!,
-    );
+    await approvePr(pr);
   }
   await Promise.all(
     labels!.map((label) =>
@@ -581,19 +570,7 @@ export async function updatePr({
     objToUpdate.status = PullRequestStatus.Abandoned;
   }
   if (platformPrOptions?.autoApprove) {
-    const pr = await azureApiGit.getPullRequestById(prNo, config.project);
-    await azureApiGit.createPullRequestReviewer(
-      {
-        reviewerUrl: pr.createdBy!.url,
-        vote: AzurePrVote.Approved,
-        isFlagged: false,
-        isRequired: false,
-      },
-      config.repoId,
-      // TODO #22198
-      pr.pullRequestId!,
-      pr.createdBy!.id!,
-    );
+    await approvePr(prNo);
   }
 
   const updatedPr = await azureApiGit.updatePullRequest(
@@ -1015,3 +992,31 @@ export async function deleteLabel(
   const azureApiGit = await azureApi.gitApi();
   await azureApiGit.deletePullRequestLabels(config.repoId, prNumber, label);
 }
+
+export async function approvePr(
+  prNumberOrPr: number | GitPullRequest,
+): Promise<void> {
+  const azureApiGit = await azureApi.gitApi();
+  const pr =
+    typeof prNumberOrPr === 'number'
+      ? await azureApiGit.getPullRequestById(prNumberOrPr, config.project)
+      : prNumberOrPr;
+  if (
+    pr.reviewers?.some((reviewer) => reviewer.vote === AzurePrVote.Approved)
+  ) {
+    logger.debug('PR is already approved');
+    return;
+  }
+  await azureApiGit.createPullRequestReviewer(
+    {
+      reviewerUrl: pr.createdBy!.url,
+      vote: AzurePrVote.Approved,
+      isFlagged: false,
+      isRequired: false,
+    },
+    config.repoId,
+    // TODO #22198
+    pr.pullRequestId!,
+    pr.createdBy!.id!,
+  );
+}
diff --git a/lib/modules/platform/gerrit/index.ts b/lib/modules/platform/gerrit/index.ts
@@ -196,7 +196,7 @@ export async function createPr(prConfig: CreatePRConfig): Promise<Pr | null> {
     TAG_PULL_REQUEST_BODY,
   );
   if (prConfig.platformPrOptions?.autoApprove) {
-    await client.approveChange(pr._number);
+    await approvePr(pr._number);
   }
   return getPr(pr._number);
 }

diff --git a/lib/modules/platform/gitlab/http.ts b/lib/modules/platform/gitlab/http.ts
@@ -19,6 +19,11 @@ export async function getUserID(username: string): Promise<number> {
   return userInfo[0].id;
 }
 
+export async function getSelfUserID(): Promise<number> {
+  const userInfo = (await gitlabApi.getJson<{ id: number }>(`user`)).body;
+  return userInfo.id;
+}
+
 async function getMembers(group: string): Promise<GitLabUser[]> {
   const groupEncoded = encodeURIComponent(group);
   return (

diff --git a/lib/modules/platform/gitlab/index.ts b/lib/modules/platform/gitlab/index.ts
@@ -57,6 +57,7 @@ import { smartTruncate } from '../utils/pr-body';
 import {
   getMemberUserIDs,
   getMemberUsernames,
+  getSelfUserID,
   getUserID,
   gitlabApi,
   isUserBusy,
@@ -65,6 +66,7 @@ import { getMR, updateMR } from './merge-request';
 import { LastPipelineId } from './schema';
 import type {
   GitLabMergeRequest,
+  GitLabMergeRequestApprovals,
   GitlabComment,
   GitlabIssue,
   GitlabPr,
@@ -711,6 +713,23 @@ async function tryPrAutomerge(
 }
 
 async function approvePr(pr: number): Promise<void> {
+  try {
+    const { body: approvals } =
+      await gitlabApi.getJson<GitLabMergeRequestApprovals>(
+        `projects/${config.repository}/merge_requests/${pr}/approvals`,
+      );
+    const selfUserId = await getSelfUserID();
+    if (
+      approvals.approved_by?.some(
+        (approval) => approval.user?.id === selfUserId,
+      )
+    ) {
+      logger.debug('MR already approved');
+      return;
+    }
+  } catch (err) {
+    logger.warn({ err }, 'GitLab: Error checking if merge request is approved');
+  }
   try {
     await gitlabApi.postJson(
       `projects/${config.repository}/merge_requests/${pr}/approve`,

diff --git a/lib/modules/platform/gitlab/types.ts b/lib/modules/platform/gitlab/types.ts
@@ -77,3 +77,7 @@ export interface GitlabUserStatus {
   emoji?: string;
   availability: 'not_set' | 'busy';
 }
+
+export interface GitLabMergeRequestApprovals {
+  approved_by?: { user?: GitLabUser }[];
+}