Include analysis kind in payloadSaveFile path in uploadPayload

lib/analyze-action.js

@@ -95530,12 +95530,12 @@ function getAutomationID2(category, analysis_key, environment) {
   }
   return computeAutomationID(analysis_key, environment);
 }
-async function uploadPayload(payload, repositoryNwo, logger, target) {
+async function uploadPayload(payload, repositoryNwo, logger, analysis) {
   logger.info("Uploading results");
   if (isInTestMode()) {
     const payloadSaveFile = path18.join(
       getTemporaryDirectory(),
-      "payload.json"
+      `payload-${analysis.kind}.json`
     );
     logger.info(
       `In test mode. Results are not uploaded. Saving to ${payloadSaveFile}`
@@ -95546,7 +95546,7 @@ async function uploadPayload(payload, repositoryNwo, logger, target) {
   }
   const client = getApiClient();
   try {
-    const response = await client.request(target, {
+    const response = await client.request(analysis.target, {
       owner: repositoryNwo.owner,
       repo: repositoryNwo.repo,
       data: payload
@@ -95780,7 +95780,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
     payload,
     getRepositoryNwo(),
     logger,
-    uploadTarget.target
+    uploadTarget
   );
   logger.endGroup();
   return {

lib/init-action-post.js

@@ -133006,12 +133006,12 @@ function getAutomationID2(category, analysis_key, environment) {
   }
   return computeAutomationID(analysis_key, environment);
 }
-async function uploadPayload(payload, repositoryNwo, logger, target) {
+async function uploadPayload(payload, repositoryNwo, logger, analysis) {
   logger.info("Uploading results");
   if (isInTestMode()) {
     const payloadSaveFile = path17.join(
       getTemporaryDirectory(),
-      "payload.json"
+      `payload-${analysis.kind}.json`
     );
     logger.info(
       `In test mode. Results are not uploaded. Saving to ${payloadSaveFile}`
@@ -133022,7 +133022,7 @@ async function uploadPayload(payload, repositoryNwo, logger, target) {
   }
   const client = getApiClient();
   try {
-    const response = await client.request(target, {
+    const response = await client.request(analysis.target, {
       owner: repositoryNwo.owner,
       repo: repositoryNwo.repo,
       data: payload
@@ -133256,7 +133256,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
     payload,
     getRepositoryNwo(),
     logger,
-    uploadTarget.target
+    uploadTarget
   );
   logger.endGroup();
   return {

lib/upload-lib.js

@@ -92365,12 +92365,12 @@ function getAutomationID2(category, analysis_key, environment) {
   }
   return computeAutomationID(analysis_key, environment);
 }
-async function uploadPayload(payload, repositoryNwo, logger, target) {
+async function uploadPayload(payload, repositoryNwo, logger, analysis) {
   logger.info("Uploading results");
   if (isInTestMode()) {
     const payloadSaveFile = path14.join(
       getTemporaryDirectory(),
-      "payload.json"
+      `payload-${analysis.kind}.json`
     );
     logger.info(
       `In test mode. Results are not uploaded. Saving to ${payloadSaveFile}`
@@ -92381,7 +92381,7 @@ async function uploadPayload(payload, repositoryNwo, logger, target) {
   }
   const client = getApiClient();
   try {
-    const response = await client.request(target, {
+    const response = await client.request(analysis.target, {
       owner: repositoryNwo.owner,
       repo: repositoryNwo.repo,
       data: payload
@@ -92663,7 +92663,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
     payload,
     getRepositoryNwo(),
     logger,
-    uploadTarget.target
+    uploadTarget
   );
   logger.endGroup();
   return {

lib/upload-sarif-action.js

@@ -93037,12 +93037,12 @@ function getAutomationID2(category, analysis_key, environment) {
   }
   return computeAutomationID(analysis_key, environment);
 }
-async function uploadPayload(payload, repositoryNwo, logger, target) {
+async function uploadPayload(payload, repositoryNwo, logger, analysis) {
   logger.info("Uploading results");
   if (isInTestMode()) {
     const payloadSaveFile = path15.join(
       getTemporaryDirectory(),
-      "payload.json"
+      `payload-${analysis.kind}.json`
     );
     logger.info(
       `In test mode. Results are not uploaded. Saving to ${payloadSaveFile}`
@@ -93053,7 +93053,7 @@ async function uploadPayload(payload, repositoryNwo, logger, target) {
   }
   const client = getApiClient();
   try {
-    const response = await client.request(target, {
+    const response = await client.request(analysis.target, {
       owner: repositoryNwo.owner,
       repo: repositoryNwo.repo,
       data: payload
@@ -93304,7 +93304,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features
     payload,
     getRepositoryNwo(),
     logger,
-    uploadTarget.target
+    uploadTarget
   );
   logger.endGroup();
   return {

src/upload-lib.ts

@@ -352,7 +352,7 @@ async function uploadPayload(
   payload: any,
   repositoryNwo: RepositoryNwo,
   logger: Logger,
-  target: analyses.SARIF_UPLOAD_ENDPOINT,
+  analysis: analyses.AnalysisConfig,
 ): Promise<string> {
   logger.info("Uploading results");
 
@@ -360,7 +360,7 @@ async function uploadPayload(
   if (util.isInTestMode()) {
     const payloadSaveFile = path.join(
       actionsUtil.getTemporaryDirectory(),
-      "payload.json",
+      `payload-${analysis.kind}.json`,
     );
     logger.info(
       `In test mode. Results are not uploaded. Saving to ${payloadSaveFile}`,
@@ -373,7 +373,7 @@ async function uploadPayload(
   const client = api.getApiClient();
 
   try {
-    const response = await client.request(target, {
+    const response = await client.request(analysis.target, {
       owner: repositoryNwo.owner,
       repo: repositoryNwo.repo,
       data: payload,
@@ -807,7 +807,7 @@ export async function uploadSpecifiedFiles(
     payload,
     getRepositoryNwo(),
     logger,
-    uploadTarget.target,
+    uploadTarget,
   );
 
   logger.endGroup();