Use options object instead of boolean for mergeResults

github · Mar 25, 2024 · 6ac5753 · 6ac5753
1 parent e20c273
commit 6ac5753
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
diff --git a/lib/upload-lib.js.map b/lib/upload-lib.js.map
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -201,7 +201,7 @@ export interface CodeQL {
   mergeResults(
     sarifFiles: string[],
     outputFile: string,
-    mergeRunsFromEqualCategory?: boolean,
+    options: { mergeRunsFromEqualCategory?: boolean },
   ): Promise<void>;
 }
 
@@ -1093,7 +1093,9 @@ export async function getCodeQLForCmd(
     async mergeResults(
       sarifFiles: string[],
       outputFile: string,
-      mergeRunsFromEqualCategory = false,
+      {
+        mergeRunsFromEqualCategory = false,
+      }: { mergeRunsFromEqualCategory?: boolean },
     ): Promise<void> {
       const args = [
         "github",

diff --git a/src/upload-lib.ts b/src/upload-lib.ts
@@ -153,7 +153,9 @@ async function combineSarifFilesUsingCLI(
 
   const outputFile = path.resolve(outputDirectory, "combined-sarif.sarif");
 
-  await codeQL.mergeResults(sarifFiles, outputFile, true);
+  await codeQL.mergeResults(sarifFiles, outputFile, {
+    mergeRunsFromEqualCategory: true,
+  });
 
   return JSON.parse(fs.readFileSync(outputFile, "utf8")) as SarifFile;
 }