From d554483f88eb8e8e7f1580b4b2f07ff1bbfd367f Mon Sep 17 00:00:00 2001
From: Jonas <jonas@woerlein.net>
Date: Wed, 14 Aug 2024 09:20:48 +0200
Subject: [PATCH] fix(platform/gerrit): URI encode branch in gerrit's getFile()
(#30753)
---
lib/modules/platform/gerrit/client.spec.ts | 4 ++--
lib/modules/platform/gerrit/client.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/modules/platform/gerrit/client.spec.ts b/lib/modules/platform/gerrit/client.spec.ts
index 4901128bb8..21c994e7d4 100644
--- a/lib/modules/platform/gerrit/client.spec.ts
+++ b/lib/modules/platform/gerrit/client.spec.ts
@@ -415,11 +415,11 @@ describe('modules/platform/gerrit/client', () => {
httpMock
.scope(gerritEndpointUrl)
.get(
- '/a/projects/test%2Frepo/branches/main/files/renovate.json/content',
+ '/a/projects/test%2Frepo/branches/base%2Fbranch/files/renovate.json/content',
)
.reply(200, gerritFileResponse('{}'));
await expect(
- client.getFile('test/repo', 'main', 'renovate.json'),
+ client.getFile('test/repo', 'base/branch', 'renovate.json'),
).resolves.toBe('{}');
});
});
diff --git a/lib/modules/platform/gerrit/client.ts b/lib/modules/platform/gerrit/client.ts
index cd2dd1fc30..b4aeaa9748 100644
--- a/lib/modules/platform/gerrit/client.ts
+++ b/lib/modules/platform/gerrit/client.ts
@@ -195,7 +195,7 @@ class GerritClient {
const base64Content = await this.gerritHttp.get(
`a/projects/${encodeURIComponent(
repo,
- )}/branches/${branch}/files/${encodeURIComponent(fileName)}/content`,
+ )}/branches/${encodeURIComponent(branch)}/files/${encodeURIComponent(fileName)}/content`,
);
return Buffer.from(base64Content.body, 'base64').toString();
}
--
GitLab