Store SARIF files in separate sub-directories

Author: mbg

.github/workflows/__quality-queries.yml

@@ -15,18 +15,18 @@ steps:
     uses: actions/upload-artifact@v4
     with:
       name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json
-      path: "${{ runner.temp }}/results/javascript.sarif"
+      path: "${{ runner.temp }}/results/security/javascript.sarif"
       retention-days: 7
   - name: Upload quality SARIF
     uses: actions/upload-artifact@v4
     with:
       name: config-export-${{ matrix.os }}-${{ matrix.version }}.quality.sarif.json
-      path: "${{ runner.temp }}/results/javascript.quality.sarif"
+      path: "${{ runner.temp }}/results/quality/javascript.sarif"
       retention-days: 7
   - name: Check config properties appear in SARIF
     uses: actions/github-script@v7
     env:
-      SARIF_PATH: "${{ runner.temp }}/results/javascript.quality.sarif"
+      SARIF_PATH: "${{ runner.temp }}/results/quality/javascript.sarif"
     with:
       script: |
         const fs = require('fs');

lib/analyze-action.js

@@ -322,7 +322,7 @@ async function run() {
     const uploadInput = actionsUtil.getOptionalInput("upload");
     if (runStats && actionsUtil.getUploadValue(uploadInput) === "always") {
       uploadResult = await uploadLib.uploadFiles(
-        outputDir,
+        path.join(outputDir, `security`),
         actionsUtil.getRequiredInput("checkout_path"),
         actionsUtil.getOptionalInput("category"),
         features,

lib/analyze-action.js.map

@@ -602,7 +602,10 @@ export async function runQueries(
 
   for (const language of config.languages) {
     try {
-      const sarifFile = path.join(sarifFolder, `${language}.sarif`);
+      const securityFolder = path.join(sarifFolder, `security`);
+      await fs.promises.mkdir(securityFolder);
+
+      const sarifFile = path.join(securityFolder, `${language}.sarif`);
 
       // The work needed to generate the query suites
       // is done in the CLI. We just need to make a single
@@ -628,10 +631,10 @@ export async function runQueries(
       );
       if (config.augmentationProperties.qualityQueriesInput !== undefined) {
         logger.info(`Interpreting quality results for ${language}`);
-        const qualitySarifFile = path.join(
-          sarifFolder,
-          `${language}.quality.sarif`,
-        );
+        const qualityFolder = path.join(sarifFolder, `quality`);
+        await fs.promises.mkdir(qualityFolder);
+
+        const qualitySarifFile = path.join(qualityFolder, `${language}.sarif`);
         const qualityAnalysisSummary = await runInterpretResults(
           language,
           config.augmentationProperties.qualityQueriesInput.map((i) =>
@@ -651,6 +654,7 @@ export async function runQueries(
       logger.info(analysisSummary);
 
       if (await features.getValue(Feature.QaTelemetryEnabled)) {
+        // NOTE: This is OK, since this SARIF file contains all alerts
         const perQueryAlertCounts = getPerQueryAlertCounts(sarifFile);
 
         const perQueryAlertCountEventReport: EventReport = {