diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 1eabef4008..598310387c 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -120021,11 +120021,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 36cb0bec0c..4de550f5db 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -88661,11 +88661,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", @@ -93378,23 +93373,6 @@ function findSarifFilesInDir(sarifPath, isSarif) { walkSarifFiles(sarifPath); return sarifFiles; } -function getSarifFilePaths(sarifPath, isSarif) { - if (!fs15.existsSync(sarifPath)) { - throw new ConfigurationError(`Path does not exist: ${sarifPath}`); - } - let sarifFiles; - if (fs15.lstatSync(sarifPath).isDirectory()) { - sarifFiles = findSarifFilesInDir(sarifPath, isSarif); - if (sarifFiles.length === 0) { - throw new ConfigurationError( - `No SARIF files found to upload in "${sarifPath}".` - ); - } - } else { - sarifFiles = [sarifPath]; - } - return sarifFiles; -} async function getGroupedSarifFilePaths(logger, sarifPath) { const stats = fs15.statSync(sarifPath, { throwIfNoEntry: false }); if (stats === void 0) { @@ -93585,36 +93563,6 @@ async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProc logger.debug(`Not writing post-processed SARIF files.`); } } -async function uploadFiles(inputSarifPath, checkoutPath, category, features, logger, uploadTarget) { - const sarifPaths = getSarifFilePaths( - inputSarifPath, - uploadTarget.sarifPredicate - ); - return uploadSpecifiedFiles( - sarifPaths, - checkoutPath, - category, - features, - logger, - uploadTarget - ); -} -async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget) { - const processingResults = await postProcessSarifFiles( - logger, - features, - checkoutPath, - sarifPaths, - category, - uploadTarget - ); - return uploadPostProcessedFiles( - logger, - checkoutPath, - uploadTarget, - processingResults - ); -} async function uploadPostProcessedFiles(logger, checkoutPath, uploadTarget, postProcessingResults) { logger.startGroup(`Uploading ${uploadTarget.name} results`); const sarif = postProcessingResults.sarif; @@ -94070,42 +94018,15 @@ async function run() { if (runStats) { const checkoutPath = getRequiredInput("checkout_path"); const category = getOptionalInput("category"); - if (await features.getValue("analyze_use_new_upload" /* AnalyzeUseNewUpload */)) { - uploadResults = await postProcessAndUploadSarif( - logger, - features, - uploadKind, - checkoutPath, - outputDir, - category, - getOptionalInput("post-processed-sarif-path") - ); - } else if (uploadKind === "always") { - uploadResults = {}; - if (isCodeScanningEnabled(config)) { - uploadResults["code-scanning" /* CodeScanning */] = await uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - CodeScanning - ); - } - if (isCodeQualityEnabled(config)) { - uploadResults["code-quality" /* CodeQuality */] = await uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - CodeQuality - ); - } - } else { - uploadResults = {}; - logger.info("Not uploading results"); - } + uploadResults = await postProcessAndUploadSarif( + logger, + features, + uploadKind, + checkoutPath, + outputDir, + category, + getOptionalInput("post-processed-sarif-path") + ); if (uploadResults["code-scanning" /* CodeScanning */] !== void 0) { core14.setOutput( "sarif-id", diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 7ff1454b1f..dc7d0de522 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -83962,11 +83962,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/init-action-post.js b/lib/init-action-post.js index ead8de9cba..c1ee30d74a 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -123402,11 +123402,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/init-action.js b/lib/init-action.js index 3ddb3fba76..006379abdb 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -86075,11 +86075,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index c1ded4591e..f674fcabe5 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -83953,11 +83953,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 04e20a7fa4..3d7cb5668c 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -83865,11 +83865,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 0dab92927f..a880762bb9 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -119427,11 +119427,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 56da81a4f2..0139938267 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -100018,11 +100018,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/upload-lib.js b/lib/upload-lib.js index f58dce398b..1d866be1e6 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -87018,11 +87018,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 02220ff3cd..f7da24462e 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -119593,11 +119593,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 2f820b92ed..4c23978847 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -86815,11 +86815,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/package-lock.json b/package-lock.json index 7d80ec2a46..58da998e16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1799,7 +1799,6 @@ "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz", "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==", "license": "MIT", - "peer": true, "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.1.0", @@ -2569,7 +2568,6 @@ "integrity": "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.48.1", "@typescript-eslint/types": "8.48.1", @@ -3164,7 +3162,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3740,7 +3737,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", @@ -4594,7 +4590,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4649,7 +4644,6 @@ "version": "8.3.0", "dev": true, "license": "MIT", - "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -4921,7 +4915,6 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, - "peer": true, "dependencies": { "array-includes": "^3.1.7", "array.prototype.findlastindex": "^1.2.3", @@ -7357,7 +7350,6 @@ "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -8351,7 +8343,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -8560,7 +8551,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8634,7 +8624,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz", "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==", "dev": true, - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.17.0", "@typescript-eslint/types": "8.17.0", diff --git a/src/analyze-action.ts b/src/analyze-action.ts index f89eed7d1a..c6a3d7dc26 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -19,12 +19,7 @@ import { getApiDetails, getGitHubVersion } from "./api-client"; import { runAutobuild } from "./autobuild"; import { getTotalCacheSize, shouldStoreCache } from "./caching-utils"; import { getCodeQL } from "./codeql"; -import { - Config, - getConfig, - isCodeQualityEnabled, - isCodeScanningEnabled, -} from "./config-utils"; +import { Config, getConfig } from "./config-utils"; import { cleanupAndUploadDatabases } from "./database-upload"; import { DependencyCacheUploadStatusReport, @@ -32,7 +27,7 @@ import { } from "./dependency-caching"; import { getDiffInformedAnalysisBranches } from "./diff-informed-analysis-utils"; import { EnvVar } from "./environment"; -import { Feature, Features } from "./feature-flags"; +import { Features } from "./feature-flags"; import { KnownLanguage } from "./languages"; import { getActionsLogger, Logger } from "./logging"; import { cleanupAndUploadOverlayBaseDatabaseToCache } from "./overlay-database-utils"; @@ -358,46 +353,15 @@ async function run() { const checkoutPath = actionsUtil.getRequiredInput("checkout_path"); const category = actionsUtil.getOptionalInput("category"); - if (await features.getValue(Feature.AnalyzeUseNewUpload)) { - uploadResults = await postProcessAndUploadSarif( - logger, - features, - uploadKind, - checkoutPath, - outputDir, - category, - actionsUtil.getOptionalInput("post-processed-sarif-path"), - ); - } else if (uploadKind === "always") { - uploadResults = {}; - - if (isCodeScanningEnabled(config)) { - uploadResults[analyses.AnalysisKind.CodeScanning] = - await uploadLib.uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - analyses.CodeScanning, - ); - } - - if (isCodeQualityEnabled(config)) { - uploadResults[analyses.AnalysisKind.CodeQuality] = - await uploadLib.uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - analyses.CodeQuality, - ); - } - } else { - uploadResults = {}; - logger.info("Not uploading results"); - } + uploadResults = await postProcessAndUploadSarif( + logger, + features, + uploadKind, + checkoutPath, + outputDir, + category, + actionsUtil.getOptionalInput("post-processed-sarif-path"), + ); // Set the SARIF id outputs only if we have results for them, to avoid // having keys with empty values in the action output. diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 999ed20d7b..59f1c48696 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -44,7 +44,6 @@ export interface FeatureEnablement { */ export enum Feature { AllowToolcacheInput = "allow_toolcache_input", - AnalyzeUseNewUpload = "analyze_use_new_upload", CleanupTrapCaches = "cleanup_trap_caches", CppDependencyInstallation = "cpp_dependency_installation_enabled", CsharpCacheBuildModeNone = "csharp_cache_bmn", @@ -120,11 +119,6 @@ export const featureConfig: Record< envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: undefined, }, - [Feature.AnalyzeUseNewUpload]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: undefined, - }, [Feature.CleanupTrapCaches]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES",