From 056fb86575b67fab2ce40184bf81847e34fa17f3 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Mon, 29 Sep 2025 12:57:45 +0100
Subject: [PATCH] Call `fixCategory` in `uploadSpecifiedFiles`

Since `fixCategory` is now part of `AnalysisConfig`, we don't have to remember to do it at the call site for `uploadSpecifiedFiles` or `uploadFiles` anymore.
---
 lib/analyze-action.js      | 6 ++----
 lib/init-action-post.js    | 1 +
 lib/upload-lib.js          | 1 +
 lib/upload-sarif-action.js | 3 ++-
 src/analyze-action.ts      | 5 +----
 src/upload-lib.ts          | 1 +
 src/upload-sarif.ts        | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 6e38e7192..de01b0b4f 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -95701,6 +95701,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
   logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`);
   const gitHubVersion = await getGitHubVersion();
   let sarif;
+  category = uploadTarget.fixCategory(logger, category);
   if (sarifPaths.length > 1) {
     for (const sarifPath of sarifPaths) {
       const parsedSarif = readSarifFile(sarifPath);
@@ -96152,10 +96153,7 @@ async function run() {
         const qualityUploadResult = await uploadFiles(
           outputDir,
           getRequiredInput("checkout_path"),
-          analysis.fixCategory(
-            logger,
-            getOptionalInput("category")
-          ),
+          getOptionalInput("category"),
           features,
           logger,
           analysis
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index 965c3bafe..19b39f77e 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -133162,6 +133162,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
   logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`);
   const gitHubVersion = await getGitHubVersion();
   let sarif;
+  category = uploadTarget.fixCategory(logger, category);
   if (sarifPaths.length > 1) {
     for (const sarifPath of sarifPaths) {
       const parsedSarif = readSarifFile(sarifPath);
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index 0ee4500fe..625eb06f8 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -92593,6 +92593,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
   logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`);
   const gitHubVersion = await getGitHubVersion();
   let sarif;
+  category = uploadTarget.fixCategory(logger, category);
   if (sarifPaths.length > 1) {
     for (const sarifPath of sarifPaths) {
       const parsedSarif = readSarifFile(sarifPath);
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index 9bf6647ec..6dc87a291 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -93229,6 +93229,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
   logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`);
   const gitHubVersion = await getGitHubVersion();
   let sarif;
+  category = uploadTarget.fixCategory(logger, category);
   if (sarifPaths.length > 1) {
     for (const sarifPath of sarifPaths) {
       const parsedSarif = readSarifFile(sarifPath);
@@ -93482,7 +93483,7 @@ async function uploadSarif(logger, features, checkoutPath, sarifPath, category)
     uploadResults[analysisKind] = await uploadSpecifiedFiles(
       sarifFiles,
       checkoutPath,
-      analysisConfig.fixCategory(logger, category),
+      category,
       features,
       logger,
       analysisConfig
diff --git a/src/analyze-action.ts b/src/analyze-action.ts
index 4c8697bbc..5ac1e5069 100644
--- a/src/analyze-action.ts
+++ b/src/analyze-action.ts
@@ -349,10 +349,7 @@ async function run() {
         const qualityUploadResult = await uploadLib.uploadFiles(
           outputDir,
           actionsUtil.getRequiredInput("checkout_path"),
-          analysis.fixCategory(
-            logger,
-            actionsUtil.getOptionalInput("category"),
-          ),
+          actionsUtil.getOptionalInput("category"),
           features,
           logger,
           analysis,
diff --git a/src/upload-lib.ts b/src/upload-lib.ts
index f4b171e9e..9566eeb9d 100644
--- a/src/upload-lib.ts
+++ b/src/upload-lib.ts
@@ -717,6 +717,7 @@ export async function uploadSpecifiedFiles(
   const gitHubVersion = await getGitHubVersion();
 
   let sarif: SarifFile;
+  category = uploadTarget.fixCategory(logger, category);
 
   if (sarifPaths.length > 1) {
     // Validate that the files we were asked to upload are all valid SARIF files
diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts
index ee685f31a..f16c7fb21 100644
--- a/src/upload-sarif.ts
+++ b/src/upload-sarif.ts
@@ -38,7 +38,7 @@ export async function uploadSarif(
     uploadResults[analysisKind] = await upload_lib.uploadSpecifiedFiles(
       sarifFiles,
       checkoutPath,
-      analysisConfig.fixCategory(logger, category),
+      category,
       features,
       logger,
       analysisConfig,