diff --git a/lib/modules/platform/gitlab/__snapshots__/index.spec.ts.snap b/lib/modules/platform/gitlab/__snapshots__/index.spec.ts.snap
index 7d0bdd4c0054856d7a1ea9ccaf9b4e8bccf67ed8..06500946e7ef65ec37e2a920856ce1bf4ec1b872 100644
--- a/lib/modules/platform/gitlab/__snapshots__/index.spec.ts.snap
+++ b/lib/modules/platform/gitlab/__snapshots__/index.spec.ts.snap
@@ -68,12 +68,7 @@ exports[`modules/platform/gitlab/index getBranchPr(branchName) should return the
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
},
"hasAssignees": false,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
- "labels": undefined,
"number": 91,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "open",
"targetBranch": "master",
@@ -87,13 +82,8 @@ exports[`modules/platform/gitlab/index getBranchPr(branchName) should strip depr
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
},
"hasAssignees": false,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
"isDraft": true,
- "labels": undefined,
"number": 91,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "open",
"targetBranch": "master",
@@ -107,13 +97,8 @@ exports[`modules/platform/gitlab/index getBranchPr(branchName) should strip draf
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
},
"hasAssignees": false,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
"isDraft": true,
- "labels": undefined,
"number": 91,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "open",
"targetBranch": "master",
@@ -127,13 +112,8 @@ exports[`modules/platform/gitlab/index getPr(prNo) removes deprecated draft pref
"hash": "23f41dbec0785a6c77457dd6ebf99ae5970c5fffc9f7a8ad7f66c1b8eeba5b90",
},
"hasAssignees": false,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
"isDraft": true,
- "labels": undefined,
"number": 12345,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "merged",
"targetBranch": "master",
@@ -147,13 +127,8 @@ exports[`modules/platform/gitlab/index getPr(prNo) removes draft prefix from ret
"hash": "23f41dbec0785a6c77457dd6ebf99ae5970c5fffc9f7a8ad7f66c1b8eeba5b90",
},
"hasAssignees": false,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
"isDraft": true,
- "labels": undefined,
"number": 12345,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "merged",
"targetBranch": "master",
@@ -167,12 +142,7 @@ exports[`modules/platform/gitlab/index getPr(prNo) returns the PR 1`] = `
"hash": "23f41dbec0785a6c77457dd6ebf99ae5970c5fffc9f7a8ad7f66c1b8eeba5b90",
},
"hasAssignees": false,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
- "labels": undefined,
"number": 12345,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "merged",
"targetBranch": "master",
@@ -186,12 +156,7 @@ exports[`modules/platform/gitlab/index getPr(prNo) returns the PR with nonexisti
"hash": "23f41dbec0785a6c77457dd6ebf99ae5970c5fffc9f7a8ad7f66c1b8eeba5b90",
},
"hasAssignees": true,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
- "labels": undefined,
"number": 12345,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "open",
"targetBranch": "master",
@@ -205,12 +170,7 @@ exports[`modules/platform/gitlab/index getPr(prNo) returns the mergeable PR 1`]
"hash": "23f41dbec0785a6c77457dd6ebf99ae5970c5fffc9f7a8ad7f66c1b8eeba5b90",
},
"hasAssignees": true,
- "headPipelineSha": undefined,
- "headPipelineStatus": undefined,
- "labels": undefined,
"number": 12345,
- "reviewers": undefined,
- "sha": undefined,
"sourceBranch": "some-branch",
"state": "open",
"targetBranch": "master",
diff --git a/lib/modules/platform/gitlab/index.spec.ts b/lib/modules/platform/gitlab/index.spec.ts
index 1fc1fce268550a0e05e7fa9f712da700bb2975c2..90b220ec17e0e339c9ed91e53cc9136aebc88e4e 100644
--- a/lib/modules/platform/gitlab/index.spec.ts
+++ b/lib/modules/platform/gitlab/index.spec.ts
@@ -2947,6 +2947,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'branch a pr',
+ description: 'a merge request',
state: 'open',
},
])
@@ -2969,6 +2970,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'Draft: foo',
+ description: 'a merge request',
state: 'open',
},
])
@@ -2991,6 +2993,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'WIP: foo',
+ description: 'a merge request',
state: 'open',
},
])
@@ -3013,6 +3016,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'branch a pr',
+ description: 'a merge request',
state: 'open',
target_branch: 'branch-b',
},
@@ -3042,6 +3046,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'branch a pr',
+ description: 'a merge request',
state: 'open',
},
])
@@ -3073,6 +3078,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'branch a pr',
+ description: 'a merge request',
state: 'open',
},
])
@@ -3100,6 +3106,7 @@ describe('modules/platform/gitlab/index', () => {
iid: 1,
source_branch: 'branch-a',
title: 'branch a pr',
+ description: 'a merge request',
state: 'open',
},
])
diff --git a/lib/modules/platform/gitlab/index.ts b/lib/modules/platform/gitlab/index.ts
index c8ba81c0dfc89429f1ad925697d8be77d0d1870f..afc81044bcc6a75f03ab768cb51300bb67c331b8 100644
--- a/lib/modules/platform/gitlab/index.ts
+++ b/lib/modules/platform/gitlab/index.ts
@@ -32,7 +32,6 @@ import {
getQueryString,
parseUrl,
} from '../../../util/url';
-import { getPrBodyStruct } from '../pr-body';
import type {
AutodiscoverConfig,
BranchStatusConfig,
@@ -72,6 +71,7 @@ import type {
MergeMethod,
RepoResponse,
} from './types';
+import { DRAFT_PREFIX, DRAFT_PREFIX_DEPRECATED, prInfo } from './utils';
let config: {
repository: string;
@@ -93,9 +93,6 @@ const defaults = {
export const id = 'gitlab';
-const DRAFT_PREFIX = 'Draft: ';
-const DRAFT_PREFIX_DEPRECATED = 'WIP: ';
-
let draftPrefix = DRAFT_PREFIX;
export async function initPlatform({
@@ -560,24 +557,10 @@ async function fetchPrList(): Promise<Pr[]> {
const query = getQueryString(searchParams);
const urlString = `projects/${config.repository}/merge_requests?${query}`;
try {
- const res = await gitlabApi.getJson<
- {
- iid: number;
- source_branch: string;
- title: string;
- state: string;
- created_at: string;
- }[]
- >(urlString, { paginate: true });
- return res.body.map((pr) =>
- massagePr({
- number: pr.iid,
- sourceBranch: pr.source_branch,
- title: pr.title,
- state: pr.state === 'opened' ? 'open' : pr.state,
- createdAt: pr.created_at,
- }),
- );
+ const res = await gitlabApi.getJson<GitLabMergeRequest[]>(urlString, {
+ paginate: true,
+ });
+ return res.body.map((pr) => prInfo(pr));
} catch (err) /* istanbul ignore next */ {
logger.debug({ err }, 'Error fetching PR list');
if (err.statusCode === 403) {
@@ -800,22 +783,7 @@ export async function getPr(iid: number): Promise<GitlabPr> {
const mr = await getMR(config.repository, iid);
// Harmonize fields with GitHub
- const pr: GitlabPr = {
- sourceBranch: mr.source_branch,
- targetBranch: mr.target_branch,
- number: mr.iid,
- bodyStruct: getPrBodyStruct(mr.description),
- state: mr.state === 'opened' ? 'open' : mr.state,
- headPipelineStatus: mr.head_pipeline?.status,
- headPipelineSha: mr.head_pipeline?.sha,
- hasAssignees: !!(mr.assignee?.id ?? mr.assignees?.[0]?.id),
- reviewers: mr.reviewers?.map(({ username }) => username),
- title: mr.title,
- labels: mr.labels,
- sha: mr.sha,
- };
-
- return massagePr(pr);
+ return prInfo(mr);
}
export async function updatePr({
@@ -960,18 +928,7 @@ export async function findPr({
return null;
}
- // return the latest merge request
- const mr = mrList[0];
-
- // only pass necessary info
- const pr: GitlabPr = {
- sourceBranch: mr.source_branch,
- number: mr.iid,
- state: 'open',
- title: mr.title,
- };
-
- return massagePr(pr);
+ return prInfo(mrList[0]);
}
const prList = await getPrList();
diff --git a/lib/modules/platform/gitlab/utils.ts b/lib/modules/platform/gitlab/utils.ts
new file mode 100644
index 0000000000000000000000000000000000000000..afba4ffd165d97acbaeeeea3b600b43a5cf6c53c
--- /dev/null
+++ b/lib/modules/platform/gitlab/utils.ts
@@ -0,0 +1,41 @@
+import is from '@sindresorhus/is';
+import { getPrBodyStruct } from '../pr-body';
+import type { GitLabMergeRequest, GitlabPr } from './types';
+
+export const DRAFT_PREFIX = 'Draft: ';
+export const DRAFT_PREFIX_DEPRECATED = 'WIP: ';
+
+export function prInfo(mr: GitLabMergeRequest): GitlabPr {
+ const pr: GitlabPr = {
+ sourceBranch: mr.source_branch,
+ state: mr.state === 'opened' ? 'open' : mr.state,
+ number: mr.iid,
+ title: mr.title,
+ hasAssignees: !!(mr.assignee?.id ?? mr.assignees?.[0]?.id),
+ bodyStruct: getPrBodyStruct(mr.description),
+
+ ...(mr.target_branch && { targetBranch: mr.target_branch }),
+
+ ...(mr.head_pipeline?.status && {
+ headPipelineStatus: mr.head_pipeline?.status,
+ }),
+ ...(mr.head_pipeline?.sha && { headPipelineSha: mr.head_pipeline?.sha }),
+
+ ...(is.nonEmptyArray(mr.reviewers) && {
+ reviewers: mr.reviewers?.map(({ username }) => username),
+ }),
+
+ ...(mr.labels && { labels: mr.labels }),
+ ...(mr.sha && { sha: mr.sha }),
+ };
+
+ if (pr.title.startsWith(DRAFT_PREFIX)) {
+ pr.title = pr.title.substring(DRAFT_PREFIX.length);
+ pr.isDraft = true;
+ } else if (pr.title.startsWith(DRAFT_PREFIX_DEPRECATED)) {
+ pr.title = pr.title.substring(DRAFT_PREFIX_DEPRECATED.length);
+ pr.isDraft = true;
+ }
+
+ return pr;
+}