Merge branch 'main' into aibaars/refactor-checkout-path

src/database-upload.test.ts

@@ -89,7 +89,7 @@ function mockHttpRequests(
   const requestSpy = sinon.stub(client, "request");
 
   const optInSpy = requestSpy.withArgs(
-    "GET /repos/:owner/:repo/code-scanning/databases"
+    "GET /repos/:owner/:repo/code-scanning/codeql/databases"
   );
   if (optInStatusCode < 300) {
     optInSpy.resolves(undefined);
@@ -99,7 +99,7 @@ function mockHttpRequests(
 
   if (databaseUploadStatusCode !== undefined) {
     const databaseUploadSpy = requestSpy.withArgs(
-      "PUT /repos/:owner/:repo/code-scanning/databases/javascript"
+      "PUT /repos/:owner/:repo/code-scanning/codeql/databases/:language"
     );
     if (databaseUploadStatusCode < 300) {
       databaseUploadSpy.resolves(undefined);
@@ -234,6 +234,12 @@ test("Abort database upload if opt-in request returns 404", async (t) => {
 
     mockHttpRequests(404);
 
+    setCodeQL({
+      async databaseBundle() {
+        return;
+      },
+    });
+
     const loggedMessages = [];
     await uploadDatabases(
       testRepoName,
@@ -263,6 +269,12 @@ test("Abort database upload if opt-in request fails with something other than 40
 
     mockHttpRequests(500);
 
+    setCodeQL({
+      async databaseBundle() {
+        return;
+      },
+    });
+
     const loggedMessages = [] as LoggedMessage[];
     await uploadDatabases(
       testRepoName,

src/database-upload.ts

@@ -33,10 +33,13 @@ export async function uploadDatabases(
 
   const client = getApiClient(apiDetails);
   try {
-    await client.request("GET /repos/:owner/:repo/code-scanning/databases", {
-      owner: repositoryNwo.owner,
-      repo: repositoryNwo.repo,
-    });
+    await client.request(
+      "GET /repos/:owner/:repo/code-scanning/codeql/databases",
+      {
+        owner: repositoryNwo.owner,
+        repo: repositoryNwo.repo,
+      }
+    );
   } catch (e) {
     if (util.isHTTPError(e) && e.status === 404) {
       logger.debug(
@@ -60,10 +63,11 @@ export async function uploadDatabases(
     const payload = fs.readFileSync(databaseBundlePath);
     try {
       await client.request(
-        `PUT /repos/:owner/:repo/code-scanning/databases/${language}`,
+        `PUT /repos/:owner/:repo/code-scanning/codeql/databases/:language`,
         {
           owner: repositoryNwo.owner,
           repo: repositoryNwo.repo,
+          language,
           data: payload,
         }
       );