Updating sonar github action to also retrieve and upload hotspots (#11)

Related issue: #7 and #10 ![Screenshot 2024-05-07 at 11 45 09 a m](https://github.com/pixee/upload-tool-results-action/assets/14047435/d6b5d103-9967-4c32-a39f-3ab20c8cb8d2) --------- Co-authored-by: Daniel D'Avella <dan.davella@pixee.ai>
pixee · May 10, 2024 · 244efe4 · 244efe4
1 parent 20825a3
commit 244efe4
Show file tree

Hide file tree

Showing 7 changed files with 39,382 additions and 49 deletions.
diff --git a/__tests__/action.test.ts b/__tests__/action.test.ts
@@ -9,8 +9,11 @@ let getInputMock: jest.SpiedFunction<typeof core.getInput>;
 let getGitHubContextMock: jest.SpiedFunction<typeof github.getGitHubContext>;
 let getTempDir: jest.SpiedFunction<typeof github.getTempDir>;
 let uploadInputFileMock: jest.SpiedFunction<typeof pixee.uploadInputFile>;
-let retrieveSonarCloudResultsMock: jest.SpiedFunction<
-  typeof sonar.retrieveSonarCloudResults
+let retrieveSonarCloudIssuesMock: jest.SpiedFunction<
+  typeof sonar.retrieveSonarCloudIssues
+>;
+let retrieveSonarCloudHotspotsMock: jest.SpiedFunction<
+  typeof sonar.retrieveSonarCloudHotspots
 >;
 let triggerPrAnalysisMock: jest.SpiedFunction<typeof pixee.triggerPrAnalysis>;
 let getRepositoryInfoMock: jest.SpiedFunction<typeof github.getRepositoryInfo>;
@@ -32,13 +35,17 @@ describe("action", () => {
     triggerPrAnalysisMock = jest
       .spyOn(pixee, "triggerPrAnalysis")
       .mockImplementation();
-    retrieveSonarCloudResultsMock = jest
-      .spyOn(sonar, "retrieveSonarCloudResults")
+    retrieveSonarCloudIssuesMock = jest
+      .spyOn(sonar, "retrieveSonarCloudIssues")
+      .mockImplementation();
+    retrieveSonarCloudHotspotsMock = jest
+      .spyOn(sonar, "retrieveSonarCloudHotspots")
       .mockImplementation();
     getRepositoryInfoMock = jest
       .spyOn(github, "getRepositoryInfo")
       .mockImplementation();
-    retrieveSonarCloudResultsMock.mockResolvedValue({ total: 1 });
+    retrieveSonarCloudIssuesMock.mockResolvedValue({ total: 1 });
+    retrieveSonarCloudHotspotsMock.mockResolvedValue({ paging: {total: 1} });
   });
 
   it("triggers PR analysis when the PR number is available", async () => {
@@ -58,6 +65,10 @@ describe("action", () => {
           return "";
       }
     });
+    getRepositoryInfoMock.mockReturnValue({
+      owner: "owner",
+      repo: "repo"
+    });
     triggerPrAnalysisMock.mockResolvedValue(undefined);
 
     await run();
@@ -82,10 +93,14 @@ describe("action", () => {
         repo: "repo",
         sha: "sha",
       });
+      getRepositoryInfoMock.mockReturnValue({
+        owner: "owner",
+        repo: "repo"
+      });
 
       await run();
 
-      expect(uploadInputFileMock).toHaveBeenCalledWith("sonar", "file.json");
+      expect(uploadInputFileMock).toHaveBeenCalledWith("sonar_issues", "file.json");
     });
   });
 
@@ -131,9 +146,10 @@ describe("action", () => {
 
       await run();
 
-      expect(retrieveSonarCloudResultsMock).toHaveBeenCalled();
+      expect(retrieveSonarCloudIssuesMock).toHaveBeenCalled();
+      expect(retrieveSonarCloudHotspotsMock).toHaveBeenCalled();
       expect(uploadInputFileMock).toHaveBeenCalledWith(
-        "sonar",
+        "sonar_issues",
         expect.stringMatching(/sonar-issues.json$/)
       );
     });

diff --git a/__tests__/pixee-platform.test.ts b/__tests__/pixee-platform.test.ts
@@ -28,10 +28,10 @@ describe("pixee-platform", () => {
     // mock axios.put to avoid making a real HTTP request
     jest.spyOn(axios, "put").mockResolvedValue(undefined);
 
-    await uploadInputFile("sonar", file.name);
+    await uploadInputFile("sonar_issues", file.name);
 
     expect(axios.put).toHaveBeenCalledWith(
-      "https://api.pixee.ai/analysis-input/owner/repo/sha/sonar",
+      "https://api.pixee.ai/analysis-input/owner/repo/sha/sonar_issues",
       expect.anything(), // cannot assert the form content
       {
         headers: {