From c1f6eb38c39a453bc21ee1a8b4eceb414b1294b1 Mon Sep 17 00:00:00 2001
From: Ayoub Kaanich <kayoub5@live.com>
Date: Thu, 8 Nov 2018 20:01:10 +0100
Subject: [PATCH] feat: delete gitlab labels (#2772)
Closes #2764
---
lib/platform/gitlab/index.js | 14 ++++++++---
.../gitlab/__snapshots__/index.spec.js.snap | 13 +++++++++++
test/platform/gitlab/index.spec.js | 23 +++++++++++++++++++
website/docs/install-gitlab-app.md | 4 ----
4 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js
index a6922baf26..b7eaacac48 100644
--- a/lib/platform/gitlab/index.js
+++ b/lib/platform/gitlab/index.js
@@ -493,9 +493,17 @@ function addReviewers(iid, reviewers) {
logger.warn('Unimplemented in GitLab: approvals');
}
-// istanbul ignore next
-function deleteLabel() {
- throw new Error('deleteLabel not implemented');
+async function deleteLabel(issueNo, label) {
+ logger.debug(`Deleting label ${label} from #${issueNo}`);
+ try {
+ const pr = await getPr(issueNo);
+ const labels = (pr.labels || []).filter(l => l !== label).join();
+ await get.put(`projects/${config.repository}/merge_requests/${issueNo}`, {
+ body: { labels },
+ });
+ } catch (err) /* istanbul ignore next */ {
+ logger.warn({ err, issueNo, label }, 'Failed to delete label');
+ }
}
async function getComments(issueNo) {
diff --git a/test/platform/gitlab/__snapshots__/index.spec.js.snap b/test/platform/gitlab/__snapshots__/index.spec.js.snap
index db8475f51f..132dc8dae0 100644
--- a/test/platform/gitlab/__snapshots__/index.spec.js.snap
+++ b/test/platform/gitlab/__snapshots__/index.spec.js.snap
@@ -124,6 +124,19 @@ Array [
]
`;
+exports[`platform/gitlab deleteLabel(issueNo, label) should delete the label 1`] = `
+Array [
+ Array [
+ "projects/undefined/merge_requests/42",
+ Object {
+ "body": Object {
+ "labels": "foo,renovate",
+ },
+ },
+ ],
+]
+`;
+
exports[`platform/gitlab ensureComment add comment if not found 1`] = `
Array [
Array [
diff --git a/test/platform/gitlab/index.spec.js b/test/platform/gitlab/index.spec.js
index 28ba5c7b73..ae9dcbb1b9 100644
--- a/test/platform/gitlab/index.spec.js
+++ b/test/platform/gitlab/index.spec.js
@@ -1032,4 +1032,27 @@ These updates have all been created already. Click a checkbox below to force a r
expect(res).toHaveLength(0);
});
});
+ describe('deleteLabel(issueNo, label)', () => {
+ it('should delete the label', async () => {
+ get.mockReturnValueOnce({
+ body: {
+ id: 1,
+ iid: 12345,
+ description: 'a merge request',
+ state: 'merged',
+ merge_status: 'cannot_be_merged',
+ diverged_commits_count: 5,
+ source_branch: 'some-branch',
+ labels: ['foo', 'renovate', 'rebase'],
+ },
+ });
+ get.mockReturnValueOnce({
+ body: {
+ commit: {},
+ },
+ });
+ await gitlab.deleteLabel(42, 'rebase');
+ expect(get.put.mock.calls).toMatchSnapshot();
+ });
+ });
});
diff --git a/website/docs/install-gitlab-app.md b/website/docs/install-gitlab-app.md
index e16828d4fb..a5a6f971ff 100644
--- a/website/docs/install-gitlab-app.md
+++ b/website/docs/install-gitlab-app.md
@@ -59,7 +59,3 @@ Unlike on GitHub, it is not possible to have the option to install Renovate on "
##### Detecting new projects
Currently there is no detection mechanism in the backend scheduler to determine when Renovate has been added to a new project, so the onboarding MR won't appear instantly. Instead, the new project should be picked up during hourly scheduled runs.
-
-##### Rebasing using labels
-
-The `deleteLabel()` function is not yet implemented for the gitlab platform so requests to rebase MRs using the "rebase" label will cause an error when Renovate attempts to delete the label. Please rebase using MR titles instead.
--
GitLab