From e2e36b17af26b28a84aead49736fd39e82697984 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 22 Sep 2025 13:59:40 +0200 Subject: [PATCH] Add helper function for reserved tools values --- lib/analyze-action.js | 5 ++++- lib/init-action-post.js | 5 ++++- lib/init-action.js | 5 ++++- lib/upload-lib.js | 5 ++++- lib/upload-sarif-action.js | 5 ++++- src/setup-codeql.ts | 8 ++++++-- 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 4a11b910f..5534b277f 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -92197,7 +92197,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { return void 0; } async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, tarSupportsZstd, logger) { - if (toolsInput && !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) && !CODEQL_NIGHTLY_TOOLS_INPUTS.includes(toolsInput) && !toolsInput.startsWith("http")) { + if (toolsInput && !isReservedToolsValue(toolsInput) && !toolsInput.startsWith("http")) { logger.info(`Using CodeQL CLI from local path ${toolsInput}`); const compressionMethod2 = inferCompressionMethod(toolsInput); if (compressionMethod2 === void 0) { @@ -92540,6 +92540,9 @@ async function getNightlyToolsUrl(logger) { ); } } +function isReservedToolsValue(tools) { + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); +} // src/tracer-config.ts var fs13 = __toESM(require("fs")); diff --git a/lib/init-action-post.js b/lib/init-action-post.js index ccb4b8bec..cbb595720 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -130140,7 +130140,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { return void 0; } async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, tarSupportsZstd, logger) { - if (toolsInput && !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) && !CODEQL_NIGHTLY_TOOLS_INPUTS.includes(toolsInput) && !toolsInput.startsWith("http")) { + if (toolsInput && !isReservedToolsValue(toolsInput) && !toolsInput.startsWith("http")) { logger.info(`Using CodeQL CLI from local path ${toolsInput}`); const compressionMethod2 = inferCompressionMethod(toolsInput); if (compressionMethod2 === void 0) { @@ -130483,6 +130483,9 @@ async function getNightlyToolsUrl(logger) { ); } } +function isReservedToolsValue(tools) { + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); +} // src/tracer-config.ts async function shouldEnableIndirectTracing(codeql, config) { diff --git a/lib/init-action.js b/lib/init-action.js index a5e8991d7..c6deda221 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -88814,7 +88814,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { return void 0; } async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, tarSupportsZstd, logger) { - if (toolsInput && !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) && !CODEQL_NIGHTLY_TOOLS_INPUTS.includes(toolsInput) && !toolsInput.startsWith("http")) { + if (toolsInput && !isReservedToolsValue(toolsInput) && !toolsInput.startsWith("http")) { logger.info(`Using CodeQL CLI from local path ${toolsInput}`); const compressionMethod2 = inferCompressionMethod(toolsInput); if (compressionMethod2 === void 0) { @@ -89157,6 +89157,9 @@ async function getNightlyToolsUrl(logger) { ); } } +function isReservedToolsValue(tools) { + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); +} // src/tracer-config.ts var fs13 = __toESM(require("fs")); diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 3d3baed6f..365acbae8 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -89968,7 +89968,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { return void 0; } async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, tarSupportsZstd, logger) { - if (toolsInput && !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) && !CODEQL_NIGHTLY_TOOLS_INPUTS.includes(toolsInput) && !toolsInput.startsWith("http")) { + if (toolsInput && !isReservedToolsValue(toolsInput) && !toolsInput.startsWith("http")) { logger.info(`Using CodeQL CLI from local path ${toolsInput}`); const compressionMethod2 = inferCompressionMethod(toolsInput); if (compressionMethod2 === void 0) { @@ -90311,6 +90311,9 @@ async function getNightlyToolsUrl(logger) { ); } } +function isReservedToolsValue(tools) { + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); +} // src/tracer-config.ts async function shouldEnableIndirectTracing(codeql, config) { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 5c266dcce..b9079725b 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -90669,7 +90669,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { return void 0; } async function getCodeQLSource(toolsInput, defaultCliVersion, apiDetails, variant, tarSupportsZstd, logger) { - if (toolsInput && !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) && !CODEQL_NIGHTLY_TOOLS_INPUTS.includes(toolsInput) && !toolsInput.startsWith("http")) { + if (toolsInput && !isReservedToolsValue(toolsInput) && !toolsInput.startsWith("http")) { logger.info(`Using CodeQL CLI from local path ${toolsInput}`); const compressionMethod2 = inferCompressionMethod(toolsInput); if (compressionMethod2 === void 0) { @@ -91012,6 +91012,9 @@ async function getNightlyToolsUrl(logger) { ); } } +function isReservedToolsValue(tools) { + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); +} // src/tracer-config.ts async function shouldEnableIndirectTracing(codeql, config) { diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts index a9b76ac4d..59556208b 100644 --- a/src/setup-codeql.ts +++ b/src/setup-codeql.ts @@ -279,8 +279,7 @@ export async function getCodeQLSource( ): Promise { if ( toolsInput && - !CODEQL_BUNDLE_VERSION_ALIAS.includes(toolsInput) && - !CODEQL_NIGHTLY_TOOLS_INPUTS.includes(toolsInput) && + !isReservedToolsValue(toolsInput) && !toolsInput.startsWith("http") ) { logger.info(`Using CodeQL CLI from local path ${toolsInput}`); @@ -821,3 +820,8 @@ async function getNightlyToolsUrl(logger: Logger) { ); } } + +function isReservedToolsValue(tools: string): boolean { + return CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) || + CODEQL_NIGHTLY_TOOLS_INPUTS.includes(tools); +}