From 86275f6e9a11cb69e98fd5dafd4dc3e6c87c25a7 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Mon, 1 Sep 2025 16:11:03 +0100
Subject: [PATCH] Fix `addSarifExtension` and add tests

---
 lib/analyze-action.js |  2 +-
 src/analyze.test.ts   | 12 ++++++++++++
 src/analyze.ts        |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 65e6befe3..482c573b8 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -93586,7 +93586,7 @@ function resolveQuerySuiteAlias(language, maybeSuite) {
   return maybeSuite;
 }
 function addSarifExtension(analysis, base) {
-  return `${base}.${analysis.sarifExtension}`;
+  return `${base}${analysis.sarifExtension}`;
 }
 async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, diffRangePackDir, automationDetailsId, codeql, config, logger, features) {
   const statusReport = {};
diff --git a/src/analyze.test.ts b/src/analyze.test.ts
index e957b7384..305d41d24 100644
--- a/src/analyze.test.ts
+++ b/src/analyze.test.ts
@@ -5,11 +5,13 @@ import test from "ava";
 import * as sinon from "sinon";
 
 import * as actionsUtil from "./actions-util";
+import { CodeQuality, CodeScanning } from "./analyses";
 import {
   exportedForTesting,
   runQueries,
   defaultSuites,
   resolveQuerySuiteAlias,
+  addSarifExtension,
 } from "./analyze";
 import { createStubCodeQL } from "./codeql";
 import { Feature } from "./feature-flags";
@@ -348,3 +350,13 @@ test("resolveQuerySuiteAlias", (t) => {
     t.deepEqual(resolveQuerySuiteAlias(KnownLanguage.go, name), name);
   }
 });
+
+test("addSarifExtension", (t) => {
+  for (const language of Object.values(KnownLanguage)) {
+    t.deepEqual(addSarifExtension(CodeScanning, language), `${language}.sarif`);
+    t.deepEqual(
+      addSarifExtension(CodeQuality, language),
+      `${language}.quality.sarif`,
+    );
+  }
+});
diff --git a/src/analyze.ts b/src/analyze.ts
index ef15d0883..f4ebdffa9 100644
--- a/src/analyze.ts
+++ b/src/analyze.ts
@@ -615,7 +615,7 @@ export function addSarifExtension(
   analysis: analyses.AnalysisConfig,
   base: string,
 ): string {
-  return `${base}.${analysis.sarifExtension}`;
+  return `${base}${analysis.sarifExtension}`;
 }
 
 // Runs queries and creates sarif files in the given folder