Populate computedConfig in getDefaultConfig

Author: mbg

lib/init-action.js

@@ -157,17 +157,15 @@ test("load empty config", async (t) => {
       }),
     );
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { augmentationProperties, ...expectedConfig } =
-      await configUtils.getDefaultConfig(
-        createTestInitConfigInputs({
-          languagesInput: languages,
-          tempDir,
-          codeql,
-          logger,
-        }),
-        {},
-      );
+    const expectedConfig = await configUtils.getDefaultConfig(
+      createTestInitConfigInputs({
+        languagesInput: languages,
+        tempDir,
+        codeql,
+        logger,
+      }),
+      {},
+    );
 
     t.deepEqual(config, expectedConfig);
   });

src/config-utils.test.ts

@@ -533,7 +533,7 @@ export async function getDefaultConfig(
     logger,
   }: InitConfigInputs,
   userConfig: UserConfig,
-): Promise<Config & { augmentationProperties: AugmentationProperties }> {
+): Promise<Config> {
   const analysisKinds = await parseAnalysisKinds(analysisKindsInput);
 
   // For backwards compatibility, add Code Quality to the enabled analysis kinds
@@ -574,20 +574,26 @@ export async function getDefaultConfig(
     logger,
   );
 
+  // Compute the full Code Scanning configuration that combines the configuration from the
+  // configuration file / `config` input with other inputs, such as `queries`.
+  const computedConfig = generateCodeScanningConfig(
+    userConfig,
+    augmentationProperties,
+  );
+
   return {
     analysisKinds,
     languages,
     buildMode,
     originalUserInput: userConfig,
-    computedConfig: {},
+    computedConfig,
     tempDir,
     codeQLCmd: codeql.getPath(),
     gitHubVersion: githubVersion,
     dbLocation: dbLocationOrDefault(dbLocation, tempDir),
     debugMode,
     debugArtifactName,
     debugDatabaseName,
-    augmentationProperties,
     trapCaches,
     trapCacheDownloadTime,
     dependencyCachingEnabled: getCachingKind(dependencyCachingEnabled),
@@ -1101,17 +1107,7 @@ export async function initConfig(inputs: InitConfigInputs): Promise<Config> {
     );
   }
 
-  const { augmentationProperties, ...config } = await getDefaultConfig(
-    inputs,
-    userConfig,
-  );
-
-  // Compute the full Code Scanning configuration that combines the configuration from the
-  // configuration file / `config` input with other inputs, such as `queries`.
-  config.computedConfig = generateCodeScanningConfig(
-    userConfig,
-    augmentationProperties,
-  );
+  const config = await getDefaultConfig(inputs, userConfig);
 
   // The choice of overlay database mode depends on the selection of languages
   // and queries, which in turn depends on the user config and the augmentation