From 61f2f654e0abb5828bcd67e9edc9822bcc6a656b Mon Sep 17 00:00:00 2001
From: Sergey Parhomenko <sparhomenko@users.noreply.github.com>
Date: Fri, 16 Jul 2021 10:31:07 +0200
Subject: [PATCH] Move Bitbucket PR author filter server-side (#10871)
---
.../bitbucket/__snapshots__/index.spec.ts.snap | 2 +-
lib/platform/bitbucket/index.spec.ts | 9 +--------
lib/platform/bitbucket/index.ts | 12 ++++--------
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap b/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap
index 05efa11e8b..1bcedd7cb3 100644
--- a/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap
+++ b/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap
@@ -1202,7 +1202,7 @@ Array [
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
- "url": "https://api.bitbucket.org/2.0/repositories/some/repo/pullrequests?state=OPEN&state=MERGED&state=DECLINED&state=SUPERSEDED&pagelen=50",
+ "url": "https://api.bitbucket.org/2.0/repositories/some/repo/pullrequests?state=OPEN&state=MERGED&state=DECLINED&state=SUPERSEDED&q=author.uuid%3D%2212345%22&pagelen=50",
},
]
`;
diff --git a/lib/platform/bitbucket/index.spec.ts b/lib/platform/bitbucket/index.spec.ts
index ece1e2fb5c..435bb24278 100644
--- a/lib/platform/bitbucket/index.spec.ts
+++ b/lib/platform/bitbucket/index.spec.ts
@@ -640,17 +640,10 @@ describe(getName(), () => {
await initRepoMock(null, null, scope);
scope
.get(
- '/2.0/repositories/some/repo/pullrequests?state=OPEN&state=MERGED&state=DECLINED&state=SUPERSEDED&pagelen=50'
+ '/2.0/repositories/some/repo/pullrequests?state=OPEN&state=MERGED&state=DECLINED&state=SUPERSEDED&q=author.uuid="12345"&pagelen=50'
)
.reply(200, {
values: [
- {
- id: 2,
- author: { uuid: 'abcde' },
- source: { branch: { name: 'branch-a' } },
- destination: { branch: { name: 'branch-a' } },
- state: 'OPEN',
- },
{
id: 1,
author: { uuid: '12345' },
diff --git a/lib/platform/bitbucket/index.ts b/lib/platform/bitbucket/index.ts
index 342e3c4659..972da032e2 100644
--- a/lib/platform/bitbucket/index.ts
+++ b/lib/platform/bitbucket/index.ts
@@ -212,15 +212,11 @@ export async function getPrList(): Promise<Pr[]> {
logger.debug('Retrieving PR list');
let url = `/2.0/repositories/${config.repository}/pullrequests?`;
url += utils.prStates.all.map((state) => 'state=' + state).join('&');
+ if (renovateUserUuid && !config.ignorePrAuthor) {
+ url += `&q=author.uuid="${renovateUserUuid}"`;
+ }
const prs = await utils.accumulateValues(url, undefined, undefined, 50);
- config.prList = prs
- .filter((pr) => {
- const prAuthorId = pr?.author?.uuid;
- return renovateUserUuid && prAuthorId && !config.ignorePrAuthor
- ? renovateUserUuid === prAuthorId
- : true;
- })
- .map(utils.prInfo);
+ config.prList = prs.map(utils.prInfo);
logger.debug({ length: config.prList.length }, 'Retrieved Pull Requests');
}
return config.prList;
--
GitLab