Allow duplicate categories in the same validation step

A single SARIF file should be allowed to have duplicated
categories.

Author: aeisenberg

lib/upload-lib.js

@@ -310,8 +310,11 @@ test("validateUniqueCategory for multiple runs", (t) => {
   const sarif1 = createMockSarif("abc", "def");
   const sarif2 = createMockSarif("ghi", "jkl");
 
-  const multiSarif = { runs: [sarif1.runs[0], sarif2.runs[0]] };
+  // duplicate categories are allowed within the same sarif file
+  const multiSarif = { runs: [sarif1.runs[0], sarif1.runs[0], sarif2.runs[0]] };
   t.notThrows(() => uploadLib.validateUniqueCategory(multiSarif));
+
+  // should throw if there are duplicate categories in separate validations
   t.throws(() => uploadLib.validateUniqueCategory(sarif1));
   t.throws(() => uploadLib.validateUniqueCategory(sarif2));
 });

lib/upload-lib.js.map

@@ -485,10 +485,18 @@ export async function waitForProcessing(
 export function validateUniqueCategory(sarif: SarifFile): void {
   // This check only works on actions as env vars don't persist between calls to the runner
   if (util.isActions()) {
+    // duplicate categories are allowed in the same sarif file
+    // but not across multiple sarif files
+    const categories = {} as Record<string, { id?: string; tool?: string }>;
+
     for (const run of sarif.runs) {
       const id = run?.automationDetails?.id;
       const tool = run.tool?.driver?.name;
       const category = `${sanitize(id)}_${sanitize(tool)}`;
+      categories[category] = { id, tool };
+    }
+
+    for (const [category, { id, tool }] of Object.entries(categories)) {
       const sentinelEnvVar = `CODEQL_UPLOAD_SARIF_${category}`;
       if (process.env[sentinelEnvVar]) {
         throw new Error(
@@ -499,7 +507,7 @@ export function validateUniqueCategory(sarif: SarifFile): void {
       }
       core.exportVariable(sentinelEnvVar, sentinelEnvVar);
     }
-  }
+   }
 }
 
 /**