diff --git a/lib/analyze-action.js b/lib/analyze-action.js index a08333b86..a781dbc41 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -90125,14 +90125,16 @@ var CodeScanning = { kind: "code-scanning" /* CodeScanning */, name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), + sarifExtension: ".sarif", + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { kind: "code-quality" /* CodeQuality */, name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, - sarifPredicate: (name) => name.endsWith(".quality.sarif"), + sarifExtension: ".quality.sarif", + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index e4f20853a..490414bdb 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -128758,14 +128758,16 @@ var CodeScanning = { kind: "code-scanning" /* CodeScanning */, name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), + sarifExtension: ".sarif", + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { kind: "code-quality" /* CodeQuality */, name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, - sarifPredicate: (name) => name.endsWith(".quality.sarif"), + sarifExtension: ".quality.sarif", + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index fedf0454f..e13493f1f 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -88501,14 +88501,16 @@ var CodeScanning = { kind: "code-scanning" /* CodeScanning */, name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), + sarifExtension: ".sarif", + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { kind: "code-quality" /* CodeQuality */, name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, - sarifPredicate: (name) => name.endsWith(".quality.sarif"), + sarifExtension: ".quality.sarif", + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index d3047dd99..980ef151f 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -88729,14 +88729,16 @@ var CodeScanning = { kind: "code-scanning" /* CodeScanning */, name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), + sarifExtension: ".sarif", + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { kind: "code-quality" /* CodeQuality */, name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, - sarifPredicate: (name) => name.endsWith(".quality.sarif"), + sarifExtension: ".quality.sarif", + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; diff --git a/src/analyses.ts b/src/analyses.ts index 9a5d1e831..8d8cd1d61 100644 --- a/src/analyses.ts +++ b/src/analyses.ts @@ -56,6 +56,8 @@ export interface AnalysisConfig { name: string; /** The API endpoint to upload SARIF files to. */ target: SARIF_UPLOAD_ENDPOINT; + /** The file extension for SARIF files generated by this kind of analysis. */ + sarifExtension: string; /** A predicate on filenames to decide whether a SARIF file * belongs to this kind of analysis. */ sarifPredicate: (name: string) => boolean; @@ -68,8 +70,10 @@ export const CodeScanning: AnalysisConfig = { kind: AnalysisKind.CodeScanning, name: "code scanning", target: SARIF_UPLOAD_ENDPOINT.CODE_SCANNING, + sarifExtension: ".sarif", sarifPredicate: (name) => - name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), + name.endsWith(CodeScanning.sarifExtension) && + !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_", }; @@ -78,6 +82,7 @@ export const CodeQuality: AnalysisConfig = { kind: AnalysisKind.CodeQuality, name: "code quality", target: SARIF_UPLOAD_ENDPOINT.CODE_QUALITY, - sarifPredicate: (name) => name.endsWith(".quality.sarif"), + sarifExtension: ".quality.sarif", + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_", };