diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 05c2d704a..0bfb66aac 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -95619,8 +95619,10 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea const toolNames = getToolNames(sarif); logger.debug(`Validating that each SARIF run has a unique category`); validateUniqueCategory(sarif, uploadTarget.sentinelPrefix); + logger.debug(`Serializing SARIF for upload`); + const sarifPayload = JSON.stringify(sarif); if (dumpDir) { - dumpSarifFile(sarif, dumpDir, logger, uploadTarget); + dumpSarifFile(sarifPayload, dumpDir, logger, uploadTarget); } if (!upload) { logger.info( @@ -95628,8 +95630,6 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea ); return void 0; } - logger.debug(`Serializing SARIF for upload`); - const sarifPayload = JSON.stringify(sarif); logger.debug(`Compressing serialized SARIF`); const zippedSarif = import_zlib.default.gzipSync(sarifPayload).toString("base64"); const checkoutURI = url.pathToFileURL(checkoutPath).href; @@ -95670,7 +95670,7 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea logger.endGroup(); } } -function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { +function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { if (!fs18.existsSync(outputDir)) { fs18.mkdirSync(outputDir, { recursive: true }); } else if (!fs18.lstatSync(outputDir).isDirectory()) { @@ -95683,7 +95683,7 @@ function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { `upload${uploadTarget.sarifExtension}` ); logger.info(`Dumping processed SARIF file to ${outputFile}`); - fs18.writeFileSync(outputFile, JSON.stringify(sarif, null, 2)); + fs18.writeFileSync(outputFile, sarifPayload); } var STATUS_CHECK_FREQUENCY_MILLISECONDS = 5 * 1e3; var STATUS_CHECK_TIMEOUT_MILLISECONDS = 2 * 60 * 1e3; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 066acf682..52d67086c 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -133067,8 +133067,10 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea const toolNames = getToolNames(sarif); logger.debug(`Validating that each SARIF run has a unique category`); validateUniqueCategory(sarif, uploadTarget.sentinelPrefix); + logger.debug(`Serializing SARIF for upload`); + const sarifPayload = JSON.stringify(sarif); if (dumpDir) { - dumpSarifFile(sarif, dumpDir, logger, uploadTarget); + dumpSarifFile(sarifPayload, dumpDir, logger, uploadTarget); } if (!upload) { logger.info( @@ -133076,8 +133078,6 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea ); return void 0; } - logger.debug(`Serializing SARIF for upload`); - const sarifPayload = JSON.stringify(sarif); logger.debug(`Compressing serialized SARIF`); const zippedSarif = import_zlib.default.gzipSync(sarifPayload).toString("base64"); const checkoutURI = url.pathToFileURL(checkoutPath).href; @@ -133118,7 +133118,7 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea logger.endGroup(); } } -function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { +function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { if (!fs17.existsSync(outputDir)) { fs17.mkdirSync(outputDir, { recursive: true }); } else if (!fs17.lstatSync(outputDir).isDirectory()) { @@ -133131,7 +133131,7 @@ function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { `upload${uploadTarget.sarifExtension}` ); logger.info(`Dumping processed SARIF file to ${outputFile}`); - fs17.writeFileSync(outputFile, JSON.stringify(sarif, null, 2)); + fs17.writeFileSync(outputFile, sarifPayload); } var STATUS_CHECK_FREQUENCY_MILLISECONDS = 5 * 1e3; var STATUS_CHECK_TIMEOUT_MILLISECONDS = 2 * 60 * 1e3; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 67cdd75f2..d7ce92e9c 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -92451,8 +92451,10 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea const toolNames = getToolNames(sarif); logger.debug(`Validating that each SARIF run has a unique category`); validateUniqueCategory(sarif, uploadTarget.sentinelPrefix); + logger.debug(`Serializing SARIF for upload`); + const sarifPayload = JSON.stringify(sarif); if (dumpDir) { - dumpSarifFile(sarif, dumpDir, logger, uploadTarget); + dumpSarifFile(sarifPayload, dumpDir, logger, uploadTarget); } if (!upload) { logger.info( @@ -92460,8 +92462,6 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea ); return void 0; } - logger.debug(`Serializing SARIF for upload`); - const sarifPayload = JSON.stringify(sarif); logger.debug(`Compressing serialized SARIF`); const zippedSarif = import_zlib.default.gzipSync(sarifPayload).toString("base64"); const checkoutURI = url.pathToFileURL(checkoutPath).href; @@ -92502,7 +92502,7 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea logger.endGroup(); } } -function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { +function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { if (!fs13.existsSync(outputDir)) { fs13.mkdirSync(outputDir, { recursive: true }); } else if (!fs13.lstatSync(outputDir).isDirectory()) { @@ -92515,7 +92515,7 @@ function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { `upload${uploadTarget.sarifExtension}` ); logger.info(`Dumping processed SARIF file to ${outputFile}`); - fs13.writeFileSync(outputFile, JSON.stringify(sarif, null, 2)); + fs13.writeFileSync(outputFile, sarifPayload); } var STATUS_CHECK_FREQUENCY_MILLISECONDS = 5 * 1e3; var STATUS_CHECK_TIMEOUT_MILLISECONDS = 2 * 60 * 1e3; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index b72e46244..a6881c4c6 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -93151,8 +93151,10 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea const toolNames = getToolNames(sarif); logger.debug(`Validating that each SARIF run has a unique category`); validateUniqueCategory(sarif, uploadTarget.sentinelPrefix); + logger.debug(`Serializing SARIF for upload`); + const sarifPayload = JSON.stringify(sarif); if (dumpDir) { - dumpSarifFile(sarif, dumpDir, logger, uploadTarget); + dumpSarifFile(sarifPayload, dumpDir, logger, uploadTarget); } if (!upload) { logger.info( @@ -93160,8 +93162,6 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea ); return void 0; } - logger.debug(`Serializing SARIF for upload`); - const sarifPayload = JSON.stringify(sarif); logger.debug(`Compressing serialized SARIF`); const zippedSarif = import_zlib.default.gzipSync(sarifPayload).toString("base64"); const checkoutURI = url.pathToFileURL(checkoutPath).href; @@ -93202,7 +93202,7 @@ async function maybeUploadSpecifiedFiles(sarifPaths, checkoutPath, category, fea logger.endGroup(); } } -function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { +function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { if (!fs14.existsSync(outputDir)) { fs14.mkdirSync(outputDir, { recursive: true }); } else if (!fs14.lstatSync(outputDir).isDirectory()) { @@ -93215,7 +93215,7 @@ function dumpSarifFile(sarif, outputDir, logger, uploadTarget) { `upload${uploadTarget.sarifExtension}` ); logger.info(`Dumping processed SARIF file to ${outputFile}`); - fs14.writeFileSync(outputFile, JSON.stringify(sarif, null, 2)); + fs14.writeFileSync(outputFile, sarifPayload); } var STATUS_CHECK_FREQUENCY_MILLISECONDS = 5 * 1e3; var STATUS_CHECK_TIMEOUT_MILLISECONDS = 2 * 60 * 1e3; diff --git a/src/upload-lib.ts b/src/upload-lib.ts index 7eed5faa3..f1b9eb4b9 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -748,8 +748,10 @@ async function maybeUploadSpecifiedFiles( logger.debug(`Validating that each SARIF run has a unique category`); validateUniqueCategory(sarif, uploadTarget.sentinelPrefix); + logger.debug(`Serializing SARIF for upload`); + const sarifPayload = JSON.stringify(sarif); if (dumpDir) { - dumpSarifFile(sarif, dumpDir, logger, uploadTarget); + dumpSarifFile(sarifPayload, dumpDir, logger, uploadTarget); } if (!upload) { logger.info( @@ -757,8 +759,6 @@ async function maybeUploadSpecifiedFiles( ); return undefined; } - logger.debug(`Serializing SARIF for upload`); - const sarifPayload = JSON.stringify(sarif); logger.debug(`Compressing serialized SARIF`); const zippedSarif = zlib.gzipSync(sarifPayload).toString("base64"); const checkoutURI = url.pathToFileURL(checkoutPath).href; @@ -810,7 +810,7 @@ async function maybeUploadSpecifiedFiles( * Dumps the given processed SARIF file contents to `outputDir`. */ function dumpSarifFile( - sarif: SarifFile, + sarifPayload: string, outputDir: string, logger: Logger, uploadTarget: analyses.AnalysisConfig, @@ -827,7 +827,7 @@ function dumpSarifFile( `upload${uploadTarget.sarifExtension}`, ); logger.info(`Dumping processed SARIF file to ${outputFile}`); - fs.writeFileSync(outputFile, JSON.stringify(sarif, null, 2)); + fs.writeFileSync(outputFile, sarifPayload); } const STATUS_CHECK_FREQUENCY_MILLISECONDS = 5 * 1000;