Skip to content

Commit ebd514f

Browse files
committed
Address review comments
1 parent c98d5a9 commit ebd514f

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

lib/analyze-action.js

Lines changed: 14 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/analyze-action.ts

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,14 +385,20 @@ async function run() {
385385
}
386386
}
387387

388-
core.setOutput(
389-
"sarif-id",
390-
uploadResults[analyses.AnalysisKind.CodeScanning]?.sarifID,
391-
);
392-
core.setOutput(
393-
"quality-sarif-id",
394-
uploadResults[analyses.AnalysisKind.CodeQuality]?.sarifID,
395-
);
388+
// Set the SARIF id outputs only if we have results for them, to avoid
389+
// having keys with empty values in the action output.
390+
if (uploadResults[analyses.AnalysisKind.CodeScanning] !== undefined) {
391+
core.setOutput(
392+
"sarif-id",
393+
uploadResults[analyses.AnalysisKind.CodeScanning].sarifID,
394+
);
395+
}
396+
if (uploadResults[analyses.AnalysisKind.CodeQuality] !== undefined) {
397+
core.setOutput(
398+
"quality-sarif-id",
399+
uploadResults[analyses.AnalysisKind.CodeQuality].sarifID,
400+
);
401+
}
396402
} else {
397403
logger.info("Not uploading results");
398404
}
@@ -434,8 +440,7 @@ async function run() {
434440
if (util.isInTestMode()) {
435441
logger.debug("In test mode. Waiting for processing is disabled.");
436442
} else if (
437-
uploadResults !== undefined &&
438-
uploadResults[analyses.AnalysisKind.CodeScanning] !== undefined &&
443+
uploadResults?.[analyses.AnalysisKind.CodeScanning] !== undefined &&
439444
actionsUtil.getRequiredInput("wait-for-processing") === "true"
440445
) {
441446
await uploadLib.waitForProcessing(
@@ -479,8 +484,7 @@ async function run() {
479484

480485
if (
481486
runStats !== undefined &&
482-
uploadResults !== undefined &&
483-
uploadResults[analyses.AnalysisKind.CodeScanning] !== undefined
487+
uploadResults?.[analyses.AnalysisKind.CodeScanning] !== undefined
484488
) {
485489
await sendStatusReport(
486490
startedAt,

0 commit comments

Comments
 (0)