Respect extra options in a few codeql calls

github · Jan 21, 2022 · 14b4839 · 14b4839
1 parent d76304c
commit 14b4839
Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -805,7 +805,12 @@ async function getCodeQLForCmd(
       await toolrunnerErrorCatcher(cmd, args, errorMatchers);
     },
     async resolveLanguages() {
-      const codeqlArgs = ["resolve", "languages", "--format=json"];
+      const codeqlArgs = [
+        "resolve",
+        "languages",
+        "--format=json",
+        ...getExtraOptionsFromEnv(["resolve", "languages"]),
+      ];
       const output = await runTool(cmd, codeqlArgs);
 
       try {
@@ -956,6 +961,7 @@ async function getCodeQLForCmd(
         "cleanup",
         databasePath,
         `--mode=${cleanupLevel}`,
+        ...getExtraOptionsFromEnv(["database", "cleanup"]),
       ];
       await runTool(cmd, codeqlArgs);
     },
@@ -970,6 +976,7 @@ async function getCodeQLForCmd(
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
+        ...getExtraOptionsFromEnv(["database", "bundle"]),
       ];
       await new toolrunner.ToolRunner(cmd, args).exec();
     },