Tidy up createdDBForScannedLanguages

Now the test is fixed, we can simplify by introducing an async call.

lib/analyze.js

@@ -70,12 +70,12 @@ async function setupPythonExtractor(logger) {
     logger.info(`Setting LGTM_PYTHON_SETUP_VERSION=${output}`);
     process.env["LGTM_PYTHON_SETUP_VERSION"] = output;
 }
-async function createdDBForScannedLanguages(codeql, config, isGoExtractionReconciliationEnabled, logger, featureFlags) {
+async function createdDBForScannedLanguages(codeql, config, logger, featureFlags) {
     // Insert the LGTM_INDEX_X env vars at this point so they are set when
     // we extract any scanned languages.
     analysisPaths.includeAndExcludeAnalysisPaths(config);
     for (const language of config.languages) {
-        if ((0, languages_1.isScannedLanguage)(language, isGoExtractionReconciliationEnabled, logger) &&
+        if ((0, languages_1.isScannedLanguage)(language, await util.isGoExtractionReconciliationEnabled(featureFlags), logger) &&
             !dbIsFinalized(config, language, logger)) {
             logger.startGroup(`Extracting ${language}`);
             if (language === languages_1.Language.python) {
@@ -102,7 +102,7 @@ exports.dbIsFinalized = dbIsFinalized;
 async function finalizeDatabaseCreation(config, threadsFlag, memoryFlag, logger, featureFlags) {
     const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
     const extractionStart = perf_hooks_1.performance.now();
-    await createdDBForScannedLanguages(codeql, config, await util.isGoExtractionReconciliationEnabled(featureFlags), logger, featureFlags);
+    await createdDBForScannedLanguages(codeql, config, logger, featureFlags);
     const extractionTime = perf_hooks_1.performance.now() - extractionStart;
     const trapImportStart = perf_hooks_1.performance.now();
     for (const language of config.languages) {

lib/analyze.test.js

@@ -423,8 +423,7 @@ for (const options of [
         });
         const codeqlObject = await (0, codeql_1.getCodeQLForTesting)("codeql/for-testing");
         sinon.stub(codeqlObject, "getVersion").resolves(options.version);
-        await (0, analyze_1.createdDBForScannedLanguages)(codeqlObject, stubConfig, false, // Disable Go extraction reconciliation
-        (0, logging_1.getRunnerLogger)(true), (0, feature_flags_1.createFeatureFlags)(options.featureFlags));
+        await (0, analyze_1.createdDBForScannedLanguages)(codeqlObject, stubConfig, (0, logging_1.getRunnerLogger)(true), (0, feature_flags_1.createFeatureFlags)(options.featureFlags));
         if (options.yesFlagSet)
             t.true(runnerConstructorStub.secondCall.args[1].includes("--internal-use-lua-tracing"), "--internal-use-lua-tracing should be present, but it is absent");
         else

src/analyze.test.ts

@@ -509,7 +509,6 @@ for (const options of [
     await createdDBForScannedLanguages(
       codeqlObject,
       stubConfig,
-      false, // Disable Go extraction reconciliation
       getRunnerLogger(true),
       createFeatureFlags(options.featureFlags)
     );

src/analyze.ts

@@ -121,7 +121,6 @@ async function setupPythonExtractor(logger: Logger) {
 export async function createdDBForScannedLanguages(
   codeql: CodeQL,
   config: configUtils.Config,
-  isGoExtractionReconciliationEnabled: boolean,
   logger: Logger,
   featureFlags: FeatureFlags
 ) {
@@ -133,7 +132,7 @@ export async function createdDBForScannedLanguages(
     if (
       isScannedLanguage(
         language,
-        isGoExtractionReconciliationEnabled,
+        await util.isGoExtractionReconciliationEnabled(featureFlags),
         logger
       ) &&
       !dbIsFinalized(config, language, logger)
@@ -179,13 +178,7 @@ async function finalizeDatabaseCreation(
   const codeql = await getCodeQL(config.codeQLCmd);
 
   const extractionStart = performance.now();
-  await createdDBForScannedLanguages(
-    codeql,
-    config,
-    await util.isGoExtractionReconciliationEnabled(featureFlags),
-    logger,
-    featureFlags
-  );
+  await createdDBForScannedLanguages(codeql, config, logger, featureFlags);
   const extractionTime = performance.now() - extractionStart;
 
   const trapImportStart = performance.now();