From f4fca705906ad1da7ffa833c67db6c7b840b8abc Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 2 Sep 2025 12:27:58 +0100 Subject: [PATCH] Do not mutate `originalUserInput` --- lib/init-action.js | 3 --- src/config-utils.test.ts | 14 ++++++-------- src/config-utils.ts | 5 ----- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/lib/init-action.js b/lib/init-action.js index 80acb0820..381d2061e 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -87617,9 +87617,6 @@ async function initConfig(inputs) { ); } const queries = codeQualityQueries.map((v) => ({ uses: v })); - config.originalUserInput["disable-default-queries"] = true; - config.originalUserInput.queries = queries; - config.originalUserInput["query-filters"] = []; config.computedConfig["disable-default-queries"] = true; config.computedConfig.queries = queries; config.computedConfig["query-filters"] = []; diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts index d42a5e209..9526a4b8a 100644 --- a/src/config-utils.test.ts +++ b/src/config-utils.test.ts @@ -197,20 +197,18 @@ test("load code quality config", async (t) => { }), ); - const userConfig: configUtils.UserConfig = { - "disable-default-queries": true, - queries: [{ uses: "code-quality" }], - "query-filters": [], - }; - // And the config we expect it to result in const expectedConfig: configUtils.Config = { analysisKinds: [AnalysisKind.CodeQuality], languages: [KnownLanguage.actions], buildMode: undefined, + originalUserInput: {}, // This gets set because we only have `AnalysisKind.CodeQuality` - originalUserInput: userConfig, - computedConfig: userConfig, + computedConfig: { + "disable-default-queries": true, + queries: [{ uses: "code-quality" }], + "query-filters": [], + }, tempDir, codeQLCmd: codeql.getPath(), gitHubVersion: githubVersion, diff --git a/src/config-utils.ts b/src/config-utils.ts index a66e63e13..1041ad514 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -1145,11 +1145,6 @@ export async function initConfig(inputs: InitConfigInputs): Promise { const queries = codeQualityQueries.map((v) => ({ uses: v })); // Set the query customisation options for Code Quality only analysis. - config.originalUserInput["disable-default-queries"] = true; - config.originalUserInput.queries = queries; - config.originalUserInput["query-filters"] = []; - - // Update the computed configuration for the call to `getOverlayDatabaseMode`. config.computedConfig["disable-default-queries"] = true; config.computedConfig.queries = queries; config.computedConfig["query-filters"] = [];