Skip to content

Commit 24766fc

Browse files
committed
Fix trailing slash on uploads URL
1 parent 90e315a commit 24766fc

6 files changed

+19
-6
lines changed

lib/database-upload.js

+7-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/database-upload.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/database-upload.test.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/database-upload.test.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/database-upload.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ test("Successfully uploading a database to GHEC-DR", async (t) => {
259259
t.assert(
260260
databaseUploadSpy.calledOnceWith(
261261
sinon.match.string,
262-
sinon.match.has("baseUrl", "https://uploads.tenant.ghe.com/"),
262+
sinon.match.has("baseUrl", "https://uploads.tenant.ghe.com"),
263263
),
264264
);
265265
});

src/database-upload.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ export async function uploadDatabases(
4141
const uploadsUrl = new URL(parseGitHubUrl(apiDetails.url));
4242
uploadsUrl.hostname = `uploads.${uploadsUrl.hostname}`;
4343

44+
// Octokit expects the baseUrl to not have a trailing slash,
45+
// but it is included by default in a URL.
46+
let uploadsBaseUrl = uploadsUrl.toString();
47+
if (uploadsBaseUrl.endsWith("/")) {
48+
uploadsBaseUrl = uploadsBaseUrl.slice(0, -1);
49+
}
50+
4451
for (const language of config.languages) {
4552
try {
4653
// Upload the database bundle.
@@ -57,7 +64,7 @@ export async function uploadDatabases(
5764
await client.request(
5865
`POST /repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`,
5966
{
60-
baseUrl: uploadsUrl.toString(),
67+
baseUrl: uploadsBaseUrl,
6168
owner: repositoryNwo.owner,
6269
repo: repositoryNwo.repo,
6370
language,

0 commit comments

Comments
 (0)