From 82b82e58c0bef58133b3b45099b57a3b9e46cbfd Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Mon, 25 Mar 2024 10:12:31 +0100 Subject: [PATCH] Only upload combined SARIF files when env var is set --- lib/analyze-action-post.js | 4 ++++ lib/analyze-action-post.js.map | 2 +- lib/upload-sarif-action-post-helper.js | 3 ++- lib/upload-sarif-action-post-helper.js.map | 2 +- src/analyze-action-post.ts | 5 +++++ src/upload-sarif-action-post-helper.ts | 5 ++++- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index f2365d1a2..62b01a6e7 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -31,10 +31,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); const core = __importStar(require("@actions/core")); const analyzeActionPostHelper = __importStar(require("./analyze-action-post-helper")); const debugArtifacts = __importStar(require("./debug-artifacts")); +const uploadSarifActionPostHelper = __importStar(require("./upload-sarif-action-post-helper")); const util_1 = require("./util"); async function runWrapper() { try { await analyzeActionPostHelper.run(debugArtifacts.uploadSarifDebugArtifact); + // Also run the upload-sarif post action since we're potentially running + // the same steps in the analyze action. + await uploadSarifActionPostHelper.run(debugArtifacts.uploadDebugArtifacts); } catch (error) { core.setFailed(`analyze post-action step failed: ${(0, util_1.wrapError)(error).message}`); diff --git a/lib/analyze-action-post.js.map b/lib/analyze-action-post.js.map index cab4b7eda..67b16bf78 100644 --- a/lib/analyze-action-post.js.map +++ b/lib/analyze-action-post.js.map @@ -1 +1 @@ -{"version":3,"file":"analyze-action-post.js","sourceRoot":"","sources":["../src/analyze-action-post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;GAIG;AACH,oDAAsC;AAEtC,sFAAwE;AACxE,kEAAoD;AACpD,iCAAmC;AAEnC,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;IAC7E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CACZ,oCAAoC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAC/D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"analyze-action-post.js","sourceRoot":"","sources":["../src/analyze-action-post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;GAIG;AACH,oDAAsC;AAEtC,sFAAwE;AACxE,kEAAoD;AACpD,+FAAiF;AACjF,iCAAmC;AAEnC,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;QAE3E,wEAAwE;QACxE,wCAAwC;QACxC,MAAM,2BAA2B,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;IAC7E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CACZ,oCAAoC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAC/D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"} \ No newline at end of file diff --git a/lib/upload-sarif-action-post-helper.js b/lib/upload-sarif-action-post-helper.js index 5c3499d70..0acb4bbf4 100644 --- a/lib/upload-sarif-action-post-helper.js +++ b/lib/upload-sarif-action-post-helper.js @@ -31,7 +31,8 @@ const actionsUtil = __importStar(require("./actions-util")); async function run(uploadDebugArtifacts) { const tempDir = actionsUtil.getTemporaryDirectory(); // Upload Actions SARIF artifacts for debugging - if (core.isDebug()) { + if (core.isDebug() && + process.env["CODEQL_ACTION_DEBUG_COMBINED_SARIF"] === "true") { core.info("Debug mode is on. Uploading available combined SARIF files as Actions debugging artifact..."); const baseTempDir = path.resolve(tempDir, "combined-sarif"); const toUpload = []; diff --git a/lib/upload-sarif-action-post-helper.js.map b/lib/upload-sarif-action-post-helper.js.map index 1a8322924..913b0cd98 100644 --- a/lib/upload-sarif-action-post-helper.js.map +++ b/lib/upload-sarif-action-post-helper.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-sarif-action-post-helper.js","sourceRoot":"","sources":["../src/upload-sarif-action-post-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,oDAAsC;AAEtC,4DAA8C;AAEvC,KAAK,UAAU,GAAG,CACvB,oBAIkB;IAElB,MAAM,OAAO,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAEpD,+CAA+C;IAC/C,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CACP,6FAA6F,CAC9F,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAE/C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,EAAE;qBAClB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;qBACjD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEvC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,oBAAoB,CACxB,QAAQ,EACR,WAAW,EACX,wBAAwB,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAzCD,kBAyCC"} \ No newline at end of file +{"version":3,"file":"upload-sarif-action-post-helper.js","sourceRoot":"","sources":["../src/upload-sarif-action-post-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,oDAAsC;AAEtC,4DAA8C;AAEvC,KAAK,UAAU,GAAG,CACvB,oBAIkB;IAElB,MAAM,OAAO,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAEpD,+CAA+C;IAC/C,IACE,IAAI,CAAC,OAAO,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,KAAK,MAAM,EAC5D,CAAC;QACD,IAAI,CAAC,IAAI,CACP,6FAA6F,CAC9F,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAE/C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,EAAE;qBAClB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;qBACjD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEvC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,oBAAoB,CACxB,QAAQ,EACR,WAAW,EACX,wBAAwB,CACzB,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AA5CD,kBA4CC"} \ No newline at end of file diff --git a/src/analyze-action-post.ts b/src/analyze-action-post.ts index 50a5e1fc3..0a7aaf7f9 100644 --- a/src/analyze-action-post.ts +++ b/src/analyze-action-post.ts @@ -7,11 +7,16 @@ import * as core from "@actions/core"; import * as analyzeActionPostHelper from "./analyze-action-post-helper"; import * as debugArtifacts from "./debug-artifacts"; +import * as uploadSarifActionPostHelper from "./upload-sarif-action-post-helper"; import { wrapError } from "./util"; async function runWrapper() { try { await analyzeActionPostHelper.run(debugArtifacts.uploadSarifDebugArtifact); + + // Also run the upload-sarif post action since we're potentially running + // the same steps in the analyze action. + await uploadSarifActionPostHelper.run(debugArtifacts.uploadDebugArtifacts); } catch (error) { core.setFailed( `analyze post-action step failed: ${wrapError(error).message}`, diff --git a/src/upload-sarif-action-post-helper.ts b/src/upload-sarif-action-post-helper.ts index 788acf981..9b3f553be 100644 --- a/src/upload-sarif-action-post-helper.ts +++ b/src/upload-sarif-action-post-helper.ts @@ -15,7 +15,10 @@ export async function run( const tempDir = actionsUtil.getTemporaryDirectory(); // Upload Actions SARIF artifacts for debugging - if (core.isDebug()) { + if ( + core.isDebug() && + process.env["CODEQL_ACTION_DEBUG_COMBINED_SARIF"] === "true" + ) { core.info( "Debug mode is on. Uploading available combined SARIF files as Actions debugging artifact...", );