fix parsing of disable-default-queries field

github · Jul 21, 2020 · ee63f4e · ee63f4e
1 parent 5b4f4e4
commit ee63f4e
Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/lib/config-utils.js b/lib/config-utils.js
diff --git a/lib/config-utils.js.map b/lib/config-utils.js.map
diff --git a/lib/config-utils.test.js b/lib/config-utils.test.js
diff --git a/lib/config-utils.test.js.map b/lib/config-utils.test.js.map
diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts
@@ -334,6 +334,16 @@ function doInvalidInputTest(
       process.env['RUNNER_TEMP'] = tmpDir;
       process.env['GITHUB_WORKSPACE'] = tmpDir;
 
+      CodeQL.setCodeQL({
+        resolveQueries: async function() {
+          return {
+            byLanguage: {},
+            noDeclaredLanguage: {},
+            multipleDeclaredLanguages: {},
+          };
+        },
+      });
+
       const inputFile = path.join(tmpDir, 'input');
       fs.writeFileSync(inputFile, inputFileContents, 'utf8');
       setInput('config-file', 'input');

diff --git a/src/config-utils.ts b/src/config-utils.ts
@@ -502,13 +502,15 @@ async function loadConfig(configFile: string): Promise<Config> {
   const pathsIgnore: string[] = [];
   const paths: string[] = [];
 
+  let disableDefaultQueries = false;
   if (DISABLE_DEFAULT_QUERIES_PROPERTY in parsedYAML) {
     if (typeof parsedYAML[DISABLE_DEFAULT_QUERIES_PROPERTY] !== "boolean") {
       throw new Error(getDisableDefaultQueriesInvalid(configFile));
     }
-    if (!parsedYAML[DISABLE_DEFAULT_QUERIES_PROPERTY]) {
-      await addDefaultQueries(languages, queries);
-    }
+    disableDefaultQueries = parsedYAML[DISABLE_DEFAULT_QUERIES_PROPERTY];
+  }
+  if (!disableDefaultQueries) {
+    await addDefaultQueries(languages, queries);
   }
 
   if (QUERIES_PROPERTY in parsedYAML) {