diff --git a/analyze/action.yml b/analyze/action.yml index 1d6deacf5..50c8b3d31 100644 --- a/analyze/action.yml +++ b/analyze/action.yml @@ -54,7 +54,8 @@ inputs: default: "true" wait-for-processing: description: If true, the Action will wait for the uploaded SARIF to be processed before completing. - required: false + required: true + default: "false" token: default: ${{ github.token }} matrix: diff --git a/lib/upload-lib.js b/lib/upload-lib.js index c7504cabd..39d4aad6b 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -130,7 +130,7 @@ exports.findSarifFilesInDir = findSarifFilesInDir; // depending on what the path happens to refer to. // Returns true iff the upload occurred and succeeded async function uploadFromActions(sarifPath, gitHubVersion, apiDetails, logger) { - return await uploadFiles(getSarifFilePaths(sarifPath), (0, repository_1.parseRepositoryNwo)(util.getRequiredEnvParam("GITHUB_REPOSITORY")), await actionsUtil.getCommitOid(), await actionsUtil.getRef(), await actionsUtil.getAnalysisKey(), actionsUtil.getOptionalInput("category"), util.getRequiredEnvParam("GITHUB_WORKFLOW"), actionsUtil.getWorkflowRunID(), actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getRequiredInput("matrix"), actionsUtil.getOptionalInput("wait-for-processing") === "true", gitHubVersion, apiDetails, logger); + return await uploadFiles(getSarifFilePaths(sarifPath), (0, repository_1.parseRepositoryNwo)(util.getRequiredEnvParam("GITHUB_REPOSITORY")), await actionsUtil.getCommitOid(), await actionsUtil.getRef(), await actionsUtil.getAnalysisKey(), actionsUtil.getOptionalInput("category"), util.getRequiredEnvParam("GITHUB_WORKFLOW"), actionsUtil.getWorkflowRunID(), actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getRequiredInput("matrix"), actionsUtil.getRequiredInput("wait-for-processing") === "true", gitHubVersion, apiDetails, logger); } exports.uploadFromActions = uploadFromActions; // Uploads a single sarif file or a directory of sarif files diff --git a/src/upload-lib.ts b/src/upload-lib.ts index a381b80fa..0fab708f1 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -161,7 +161,7 @@ export async function uploadFromActions( actionsUtil.getWorkflowRunID(), actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getRequiredInput("matrix"), - actionsUtil.getOptionalInput("wait-for-processing") === "true", + actionsUtil.getRequiredInput("wait-for-processing") === "true", gitHubVersion, apiDetails, logger diff --git a/upload-sarif/action.yml b/upload-sarif/action.yml index 03f1e9846..3f26f099b 100644 --- a/upload-sarif/action.yml +++ b/upload-sarif/action.yml @@ -6,7 +6,7 @@ inputs: description: | The SARIF file or directory of SARIF files to be uploaded to GitHub code scanning. See https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#uploading-a-code-scanning-analysis-with-github-actions - for information on the maximum number of results and maximum file size supported by code scanning. + for information on the maximum number of results and maximum file size supported by code scanning. required: false default: '../results' checkout_path: @@ -22,7 +22,8 @@ inputs: required: false wait-for-processing: description: If true, the Action will wait for the uploaded SARIF to be processed before completing. - required: false + required: true + default: "false" runs: using: 'node12' main: '../lib/upload-sarif-action.js'