fix(gerrit): commitBody setting not working

renovatebot · May 1, 2024 · 54f6180 · 54f6180
1 parent 8ce089b
commit 54f6180
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/lib/modules/platform/gerrit/client.ts b/lib/modules/platform/gerrit/client.ts
@@ -24,6 +24,7 @@ class GerritClient {
     'LABELS',
     'CURRENT_ACTIONS', //to check if current_revision can be "rebased"
     'CURRENT_REVISION', //get RevisionInfo::ref to fetch
+    'CURRENT_COMMIT', // to get the commit message
   ] as const;
 
   private gerritHttp = new GerritHttp();
@@ -103,15 +104,17 @@ class GerritClient {
     });
   }
 
-  async updateCommitMessage(
+  async updateChangeSubject(
     number: number,
-    gerritChangeID: string,
-    prTitle: string,
+    currentMessage: string,
+    newSubject: string,
   ): Promise<void> {
-    await this.setCommitMessage(
-      number,
-      `${prTitle}\n\nChange-Id: ${gerritChangeID}\n`,
+    // Replace first line of the commit message with the new subject
+    const newMessage = currentMessage.replace(
+      new RegExp(`^.*$`, 'm'),
+      newSubject,
     );
+    await this.setCommitMessage(number, newMessage);
   }
 
   async getMessages(changeNumber: number): Promise<GerritChangeMessageInfo[]> {

diff --git a/lib/modules/platform/gerrit/index.ts b/lib/modules/platform/gerrit/index.ts
@@ -155,9 +155,9 @@ export async function updatePr(prConfig: UpdatePrConfig): Promise<void> {
   logger.debug(`updatePr(${prConfig.number}, ${prConfig.prTitle})`);
   const change = await client.getChange(prConfig.number);
   if (change.subject !== prConfig.prTitle) {
-    await client.updateCommitMessage(
+    await client.updateChangeSubject(
       prConfig.number,
-      change.change_id,
+      change.revisions[change.current_revision].commit.message,
       prConfig.prTitle,
     );
   }
@@ -200,9 +200,9 @@ export async function createPr(prConfig: CreatePRConfig): Promise<Pr | null> {
   }
   //Workaround for "Known Problems.1"
   if (pr.subject !== prConfig.prTitle) {
-    await client.updateCommitMessage(
+        await client.updateChangeSubject(
       pr._number,
-      pr.change_id,
+      pr.revisions[pr.current_revision].commit.message,
       prConfig.prTitle,
     );
   }

diff --git a/lib/modules/platform/gerrit/types.ts b/lib/modules/platform/gerrit/types.ts
@@ -43,21 +43,26 @@ export interface GerritChange {
   labels?: Record<string, GerritLabelInfo>;
   reviewers?: Record<GerritReviewersType, GerritAccountInfo[]>;
   messages?: GerritChangeMessageInfo[];
-  current_revision?: string;
+  current_revision: string;
   /**
    * All patch sets of this change as a map that maps the commit ID of the patch set to a RevisionInfo entity.
    */
-  revisions?: Record<string, GerritRevisionInfo>;
+  revisions: Record<string, GerritRevisionInfo>;
   problems: unknown[];
 }
 
+export interface GerritCommitInfo {
+  message: string;
+}
+
 export interface GerritRevisionInfo {
   uploader: GerritAccountInfo;
   /**
    * The Git reference for the patch set.
    */
   ref: string;
   actions?: Record<string, GerritActionInfo>;
+  commit: GerritCommitInfo;
 }
 
 export interface GerritChangeMessageInfo {