Tidy up createdDBForScannedLanguages

Now the test is fixed, we can simplify by introducing an async call.
github · Sep 1, 2022 · e460fa2 · e460fa2
1 parent 6d34731
commit e460fa2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 17 deletions.
diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/analyze.test.js b/lib/analyze.test.js
diff --git a/lib/analyze.test.js.map b/lib/analyze.test.js.map
diff --git a/src/analyze.test.ts b/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)
     );

diff --git a/src/analyze.ts b/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();