Fix trailing slash on uploads URL

This commit is contained in:
Koen Vlaswinkel
2024-05-13 16:31:17 +02:00
parent 90e315a7a8
commit 24766fcf56
6 changed files with 19 additions and 6 deletions

View File

@@ -50,6 +50,12 @@ async function uploadDatabases(repositoryNwo, config, apiDetails, logger) {
const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
const uploadsUrl = new URL((0, util_1.parseGitHubUrl)(apiDetails.url));
uploadsUrl.hostname = `uploads.${uploadsUrl.hostname}`;
// Octokit expects the baseUrl to not have a trailing slash,
// but it is included by default in a URL.
let uploadsBaseUrl = uploadsUrl.toString();
if (uploadsBaseUrl.endsWith("/")) {
uploadsBaseUrl = uploadsBaseUrl.slice(0, -1);
}
for (const language of config.languages) {
try {
// Upload the database bundle.
@@ -62,7 +68,7 @@ async function uploadDatabases(repositoryNwo, config, apiDetails, logger) {
const commitOid = await actionsUtil.getCommitOid(actionsUtil.getRequiredInput("checkout_path"));
try {
await client.request(`POST /repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`, {
baseUrl: uploadsUrl.toString(),
baseUrl: uploadsBaseUrl,
owner: repositoryNwo.owner,
repo: repositoryNwo.repo,
language,