Use postProcessSarifFiles and uploadProcessedFiles in uploadSarif

lib/analyze-action.js

@@ -96190,14 +96190,20 @@ async function uploadSarif(logger, features, checkoutPath, sarifPath, category)
     sarifGroups
   )) {
     const analysisConfig = getAnalysisConfig(analysisKind);
-    uploadResults[analysisKind] = await uploadSpecifiedFiles(
-      sarifFiles,
-      checkoutPath,
-      category,
-      features,
+    const processingResults = await postProcessSarifFiles(
       logger,
+      features,
+      checkoutPath,
+      sarifFiles,
+      category,
       analysisConfig
     );
+    uploadResults[analysisKind] = await uploadProcessedFiles(
+      logger,
+      checkoutPath,
+      analysisConfig,
+      processingResults
+    );
   }
   return uploadResults;
 }

lib/upload-lib.js

@@ -84856,7 +84856,6 @@ __export(upload_lib_exports, {
   uploadFiles: () => uploadFiles,
   uploadPayload: () => uploadPayload,
   uploadProcessedFiles: () => uploadProcessedFiles,
-  uploadSpecifiedFiles: () => uploadSpecifiedFiles,
   validateSarifFileSchema: () => validateSarifFileSchema,
   validateUniqueCategory: () => validateUniqueCategory,
   waitForProcessing: () => waitForProcessing
@@ -93011,7 +93010,6 @@ function filterAlertsByDiffRange(logger, sarif) {
   uploadFiles,
   uploadPayload,
   uploadProcessedFiles,
-  uploadSpecifiedFiles,
   validateSarifFileSchema,
   validateUniqueCategory,
   waitForProcessing

lib/upload-sarif-action.js

@@ -93402,22 +93402,6 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths,
   );
   return { sarif, analysisKey, environment };
 }
-async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget) {
-  const processingResults = await postProcessSarifFiles(
-    logger,
-    features,
-    checkoutPath,
-    sarifPaths,
-    category,
-    uploadTarget
-  );
-  return uploadProcessedFiles(
-    logger,
-    checkoutPath,
-    uploadTarget,
-    processingResults
-  );
-}
 async function uploadProcessedFiles(logger, checkoutPath, uploadTarget, processingResults) {
   logger.startGroup(`Uploading ${uploadTarget.name} results`);
   const sarif = processingResults.sarif;
@@ -93646,14 +93630,20 @@ async function uploadSarif(logger, features, checkoutPath, sarifPath, category)
     sarifGroups
   )) {
     const analysisConfig = getAnalysisConfig(analysisKind);
-    uploadResults[analysisKind] = await uploadSpecifiedFiles(
-      sarifFiles,
-      checkoutPath,
-      category,
-      features,
+    const processingResults = await postProcessSarifFiles(
       logger,
+      features,
+      checkoutPath,
+      sarifFiles,
+      category,
       analysisConfig
     );
+    uploadResults[analysisKind] = await uploadProcessedFiles(
+      logger,
+      checkoutPath,
+      analysisConfig,
+      processingResults
+    );
   }
   return uploadResults;
 }