add CodeQL cmd to config

lib/codeql.js

@@ -28,11 +28,6 @@ const util = __importStar(require("./util"));
  * Can be overridden in tests using `setCodeQL`.
  */
 let cachedCodeQL = undefined;
-/**
- * Environment variable used to store the location of the CodeQL CLI executable.
- * Value is set by setupCodeQL and read by getCodeQL.
- */
-const CODEQL_ACTION_CMD = "CODEQL_ACTION_CMD";
 const CODEQL_BUNDLE_VERSION = defaults.bundleVersion;
 const CODEQL_BUNDLE_NAME = "codeql-bundle.tar.gz";
 const CODEQL_DEFAULT_ACTION_REPOSITORY = "github/codeql-action";
@@ -143,7 +138,6 @@ async function setupCodeQL() {
             throw new Error("Unsupported platform: " + process.platform);
         }
         cachedCodeQL = getCodeQLForCmd(codeqlCmd);
-        core.exportVariable(CODEQL_ACTION_CMD, codeqlCmd);
         return cachedCodeQL;
     }
     catch (e) {
@@ -169,16 +163,21 @@ function getCodeQLURLVersion(url) {
     return s;
 }
 exports.getCodeQLURLVersion = getCodeQLURLVersion;
-function getCodeQL() {
+/**
+ * Use the CodeQL executable located at the given path.
+ */
+function getCodeQL(cmd) {
     if (cachedCodeQL === undefined) {
-        const codeqlCmd = util.getRequiredEnvParam(CODEQL_ACTION_CMD);
-        cachedCodeQL = getCodeQLForCmd(codeqlCmd);
+        cachedCodeQL = getCodeQLForCmd(cmd);
     }
     return cachedCodeQL;
 }
 exports.getCodeQL = getCodeQL;
-function resolveFunction(partialCodeql, methodName) {
+function resolveFunction(partialCodeql, methodName, defaultImplementation) {
     if (typeof partialCodeql[methodName] !== 'function') {
+        if (defaultImplementation !== undefined) {
+            return defaultImplementation;
+        }
         const dummyMethod = () => {
             throw new Error('CodeQL ' + methodName + ' method not correctly defined');
         };
@@ -194,7 +193,7 @@ function resolveFunction(partialCodeql, methodName) {
  */
 function setCodeQL(partialCodeql) {
     cachedCodeQL = {
-        getDir: resolveFunction(partialCodeql, 'getDir'),
+        getPath: resolveFunction(partialCodeql, 'getPath', () => '/tmp/dummy-path'),
         printVersion: resolveFunction(partialCodeql, 'printVersion'),
         getTracerEnv: resolveFunction(partialCodeql, 'getTracerEnv'),
         databaseInit: resolveFunction(partialCodeql, 'databaseInit'),
@@ -204,12 +203,27 @@ function setCodeQL(partialCodeql) {
         resolveQueries: resolveFunction(partialCodeql, 'resolveQueries'),
         databaseAnalyze: resolveFunction(partialCodeql, 'databaseAnalyze')
     };
+    return cachedCodeQL;
 }
 exports.setCodeQL = setCodeQL;
+/**
+ * Get the cached CodeQL object. Should only be used from tests.
+ *
+ * TODO: Work out a good way for tests to get this from the test context
+ * instead of having to have this method.
+ */
+function getCachedCodeQL() {
+    if (cachedCodeQL === undefined) {
+        // Should never happen as setCodeQL is called by testing-utils.setupTests
+        throw new Error('cachedCodeQL undefined');
+    }
+    return cachedCodeQL;
+}
+exports.getCachedCodeQL = getCachedCodeQL;
 function getCodeQLForCmd(cmd) {
     return {
-        getDir: function () {
-            return path.dirname(cmd);
+        getPath: function () {
+            return cmd;
         },
         printVersion: async function () {
             await exec.exec(cmd, [