Fix trailing slash on uploads URL

github · May 13, 2024 · 24766fc · 24766fc
1 parent 90e315a
commit 24766fc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/lib/database-upload.js b/lib/database-upload.js
diff --git a/lib/database-upload.js.map b/lib/database-upload.js.map
diff --git a/lib/database-upload.test.js b/lib/database-upload.test.js
diff --git a/lib/database-upload.test.js.map b/lib/database-upload.test.js.map
diff --git a/src/database-upload.test.ts b/src/database-upload.test.ts
@@ -259,7 +259,7 @@ test("Successfully uploading a database to GHEC-DR", async (t) => {
     t.assert(
       databaseUploadSpy.calledOnceWith(
         sinon.match.string,
-        sinon.match.has("baseUrl", "https://uploads.tenant.ghe.com/"),
+        sinon.match.has("baseUrl", "https://uploads.tenant.ghe.com"),
       ),
     );
   });

diff --git a/src/database-upload.ts b/src/database-upload.ts
@@ -41,6 +41,13 @@ export async function uploadDatabases(
   const uploadsUrl = new URL(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.
@@ -57,7 +64,7 @@ export async function uploadDatabases(
         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,