diff --git a/lib/analyze-action.js b/lib/analyze-action.js index fba60d03b..af61a40ba 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -90121,13 +90121,13 @@ var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { })(AnalysisKind || {}); var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); var codeQualityQueries = ["code-quality"]; -var CodeScanningTarget = { +var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQualityTarget.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; -var CodeQualityTarget = { +var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifPredicate: (name) => name.endsWith(".quality.sarif"), @@ -95524,7 +95524,7 @@ async function uploadFiles(inputSarifPath, checkoutPath, category, features, log uploadTarget ); } -async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanningTarget) { +async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanning) { logger.startGroup(`Uploading ${uploadTarget.name} results`); logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); @@ -95695,7 +95695,7 @@ function handleProcessingResultForUnsuccessfulExecution(response, status, logger assertNever(status); } } -function validateUniqueCategory(sarif, sentinelPrefix = CodeScanningTarget.sentinelPrefix) { +function validateUniqueCategory(sarif, sentinelPrefix = CodeScanning.sentinelPrefix) { const categories = {}; for (const run2 of sarif.runs) { const id = run2?.automationDetails?.id; @@ -95951,7 +95951,7 @@ async function run() { getOptionalInput("category"), features, logger, - CodeScanningTarget + CodeScanning ); core14.setOutput("sarif-id", uploadResult.sarifID); if (isCodeQualityEnabled(config)) { @@ -95964,7 +95964,7 @@ async function run() { ), features, logger, - CodeQualityTarget + CodeQuality ); core14.setOutput("quality-sarif-id", qualityUploadResult.sarifID); } diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 31547af74..2320d55f0 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -128754,13 +128754,13 @@ var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { return AnalysisKind2; })(AnalysisKind || {}); var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); -var CodeScanningTarget = { +var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQualityTarget.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; -var CodeQualityTarget = { +var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifPredicate: (name) => name.endsWith(".quality.sarif"), @@ -133006,7 +133006,7 @@ async function uploadFiles(inputSarifPath, checkoutPath, category, features, log uploadTarget ); } -async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanningTarget) { +async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanning) { logger.startGroup(`Uploading ${uploadTarget.name} results`); logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); @@ -133177,7 +133177,7 @@ function handleProcessingResultForUnsuccessfulExecution(response, status, logger assertNever(status); } } -function validateUniqueCategory(sarif, sentinelPrefix = CodeScanningTarget.sentinelPrefix) { +function validateUniqueCategory(sarif, sentinelPrefix = CodeScanning.sentinelPrefix) { const categories = {}; for (const run2 of sarif.runs) { const id = run2?.automationDetails?.id; @@ -133402,7 +133402,7 @@ async function maybeUploadFailedSarif(config, repositoryNwo, features, logger) { category, features, logger, - CodeScanningTarget + CodeScanning ); await waitForProcessing( repositoryNwo, diff --git a/lib/upload-lib.js b/lib/upload-lib.js index d18597ef8..64ac6a9de 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -88497,13 +88497,13 @@ var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { return AnalysisKind2; })(AnalysisKind || {}); var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); -var CodeScanningTarget = { +var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQualityTarget.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; -var CodeQualityTarget = { +var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifPredicate: (name) => name.endsWith(".quality.sarif"), @@ -92394,7 +92394,7 @@ async function uploadFiles(inputSarifPath, checkoutPath, category, features, log uploadTarget ); } -async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanningTarget) { +async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanning) { logger.startGroup(`Uploading ${uploadTarget.name} results`); logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); @@ -92565,7 +92565,7 @@ function handleProcessingResultForUnsuccessfulExecution(response, status, logger assertNever(status); } } -function validateUniqueCategory(sarif, sentinelPrefix = CodeScanningTarget.sentinelPrefix) { +function validateUniqueCategory(sarif, sentinelPrefix = CodeScanning.sentinelPrefix) { const categories = {}; for (const run of sarif.runs) { const id = run?.automationDetails?.id; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 91eec037a..dd2f38edc 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -88725,13 +88725,13 @@ var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { return AnalysisKind2; })(AnalysisKind || {}); var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); -var CodeScanningTarget = { +var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, - sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQualityTarget.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; -var CodeQualityTarget = { +var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifPredicate: (name) => name.endsWith(".quality.sarif"), @@ -93079,7 +93079,7 @@ async function uploadFiles(inputSarifPath, checkoutPath, category, features, log uploadTarget ); } -async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanningTarget) { +async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget = CodeScanning) { logger.startGroup(`Uploading ${uploadTarget.name} results`); logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); @@ -93250,7 +93250,7 @@ function handleProcessingResultForUnsuccessfulExecution(response, status, logger assertNever(status); } } -function validateUniqueCategory(sarif, sentinelPrefix = CodeScanningTarget.sentinelPrefix) { +function validateUniqueCategory(sarif, sentinelPrefix = CodeScanning.sentinelPrefix) { const categories = {}; for (const run2 of sarif.runs) { const id = run2?.automationDetails?.id; @@ -93359,13 +93359,13 @@ async function run() { category, features, logger, - CodeScanningTarget + CodeScanning ); core13.setOutput("sarif-id", uploadResult.sarifID); if (fs15.lstatSync(sarifPath).isDirectory()) { const qualitySarifFiles = findSarifFilesInDir( sarifPath, - CodeQualityTarget.sarifPredicate + CodeQuality.sarifPredicate ); if (qualitySarifFiles.length !== 0) { await uploadSpecifiedFiles( @@ -93374,7 +93374,7 @@ async function run() { fixCodeQualityCategory(logger, category), features, logger, - CodeQualityTarget + CodeQuality ); } } diff --git a/src/analyses.ts b/src/analyses.ts index 0d8e16445..71c50b824 100644 --- a/src/analyses.ts +++ b/src/analyses.ts @@ -48,25 +48,25 @@ export enum SARIF_UPLOAD_ENDPOINT { CODE_QUALITY = "PUT /repos/:owner/:repo/code-quality/analysis", } -// Represents configurations for different services that we can upload SARIF to. -export interface UploadTarget { +// Represents configurations for different analysis kinds. +export interface AnalysisConfig { name: string; target: SARIF_UPLOAD_ENDPOINT; sarifPredicate: (name: string) => boolean; sentinelPrefix: string; } -// Represents the Code Scanning upload target. -export const CodeScanningTarget: UploadTarget = { +// Represents the Code Scanning analysis configuration. +export const CodeScanning: AnalysisConfig = { name: "code scanning", target: SARIF_UPLOAD_ENDPOINT.CODE_SCANNING, sarifPredicate: (name) => - name.endsWith(".sarif") && !CodeQualityTarget.sarifPredicate(name), + name.endsWith(".sarif") && !CodeQuality.sarifPredicate(name), sentinelPrefix: "CODEQL_UPLOAD_SARIF_", }; -// Represents the Code Quality upload target. -export const CodeQualityTarget: UploadTarget = { +// Represents the Code Quality analysis configuration. +export const CodeQuality: AnalysisConfig = { name: "code quality", target: SARIF_UPLOAD_ENDPOINT.CODE_QUALITY, sarifPredicate: (name) => name.endsWith(".quality.sarif"), diff --git a/src/analyze-action.ts b/src/analyze-action.ts index 24da7e876..c949e3d4d 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -333,7 +333,7 @@ async function run() { actionsUtil.getOptionalInput("category"), features, logger, - analyses.CodeScanningTarget, + analyses.CodeScanning, ); core.setOutput("sarif-id", uploadResult.sarifID); @@ -347,7 +347,7 @@ async function run() { ), features, logger, - analyses.CodeQualityTarget, + analyses.CodeQuality, ); core.setOutput("quality-sarif-id", qualityUploadResult.sarifID); } diff --git a/src/init-action-post-helper.ts b/src/init-action-post-helper.ts index 16822aa49..0d21bd3b6 100644 --- a/src/init-action-post-helper.ts +++ b/src/init-action-post-helper.ts @@ -4,7 +4,7 @@ import * as core from "@actions/core"; import * as github from "@actions/github"; import * as actionsUtil from "./actions-util"; -import { CodeScanningTarget } from "./analyses"; +import { CodeScanning } from "./analyses"; import { getApiClient } from "./api-client"; import { CodeQL, getCodeQL } from "./codeql"; import { Config } from "./config-utils"; @@ -105,7 +105,7 @@ async function maybeUploadFailedSarif( category, features, logger, - CodeScanningTarget, + CodeScanning, ); await uploadLib.waitForProcessing( repositoryNwo, diff --git a/src/upload-lib.test.ts b/src/upload-lib.test.ts index 9848d9a71..3e463b944 100644 --- a/src/upload-lib.test.ts +++ b/src/upload-lib.test.ts @@ -3,7 +3,7 @@ import * as path from "path"; import test from "ava"; -import { CodeQualityTarget, CodeScanningTarget } from "./analyses"; +import { CodeQuality, CodeScanning } from "./analyses"; import { getRunnerLogger, Logger } from "./logging"; import { setupTests } from "./testing-utils"; import * as uploadLib from "./upload-lib"; @@ -129,7 +129,7 @@ test("finding SARIF files", async (t) => { const sarifFiles = uploadLib.findSarifFilesInDir( tmpDir, - CodeScanningTarget.sarifPredicate, + CodeScanning.sarifPredicate, ); t.deepEqual(sarifFiles, [ @@ -141,7 +141,7 @@ test("finding SARIF files", async (t) => { const qualitySarifFiles = uploadLib.findSarifFilesInDir( tmpDir, - CodeQualityTarget.sarifPredicate, + CodeQuality.sarifPredicate, ); t.deepEqual(qualitySarifFiles, [ @@ -336,7 +336,7 @@ test("validateUniqueCategory with different prefixes", (t) => { t.notThrows(() => uploadLib.validateUniqueCategory( createMockSarif(), - CodeQualityTarget.sentinelPrefix, + CodeQuality.sentinelPrefix, ), ); }); diff --git a/src/upload-lib.ts b/src/upload-lib.ts index d21797903..cd11b8e3f 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -621,7 +621,7 @@ export async function uploadFiles( category: string | undefined, features: FeatureEnablement, logger: Logger, - uploadTarget: analyses.UploadTarget, + uploadTarget: analyses.AnalysisConfig, ): Promise { const sarifPaths = getSarifFilePaths( inputSarifPath, @@ -647,7 +647,7 @@ export async function uploadSpecifiedFiles( category: string | undefined, features: FeatureEnablement, logger: Logger, - uploadTarget: analyses.UploadTarget = analyses.CodeScanningTarget, + uploadTarget: analyses.AnalysisConfig = analyses.CodeScanning, ): Promise { logger.startGroup(`Uploading ${uploadTarget.name} results`); logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); @@ -913,7 +913,7 @@ function handleProcessingResultForUnsuccessfulExecution( export function validateUniqueCategory( sarif: SarifFile, - sentinelPrefix: string = analyses.CodeScanningTarget.sentinelPrefix, + sentinelPrefix: string = analyses.CodeScanning.sentinelPrefix, ): void { // duplicate categories are allowed in the same sarif file // but not across multiple sarif files diff --git a/src/upload-sarif-action.ts b/src/upload-sarif-action.ts index e18d96b14..a193e242a 100644 --- a/src/upload-sarif-action.ts +++ b/src/upload-sarif-action.ts @@ -96,7 +96,7 @@ async function run() { category, features, logger, - analyses.CodeScanningTarget, + analyses.CodeScanning, ); core.setOutput("sarif-id", uploadResult.sarifID); @@ -106,7 +106,7 @@ async function run() { if (fs.lstatSync(sarifPath).isDirectory()) { const qualitySarifFiles = upload_lib.findSarifFilesInDir( sarifPath, - analyses.CodeQualityTarget.sarifPredicate, + analyses.CodeQuality.sarifPredicate, ); if (qualitySarifFiles.length !== 0) { @@ -116,7 +116,7 @@ async function run() { actionsUtil.fixCodeQualityCategory(logger, category), features, logger, - analyses.CodeQualityTarget, + analyses.CodeQuality, ); } }