From 7c7926f8dff05e2651a2b37a92d9952b859e4dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= Date: Mon, 25 May 2026 16:33:01 +0200 Subject: [PATCH] Fixed tests due to stale language.ts obscuring language/index.ts import when done at module level --- lib/entry-points.js | 4 ++-- src/analyze-action.ts | 2 +- src/analyze.test.ts | 2 +- src/analyze.ts | 2 +- src/autobuild-action.ts | 2 +- src/autobuild.ts | 2 +- src/codeql.test.ts | 2 +- src/codeql.ts | 2 +- src/config-utils.test.ts | 2 +- src/config-utils.ts | 2 +- src/database-upload.test.ts | 2 +- src/debug-artifacts.ts | 2 +- src/dependency-caching.test.ts | 2 +- src/dependency-caching.ts | 2 +- src/diagnostics.ts | 2 +- src/init-action.ts | 4 ++-- src/init.test.ts | 2 +- src/init.ts | 2 +- src/setup-codeql-action.ts | 2 +- src/start-proxy-action.ts | 2 +- src/start-proxy.test.ts | 2 +- src/start-proxy.ts | 2 +- src/status-report.test.ts | 4 ++-- src/status-report.ts | 2 +- src/tracer-config.test.ts | 2 +- src/trap-caching.test.ts | 2 +- src/trap-caching.ts | 2 +- src/util.ts | 2 +- 28 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/entry-points.js b/lib/entry-points.js index 4894c912d..cdd24d262 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -159039,7 +159039,7 @@ async function sendCompletedStatusReport2(startedAt, config, configFile, toolsDo const initStatusReport = { ...statusReportBase, tools_input: getOptionalInput("tools") || "", - computed_tools_input: effectiveToolsInput || "", + effective_tools_input: effectiveToolsInput || "", tools_resolved_version: toolsVersion, tools_source: toolsSource || "UNKNOWN" /* Unknown */, workflow_languages: workflowLanguages || "" @@ -160085,7 +160085,7 @@ async function sendCompletedStatusReport3(startedAt, toolsDownloadStatusReport, const initStatusReport = { ...statusReportBase, tools_input: getOptionalInput("tools") || "", - computed_tools_input: effectiveToolsInput || "", + effective_tools_input: effectiveToolsInput || "", tools_resolved_version: toolsVersion, tools_source: toolsSource || "UNKNOWN" /* Unknown */, workflow_languages: "" diff --git a/src/analyze-action.ts b/src/analyze-action.ts index cc2777bc5..4b22f2dc5 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -30,7 +30,7 @@ import { } from "./dependency-caching"; import { EnvVar } from "./environment"; import { initFeatures } from "./feature-flags"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { getActionsLogger, Logger } from "./logging"; import { cleanupAndUploadOverlayBaseDatabaseToCache } from "./overlay/caching"; import { getRepositoryNwo } from "./repository"; diff --git a/src/analyze.test.ts b/src/analyze.test.ts index 7523d239b..e94ea80b5 100644 --- a/src/analyze.test.ts +++ b/src/analyze.test.ts @@ -14,7 +14,7 @@ import { } from "./analyze"; import { createStubCodeQL } from "./codeql"; import { Feature } from "./feature-flags"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { getRunnerLogger } from "./logging"; import { setupTests, diff --git a/src/analyze.ts b/src/analyze.ts index 63830445d..0d854cda9 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -21,7 +21,7 @@ import { } from "./diff-informed-analysis-utils"; import { EnvVar } from "./environment"; import { FeatureEnablement, Feature } from "./feature-flags"; -import { BuiltInLanguage, Language } from "./languages"; +import { BuiltInLanguage, Language } from "./languages/index"; import { Logger, withGroupAsync } from "./logging"; import { OverlayDatabaseMode } from "./overlay/overlay-database-mode"; import type * as sarif from "./sarif"; diff --git a/src/autobuild-action.ts b/src/autobuild-action.ts index dc2021137..21244340e 100644 --- a/src/autobuild-action.ts +++ b/src/autobuild-action.ts @@ -10,7 +10,7 @@ import { determineAutobuildLanguages, runAutobuild } from "./autobuild"; import { getCodeQL } from "./codeql"; import { Config, getConfig } from "./config-utils"; import { EnvVar } from "./environment"; -import { Language } from "./languages"; +import { Language } from "./languages/index"; import { Logger, getActionsLogger } from "./logging"; import { StatusReportBase, diff --git a/src/autobuild.ts b/src/autobuild.ts index fc4983f4e..fdf4ef90a 100644 --- a/src/autobuild.ts +++ b/src/autobuild.ts @@ -7,7 +7,7 @@ import * as configUtils from "./config-utils"; import { DocUrl } from "./doc-url"; import { EnvVar } from "./environment"; import { Feature, featureConfig, initFeatures } from "./feature-flags"; -import { BuiltInLanguage, Language } from "./languages"; +import { BuiltInLanguage, Language } from "./languages/index"; import { Logger } from "./logging"; import { getRepositoryNwo } from "./repository"; import { asyncFilter, BuildMode } from "./util"; diff --git a/src/codeql.test.ts b/src/codeql.test.ts index dea4cf04a..dd9faae92 100644 --- a/src/codeql.test.ts +++ b/src/codeql.test.ts @@ -21,7 +21,7 @@ import { import type { Config } from "./config-utils"; import * as defaults from "./defaults.json"; import { DocUrl } from "./doc-url"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { getRunnerLogger } from "./logging"; import { ToolsSource } from "./setup-codeql"; import { diff --git a/src/codeql.ts b/src/codeql.ts index 19f933c39..80e1f1df5 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -22,7 +22,7 @@ import { FeatureEnablement, } from "./feature-flags"; import { isAnalyzingDefaultBranch } from "./git-utils"; -import { Language } from "./languages"; +import { Language } from "./languages/index"; import { Logger } from "./logging"; import { writeBaseDatabaseOidsFile, writeOverlayChangesFile } from "./overlay"; import { OverlayDatabaseMode } from "./overlay/overlay-database-mode"; diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts index 10dee5539..79f7b0633 100644 --- a/src/config-utils.test.ts +++ b/src/config-utils.test.ts @@ -18,7 +18,7 @@ import { Feature } from "./feature-flags"; import { RepositoryProperties } from "./feature-flags/properties"; import * as gitUtils from "./git-utils"; import { GitVersionInfo } from "./git-utils"; -import { BuiltInLanguage, Language } from "./languages"; +import { BuiltInLanguage, Language } from "./languages/index"; import { getRunnerLogger } from "./logging"; import { CODEQL_OVERLAY_MINIMUM_VERSION } from "./overlay"; import * as overlayDiagnostics from "./overlay/diagnostics"; diff --git a/src/config-utils.ts b/src/config-utils.ts index 87329fce2..b6e5e8ef3 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -48,7 +48,7 @@ import { hasSubmodules, isAnalyzingDefaultBranch, } from "./git-utils"; -import { BuiltInLanguage, Language } from "./languages"; +import { BuiltInLanguage, Language } from "./languages/index"; import { Logger } from "./logging"; import { CODEQL_OVERLAY_MINIMUM_VERSION } from "./overlay"; import { diff --git a/src/database-upload.test.ts b/src/database-upload.test.ts index 1cfbaecad..45be8b5d2 100644 --- a/src/database-upload.test.ts +++ b/src/database-upload.test.ts @@ -12,7 +12,7 @@ import { createStubCodeQL } from "./codeql"; import { Config } from "./config-utils"; import { cleanupAndUploadDatabases } from "./database-upload"; import * as gitUtils from "./git-utils"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { RepositoryNwo } from "./repository"; import { checkExpectedLogMessages, diff --git a/src/debug-artifacts.ts b/src/debug-artifacts.ts index 016fcdf7c..2f9772154 100644 --- a/src/debug-artifacts.ts +++ b/src/debug-artifacts.ts @@ -13,7 +13,7 @@ import { type CodeQL } from "./codeql"; import { Config } from "./config-utils"; import { EnvVar } from "./environment"; import * as json from "./json"; -import { Language } from "./languages"; +import { Language } from "./languages/index"; import { Logger, withGroup } from "./logging"; import { isSafeArtifactUpload, diff --git a/src/dependency-caching.test.ts b/src/dependency-caching.test.ts index e611cd03e..944f12c3c 100644 --- a/src/dependency-caching.test.ts +++ b/src/dependency-caching.test.ts @@ -27,7 +27,7 @@ import { CacheStoreResult, } from "./dependency-caching"; import { Feature } from "./feature-flags"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { setupTests, createFeatures, diff --git a/src/dependency-caching.ts b/src/dependency-caching.ts index f04d38f46..fa8ff7b13 100644 --- a/src/dependency-caching.ts +++ b/src/dependency-caching.ts @@ -11,7 +11,7 @@ import { CodeQL } from "./codeql"; import { Config } from "./config-utils"; import { EnvVar } from "./environment"; import { Feature, FeatureEnablement } from "./feature-flags"; -import { BuiltInLanguage, Language } from "./languages"; +import { BuiltInLanguage, Language } from "./languages/index"; import { Logger } from "./logging"; import { getErrorMessage, getRequiredEnvParam } from "./util"; diff --git a/src/diagnostics.ts b/src/diagnostics.ts index 65e82ce1a..5bad57229 100644 --- a/src/diagnostics.ts +++ b/src/diagnostics.ts @@ -2,7 +2,7 @@ import { existsSync, mkdirSync, writeFileSync } from "fs"; import path from "path"; import type { Config } from "./config-utils"; -import { Language } from "./languages"; +import { Language } from "./languages/index"; import { getActionsLogger } from "./logging"; import { getCodeQLDatabasePath } from "./util"; diff --git a/src/init-action.ts b/src/init-action.ts index af4a42219..1d0e6c3c1 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -49,7 +49,7 @@ import { initConfig, runDatabaseInitCluster, } from "./init"; -import { JavaEnvVars, BuiltInLanguage } from "./languages"; +import { JavaEnvVars, BuiltInLanguage } from "./languages/index"; import { getActionsLogger, Logger, withGroupAsync } from "./logging"; import { downloadOverlayBaseDatabaseFromCache, @@ -160,7 +160,7 @@ async function sendCompletedStatusReport( const initStatusReport: InitStatusReport = { ...statusReportBase, tools_input: getOptionalInput("tools") || "", - computed_tools_input: effectiveToolsInput || "", + effective_tools_input: effectiveToolsInput || "", tools_resolved_version: toolsVersion, tools_source: toolsSource || ToolsSource.Unknown, workflow_languages: workflowLanguages || "", diff --git a/src/init.test.ts b/src/init.test.ts index 88ad0c9b1..e92424fd7 100644 --- a/src/init.test.ts +++ b/src/init.test.ts @@ -15,7 +15,7 @@ import { getFileCoverageInformationEnabled, logFileCoverageOnPrsDeprecationWarning, } from "./init"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { createFeatures, LoggedMessage, diff --git a/src/init.ts b/src/init.ts index 2533d9a89..e88f82524 100644 --- a/src/init.ts +++ b/src/init.ts @@ -26,7 +26,7 @@ import { RepositoryProperties, RepositoryPropertyName, } from "./feature-flags/properties"; -import { BuiltInLanguage, Language } from "./languages"; +import { BuiltInLanguage, Language } from "./languages/index"; import { Logger, withGroupAsync } from "./logging"; import { ToolsSource } from "./setup-codeql"; import { ZstdAvailability } from "./tar"; diff --git a/src/setup-codeql-action.ts b/src/setup-codeql-action.ts index 9c8627c74..f0a5c821c 100644 --- a/src/setup-codeql-action.ts +++ b/src/setup-codeql-action.ts @@ -72,7 +72,7 @@ async function sendCompletedStatusReport( const initStatusReport: InitStatusReport = { ...statusReportBase, tools_input: getOptionalInput("tools") || "", - computed_tools_input: effectiveToolsInput || "", + effective_tools_input: effectiveToolsInput || "", tools_resolved_version: toolsVersion, tools_source: toolsSource || ToolsSource.Unknown, workflow_languages: "", diff --git a/src/start-proxy-action.ts b/src/start-proxy-action.ts index 609b57644..e3750af8a 100644 --- a/src/start-proxy-action.ts +++ b/src/start-proxy-action.ts @@ -6,7 +6,7 @@ import * as core from "@actions/core"; import * as actionsUtil from "./actions-util"; import { getGitHubVersion } from "./api-client"; import { Feature, FeatureEnablement, initFeatures } from "./feature-flags"; -import { BuiltInLanguage, parseBuiltInLanguage } from "./languages"; +import { BuiltInLanguage, parseBuiltInLanguage } from "./languages/index"; import { getActionsLogger, Logger } from "./logging"; import { getRepositoryNwo } from "./repository"; import { diff --git a/src/start-proxy.test.ts b/src/start-proxy.test.ts index 9f12656f6..57822923f 100644 --- a/src/start-proxy.test.ts +++ b/src/start-proxy.test.ts @@ -10,7 +10,7 @@ import * as defaults from "./defaults.json"; import { setUpFeatureFlagTests } from "./feature-flags/testing-util"; import { UnvalidatedObject, validateSchema } from "./json"; import { makeFromSchema } from "./json/testing-util"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { getRunnerLogger, Logger } from "./logging"; import * as startProxyExports from "./start-proxy"; import * as statusReport from "./status-report"; diff --git a/src/start-proxy.ts b/src/start-proxy.ts index d6111510f..3a123a7bb 100644 --- a/src/start-proxy.ts +++ b/src/start-proxy.ts @@ -18,7 +18,7 @@ import { FeatureEnablement, } from "./feature-flags"; import * as json from "./json"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { Logger } from "./logging"; import { Address, diff --git a/src/status-report.test.ts b/src/status-report.test.ts index cc575159d..c08dfd8b1 100644 --- a/src/status-report.test.ts +++ b/src/status-report.test.ts @@ -4,7 +4,7 @@ import * as sinon from "sinon"; import * as actionsUtil from "./actions-util"; import { Config } from "./config-utils"; import { EnvVar } from "./environment"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { getRunnerLogger } from "./logging"; import { ToolsSource } from "./setup-codeql"; import { @@ -316,7 +316,7 @@ const testCreateInitWithConfigStatusReport = makeMacro({ const initStatusReport: InitStatusReport = { ...statusReportBase, tools_input: "", - computed_tools_input: "", + effective_tools_input: "", tools_resolved_version: "foo", tools_source: ToolsSource.Unknown, workflow_languages: "actions", diff --git a/src/status-report.ts b/src/status-report.ts index 21889926f..15c1a0ee4 100644 --- a/src/status-report.ts +++ b/src/status-report.ts @@ -483,7 +483,7 @@ export interface InitStatusReport extends StatusReportBase { /** Value given by the user as the "tools" input. */ tools_input: string; /** The effective tools input that was used, after applying defaults and repository properties. */ - computed_tools_input: string; + effective_tools_input: string; /** Version of the bundle used. */ tools_resolved_version: string; /** Where the bundle originated from. */ diff --git a/src/tracer-config.test.ts b/src/tracer-config.test.ts index 58f844b8e..b28749cfb 100644 --- a/src/tracer-config.test.ts +++ b/src/tracer-config.test.ts @@ -6,7 +6,7 @@ import * as sinon from "sinon"; import { CodeQL, getCodeQLForTesting } from "./codeql"; import * as configUtils from "./config-utils"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { createTestConfig, makeVersionInfo, setupTests } from "./testing-utils"; import { ToolsFeature } from "./tools-features"; import { getCombinedTracerConfig } from "./tracer-config"; diff --git a/src/trap-caching.test.ts b/src/trap-caching.test.ts index 980547579..bc819721e 100644 --- a/src/trap-caching.test.ts +++ b/src/trap-caching.test.ts @@ -15,7 +15,7 @@ import { import * as configUtils from "./config-utils"; import { Feature } from "./feature-flags"; import * as gitUtils from "./git-utils"; -import { BuiltInLanguage } from "./languages"; +import { BuiltInLanguage } from "./languages/index"; import { getRunnerLogger } from "./logging"; import { createFeatures, diff --git a/src/trap-caching.ts b/src/trap-caching.ts index 216122d47..c105f201d 100644 --- a/src/trap-caching.ts +++ b/src/trap-caching.ts @@ -10,7 +10,7 @@ import { type Config } from "./config-utils"; import { DocUrl } from "./doc-url"; import { Feature, FeatureEnablement } from "./feature-flags"; import * as gitUtils from "./git-utils"; -import { Language } from "./languages"; +import { Language } from "./languages/index"; import { Logger } from "./logging"; import { asHTTPError, diff --git a/src/util.ts b/src/util.ts index e2331461b..2e053457d 100644 --- a/src/util.ts +++ b/src/util.ts @@ -15,7 +15,7 @@ import type { Pack } from "./config/db-config"; import type { Config } from "./config-utils"; import { EnvVar } from "./environment"; import * as json from "./json"; -import { Language } from "./languages"; +import { Language } from "./languages/index"; import { Logger } from "./logging"; /**