add log statements to check rate limits

Merge pull request #153 from github/add_env_to_config
Add tempDir and codeQLCmd fields to the config
2026-10-16 07:41:25 +00:00 · 2020-08-24 13:29:29 +01:00 · 2020-08-21 11:00:48 +01:00 · 2020-08-21 10:32:58 +01:00 · 2020-08-21 10:31:20 +01:00 · 2020-08-21 10:07:22 +01:00
50 changed files with 870 additions and 595 deletions
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,6 +1,6 @@
 name: "CodeQL action"

-on: [pull_request]
+on: [push, pull_request]

 jobs:
  build:
--- a/.github/workflows/integration-testing.yml
+++ b/.github/workflows/integration-testing.yml
@@ -3,192 +3,150 @@ name: "Integration Testing"
 on: [push, pull_request]

 jobs:
-  # multi-language-repo_test-autodetect-languages:
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Move codeql-action
-  #     shell: bash
-  #     run: |
-  #       mkdir ../action
-  #       mv * .github ../action/
-  #       mv ../action/tests/multi-language-repo/{*,.github} .
-  #   - uses: ./../action/init
-  #   - name: Build code
-  #     shell: bash
-  #     run: ./build.sh
-  #   - uses: ./../action/analyze
-  #     env:
-  #       TEST_MODE: true
-  #   - run: |
-  #       cd "$RUNNER_TEMP/codeql_databases"
-  #       # List all directories as there will be precisely one directory per database
-  #       # but there may be other files in this directory such as query suites.
-  #       if [ "$(ls -d */ | wc -l)" != 6 ] || \
-  #          [[ ! -d cpp ]] || \
-  #          [[ ! -d csharp ]] || \
-  #          [[ ! -d go ]] || \
-  #          [[ ! -d java ]] || \
-  #          [[ ! -d javascript ]] || \
-  #          [[ ! -d python ]]; then
-  #         echo "Did not find expected number of databases. Database dir contains: $(ls)"
-  #         exit 1
-  #       fi
-
-  # multi-language-repo_test-custom-queries-and-remote-config:
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       os: [ubuntu-latest, windows-latest, macos-latest]
-  #   runs-on: ${{ matrix.os }}
-
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Move codeql-action
-  #     shell: bash
-  #     run: |
-  #       mkdir ../action
-  #       mv * .github ../action/
-  #       mv ../action/tests/multi-language-repo/{*,.github} .
-  #   - uses: ./../action/init
-  #     with:
-  #       languages: cpp,csharp,java,javascript,python
-  #       config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }}
-  #   - name: Build code
-  #     shell: bash
-  #     run: ./build.sh
-  #   - uses: ./../action/analyze
-  #     env:
-  #       TEST_MODE: true
-
-  # # Currently is not possible to analyze Go in conjunction with other languages in macos
-  # multi-language-repo_test-go-custom-queries:
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       os: [ubuntu-latest, windows-latest, macos-latest]
-  #   runs-on: ${{ matrix.os }}
-
-  #   steps:
-  #   - uses: actions/setup-go@v2
-  #     if: ${{ matrix.os ==  'macos-latest' }}
-  #     with:
-  #       go-version: '^1.13.1'
-  #   - uses: actions/checkout@v2
-  #   - name: Move codeql-action
-  #     shell: bash
-  #     run: |
-  #       mkdir ../action
-  #       mv * .github ../action/
-  #       mv ../action/tests/multi-language-repo/{*,.github} .
-  #   - uses: ./../action/init
-  #     with:
-  #       languages: go
-  #       config-file: ./.github/codeql/custom-queries.yml
-  #   - name: Build code
-  #     shell: bash
-  #     run: ./build.sh
-  #   - uses: ./../action/analyze
-  #     env:
-  #       TEST_MODE: true
-
-  # multi-language-repo_rubocop:
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Move codeql-action
-  #     shell: bash
-  #     run: |
-  #       mkdir ../action
-  #       mv * .github ../action/
-  #       mv ../action/tests/multi-language-repo/{*,.github} .
-  #   - name: Set up Ruby
-  #     uses: ruby/setup-ruby@v1
-  #     with:
-  #       ruby-version: 2.6
-  #   - name: Install Code Scanning integration
-  #     run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
-  #   - name: Install dependencies
-  #     run: bundle install
-  #   - name: Rubocop run
-  #     run: |
-  #       bash -c "
-  #         bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
-  #         [[ $? -ne 2 ]]
-  #       "
-  #   - uses: ./../action/upload-sarif
-  #     with:
-  #       sarif_file: rubocop.sarif
-  #     env:
-  #       TEST_MODE: true
-
-  # test-proxy:
-  #   runs-on: ubuntu-latest
-  #   container:
-  #     image: ubuntu:18.04
-  #     options: --dns 127.0.0.1
-  #   services:
-  #     squid-proxy:
-  #       image: datadog/squid:latest
-  #       ports:
-  #         - 3128:3128
-  #   env:
-  #     https_proxy: http://squid-proxy:3128
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Move codeql-action
-  #     shell: bash
-  #     run: |
-  #       mkdir ../action
-  #       mv * .github ../action/
-  #       mv ../action/tests/multi-language-repo/{*,.github} .
-  #   - uses: ./../action/init
-  #     with:
-  #       languages: javascript
-  #   - uses: ./../action/analyze
-  #     env:
-  #       TEST_MODE: true
-
-  # Test the behaviour when asked to scan a compiled language but no code is compiled
-  # java:
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Move codeql-action
-  #       shell: bash
-  #       run: |
-  #         mkdir ../action
-  #         shopt -s dotglob
-  #         mv * ../action/
-  #         # Do not copy anything back, so there's nothing left to scan
-  #     - run: echo "::add-matcher::./../action/test-problem-matcher.json"
-  #     - uses: ./../action/init
-  #       with:
-  #         languages: java
-  #     - uses: ./../action/analyze
-  #       env:
-  #         TEST_MODE: true
-
-  # Test the behaviour when asked to scan a non-compiled language but there is no code to scan
-  javascript:
+  multi-language-repo_test-autodetect-languages:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2
-      - name: Move codeql-action
-        shell: bash
-        run: |
-          mkdir ../action
-          shopt -s dotglob
-          mv * ../action/
-          # Do not copy anything back, so there's nothing left to scan
-      - run: echo "::add-matcher::./../action/test-problem-matcher.json"
-      - uses: ./../action/init
-        with:
-          languages: javascript
-      - uses: ./../action/analyze
-        env:
-          TEST_MODE: true
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+    - uses: ./../action/init
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      env:
+        TEST_MODE: true
+    - run: |
+        cd "$RUNNER_TEMP/codeql_databases"
+        # List all directories as there will be precisely one directory per database
+        # but there may be other files in this directory such as query suites.
+        if [ "$(ls -d */ | wc -l)" != 6 ] || \
+           [[ ! -d cpp ]] || \
+           [[ ! -d csharp ]] || \
+           [[ ! -d go ]] || \
+           [[ ! -d java ]] || \
+           [[ ! -d javascript ]] || \
+           [[ ! -d python ]]; then
+          echo "Did not find expected number of databases. Database dir contains: $(ls)"
+          exit 1
+        fi
+
+  multi-language-repo_test-custom-queries-and-remote-config:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+    - uses: ./../action/init
+      with:
+        languages: cpp,csharp,java,javascript,python
+        config-file: github/codeql-action/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }}
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      env:
+        TEST_MODE: true
+
+  # Currently is not possible to analyze Go in conjunction with other languages in macos
+  multi-language-repo_test-go-custom-queries:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/setup-go@v2
+      if: ${{ matrix.os ==  'macos-latest' }}
+      with:
+        go-version: '^1.13.1'
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+    - uses: ./../action/init
+      with:
+        languages: go
+        config-file: ./.github/codeql/custom-queries.yml
+    - name: Build code
+      shell: bash
+      run: ./build.sh
+    - uses: ./../action/analyze
+      env:
+        TEST_MODE: true
+
+  multi-language-repo_rubocop:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+    - name: Install Code Scanning integration
+      run: bundle add code-scanning-rubocop --version 0.3.0 --skip-install
+    - name: Install dependencies
+      run: bundle install
+    - name: Rubocop run
+      run: |
+        bash -c "
+          bundle exec rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+          [[ $? -ne 2 ]]
+        "
+    - uses: ./../action/upload-sarif
+      with:
+        sarif_file: rubocop.sarif
+      env:
+        TEST_MODE: true
+
+  test-proxy:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:18.04
+      options: --dns 127.0.0.1
+    services:
+      squid-proxy:
+        image: datadog/squid:latest
+        ports:
+          - 3128:3128
+    env:
+      https_proxy: http://squid-proxy:3128
+    steps:
+    - uses: actions/checkout@v2
+    - name: Move codeql-action
+      shell: bash
+      run: |
+        mkdir ../action
+        mv * .github ../action/
+        mv ../action/tests/multi-language-repo/{*,.github} .
+    - uses: ./../action/init
+      with:
+        languages: javascript
+    - uses: ./../action/analyze
+      env:
+        TEST_MODE: true
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -1,6 +1,6 @@
 name: "PR checks"

-on: [pull_request]
+on: [push, pull_request]

 jobs:
  tslint:
--- a/lib/analysis-paths.test.js
+++ b/lib/analysis-paths.test.js
@@ -13,31 +13,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ava_1 = __importDefault(require("ava"));
 const analysisPaths = __importStar(require("./analysis-paths"));
 const testing_utils_1 = require("./testing-utils");
+const util = __importStar(require("./util"));
 testing_utils_1.setupTests(ava_1.default);
 ava_1.default("emptyPaths", async (t) => {
-    const config = {
-        languages: [],
-        queries: {},
-        pathsIgnore: [],
-        paths: [],
-        originalUserInput: {},
-    };
-    analysisPaths.includeAndExcludeAnalysisPaths(config);
-    t.is(process.env['LGTM_INDEX_INCLUDE'], undefined);
-    t.is(process.env['LGTM_INDEX_EXCLUDE'], undefined);
-    t.is(process.env['LGTM_INDEX_FILTERS'], undefined);
+    return await util.withTmpDir(async (tmpDir) => {
+        const config = {
+            languages: [],
+            queries: {},
+            pathsIgnore: [],
+            paths: [],
+            originalUserInput: {},
+            tempDir: tmpDir,
+            toolCacheDir: tmpDir,
+            codeQLCmd: '',
+        };
+        analysisPaths.includeAndExcludeAnalysisPaths(config);
+        t.is(process.env['LGTM_INDEX_INCLUDE'], undefined);
+        t.is(process.env['LGTM_INDEX_EXCLUDE'], undefined);
+        t.is(process.env['LGTM_INDEX_FILTERS'], undefined);
+    });
 });
 ava_1.default("nonEmptyPaths", async (t) => {
-    const config = {
-        languages: [],
-        queries: {},
-        paths: ['path1', 'path2', '**/path3'],
-        pathsIgnore: ['path4', 'path5', 'path6/**'],
-        originalUserInput: {},
-    };
-    analysisPaths.includeAndExcludeAnalysisPaths(config);
-    t.is(process.env['LGTM_INDEX_INCLUDE'], 'path1\npath2');
-    t.is(process.env['LGTM_INDEX_EXCLUDE'], 'path4\npath5');
-    t.is(process.env['LGTM_INDEX_FILTERS'], 'include:path1\ninclude:path2\ninclude:**/path3\nexclude:path4\nexclude:path5\nexclude:path6/**');
+    return await util.withTmpDir(async (tmpDir) => {
+        const config = {
+            languages: [],
+            queries: {},
+            paths: ['path1', 'path2', '**/path3'],
+            pathsIgnore: ['path4', 'path5', 'path6/**'],
+            originalUserInput: {},
+            tempDir: tmpDir,
+            toolCacheDir: tmpDir,
+            codeQLCmd: '',
+        };
+        analysisPaths.includeAndExcludeAnalysisPaths(config);
+        t.is(process.env['LGTM_INDEX_INCLUDE'], 'path1\npath2');
+        t.is(process.env['LGTM_INDEX_EXCLUDE'], 'path4\npath5');
+        t.is(process.env['LGTM_INDEX_FILTERS'], 'include:path1\ninclude:path2\ninclude:**/path3\nexclude:path4\nexclude:path5\nexclude:path6/**');
+    });
 });
 //# sourceMappingURL=analysis-paths.test.js.map
--- a/lib/analysis-paths.test.js.map
+++ b/lib/analysis-paths.test.js.map
@@ -1 +1 @@
-{"version":3,"file":"analysis-paths.test.js","sourceRoot":"","sources":["../src/analysis-paths.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAuB;AAEvB,gEAAkD;AAClD,mDAA2C;AAE3C,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,aAAI,CAAC,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC3B,MAAM,MAAM,GAAG;QACb,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,EAAE;QACT,iBAAiB,EAAE,EAAE;KACtB,CAAC;IACF,aAAa,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,eAAe,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC9B,MAAM,MAAM,GAAG;QACb,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC;QACrC,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC;QAC3C,iBAAiB,EAAE,EAAE;KACtB,CAAC;IACF,aAAa,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,cAAc,CAAC,CAAC;IACxD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,cAAc,CAAC,CAAC;IACxD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,gGAAgG,CAAC,CAAC;AAC5I,CAAC,CAAC,CAAC"}
+{"version":3,"file":"analysis-paths.test.js","sourceRoot":"","sources":["../src/analysis-paths.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAuB;AAEvB,gEAAkD;AAClD,mDAA2C;AAC3C,6CAA+B;AAE/B,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,aAAI,CAAC,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC3B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QAC1C,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,EAAE;YACf,KAAK,EAAE,EAAE;YACT,iBAAiB,EAAE,EAAE;YACrB,OAAO,EAAE,MAAM;YACf,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,EAAE;SACd,CAAC;QACF,aAAa,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,eAAe,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC9B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QAC1C,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC;YACrC,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC;YAC3C,iBAAiB,EAAE,EAAE;YACrB,OAAO,EAAE,MAAM;YACf,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,EAAE;SACd,CAAC;QACF,aAAa,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,cAAc,CAAC,CAAC;QACxD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,cAAc,CAAC,CAAC;QACxD,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,gGAAgG,CAAC,CAAC;IAC5I,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
--- a/lib/autobuild.js
+++ b/lib/autobuild.js
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const codeql_1 = require("./codeql");
 const config_utils = __importStar(require("./config-utils"));
+const languages_1 = require("./languages");
 const util = __importStar(require("./util"));
 async function sendCompletedStatusReport(startedAt, allLanguages, failingLanguage, cause) {
    var _a, _b;
@@ -30,12 +31,12 @@ async function run() {
        if (!await util.sendStatusReport(await util.createStatusReportBase('autobuild', 'starting', startedAt), true)) {
            return;
        }
-        const config = await config_utils.getConfig();
+        const config = await config_utils.getConfig(util.getRequiredEnvParam('RUNNER_TEMP'));
        // Attempt to find a language to autobuild
        // We want pick the dominant language in the repo from the ones we're able to build
        // The languages are sorted in order specified by user or by lines of code if we got
        // them from the GitHub API, so try to build the first language on the list.
-        const autobuildLanguages = config.languages.filter(codeql_1.isTracedLanguage);
+        const autobuildLanguages = config.languages.filter(languages_1.isTracedLanguage);
        language = autobuildLanguages[0];
        if (!language) {
            core.info("None of the languages in this project require extra build steps");
@@ -46,7 +47,7 @@ async function run() {
            core.warning(`We will only automatically build ${language} code. If you wish to scan ${autobuildLanguages.slice(1).join(' and ')}, you must replace this block with custom build steps.`);
        }
        core.startGroup(`Attempting to automatically build ${language} code`);
-        const codeQL = codeql_1.getCodeQL();
+        const codeQL = codeql_1.getCodeQL(config.codeQLCmd);
        await codeQL.runAutobuild(language);
        core.endGroup();
    }
--- a/lib/autobuild.js.map
+++ b/lib/autobuild.js.map
@@ -1 +1 @@
-{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAEtC,qCAAuD;AACvD,6DAA+C;AAC/C,6CAA+B;AAS/B,KAAK,UAAU,yBAAyB,CACtC,SAAe,EACf,YAAsB,EACtB,eAAwB,EACxB,KAAa;;IAEb,MAAM,MAAM,GAAG,eAAe,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CACxD,WAAW,EACX,MAAM,EACN,SAAS,QACT,KAAK,0CAAE,OAAO,QACd,KAAK,0CAAE,KAAK,CAAC,CAAC;IAChB,MAAM,YAAY,GAA0B;QAC1C,GAAG,gBAAgB;QACnB,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,iBAAiB,EAAE,eAAe;KACnC,CAAC;IACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IAAI,QAAQ,CAAC;IACb,IAAI;QACF,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,EAAE;YAC7G,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;QAE9C,0CAA0C;QAC1C,mFAAmF;QACnF,oFAAoF;QACpF,4EAA4E;QAC5E,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,yBAAgB,CAAC,CAAC;QACrE,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YAC7E,OAAO;SACR;QAED,IAAI,CAAC,KAAK,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAC;QAE7D,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,oCAAoC,QAAQ,8BAA8B,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;SAC3L;QAED,IAAI,CAAC,UAAU,CAAC,qCAAqC,QAAQ,OAAO,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,kBAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEpC,IAAI,CAAC,QAAQ,EAAE,CAAC;KAEjB;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,kIAAkI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QACnK,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,yBAAyB,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACxE,OAAO;KACR;IAED,MAAM,yBAAyB,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACd,IAAI,CAAC,SAAS,CAAC,4BAA4B,GAAG,CAAC,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":"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"}
--- a/lib/codeql.js
+++ b/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, [
@@ -328,14 +342,6 @@ function getCodeQLForCmd(cmd) {
        }
    };
 }
-function isTracedLanguage(language) {
-    return ['cpp', 'java', 'csharp'].includes(language);
-}
-exports.isTracedLanguage = isTracedLanguage;
-function isScannedLanguage(language) {
-    return !isTracedLanguage(language);
-}
-exports.isScannedLanguage = isScannedLanguage;
 /**
 * Gets the options for `path` of `options` as an array of extra option strings.
 */
--- a/lib/codeql.js.map
+++ b/lib/codeql.js.map
--- a/lib/config-utils.js
+++ b/lib/config-utils.js
@@ -12,8 +12,8 @@ const fs = __importStar(require("fs"));
 const yaml = __importStar(require("js-yaml"));
 const path = __importStar(require("path"));
 const api = __importStar(require("./api-client"));
-const codeql_1 = require("./codeql");
 const externalQueries = __importStar(require("./external-queries"));
+const languages_1 = require("./languages");
 const util = __importStar(require("./util"));
 // Property names from the user-supplied config file.
 const NAME_PROPERTY = 'name';
@@ -22,13 +22,6 @@ const QUERIES_PROPERTY = 'queries';
 const QUERIES_USES_PROPERTY = 'uses';
 const PATHS_IGNORE_PROPERTY = 'paths-ignore';
 const PATHS_PROPERTY = 'paths';
-// All the languages supported by CodeQL
-const ALL_LANGUAGES = ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'];
-// Some alternate names for languages
-const LANGUAGE_ALIASES = {
-    'c': 'cpp',
-    'typescript': 'javascript',
-};
 /**
 * A list of queries from https://github.com/github/codeql that
 * we don't want to run. Disabling them here is a quicker alternative to
@@ -71,9 +64,8 @@ function validateQueries(resolvedQueries) {
 /**
 * Run 'codeql resolve queries' and add the results to resultMap
 */
-async function runResolveQueries(resultMap, toResolve, extraSearchPath, errorOnInvalidQueries) {
-    const codeQl = codeql_1.getCodeQL();
-    const resolvedQueries = await codeQl.resolveQueries(toResolve, extraSearchPath);
+async function runResolveQueries(codeQL, resultMap, toResolve, extraSearchPath, errorOnInvalidQueries) {
+    const resolvedQueries = await codeQL.resolveQueries(toResolve, extraSearchPath);
    for (const [language, queries] of Object.entries(resolvedQueries.byLanguage)) {
        if (resultMap[language] === undefined) {
            resultMap[language] = [];
@@ -87,9 +79,9 @@ async function runResolveQueries(resultMap, toResolve, extraSearchPath, errorOnI
 /**
 * Get the set of queries included by default.
 */
-async function addDefaultQueries(languages, resultMap) {
+async function addDefaultQueries(codeQL, languages, resultMap) {
    const suites = languages.map(l => l + '-code-scanning.qls');
-    await runResolveQueries(resultMap, suites, undefined, false);
+    await runResolveQueries(codeQL, resultMap, suites, undefined, false);
 }
 // The set of acceptable values for built-in suites from the codeql bundle
 const builtinSuites = ['security-extended', 'security-and-quality'];
@@ -97,18 +89,18 @@ const builtinSuites = ['security-extended', 'security-and-quality'];
 * Determine the set of queries associated with suiteName's suites and add them to resultMap.
 * Throws an error if suiteName is not a valid builtin suite.
 */
-async function addBuiltinSuiteQueries(configFile, languages, resultMap, suiteName) {
+async function addBuiltinSuiteQueries(configFile, languages, codeQL, resultMap, suiteName) {
    const suite = builtinSuites.find((suite) => suite === suiteName);
    if (!suite) {
        throw new Error(getQueryUsesInvalid(configFile, suiteName));
    }
    const suites = languages.map(l => l + '-' + suiteName + '.qls');
-    await runResolveQueries(resultMap, suites, undefined, false);
+    await runResolveQueries(codeQL, resultMap, suites, undefined, false);
 }
 /**
 * Retrieve the set of queries at localQueryPath and add them to resultMap.
 */
-async function addLocalQueries(configFile, resultMap, localQueryPath) {
+async function addLocalQueries(configFile, codeQL, resultMap, localQueryPath) {
    // Resolve the local path against the workspace so that when this is
    // passed to codeql it resolves to exactly the path we expect it to resolve to.
    const workspacePath = fs.realpathSync(util.getRequiredEnvParam('GITHUB_WORKSPACE'));
@@ -125,12 +117,12 @@ async function addLocalQueries(configFile, resultMap, localQueryPath) {
    }
    // Get the root of the current repo to use when resolving query dependencies
    const rootOfRepo = util.getRequiredEnvParam('GITHUB_WORKSPACE');
-    await runResolveQueries(resultMap, [absoluteQueryPath], rootOfRepo, true);
+    await runResolveQueries(codeQL, resultMap, [absoluteQueryPath], rootOfRepo, true);
 }
 /**
 * Retrieve the set of queries at the referenced remote repo and add them to resultMap.
 */
-async function addRemoteQueries(configFile, resultMap, queryUses) {
+async function addRemoteQueries(configFile, codeQL, resultMap, queryUses, tempDir) {
    let tok = queryUses.split('@');
    if (tok.length !== 2) {
        throw new Error(getQueryUsesInvalid(configFile, queryUses));
@@ -149,11 +141,11 @@ async function addRemoteQueries(configFile, resultMap, queryUses) {
    }
    const nwo = tok[0] + '/' + tok[1];
    // Checkout the external repository
-    const rootOfRepo = await externalQueries.checkoutExternalRepository(nwo, ref);
+    const rootOfRepo = await externalQueries.checkoutExternalRepository(nwo, ref, tempDir);
    const queryPath = tok.length > 2
        ? path.join(rootOfRepo, tok.slice(2).join('/'))
        : rootOfRepo;
-    await runResolveQueries(resultMap, [queryPath], rootOfRepo, true);
+    await runResolveQueries(codeQL, resultMap, [queryPath], rootOfRepo, true);
 }
 /**
 * Parse a query 'uses' field to a discrete set of query files and update resultMap.
@@ -163,23 +155,23 @@ async function addRemoteQueries(configFile, resultMap, queryUses) {
 * local paths starting with './', or references to remote repos, or
 * a finite set of hardcoded terms for builtin suites.
 */
-async function parseQueryUses(configFile, languages, resultMap, queryUses) {
+async function parseQueryUses(configFile, languages, codeQL, resultMap, queryUses, tempDir) {
    queryUses = queryUses.trim();
    if (queryUses === "") {
        throw new Error(getQueryUsesInvalid(configFile));
    }
    // Check for the local path case before we start trying to parse the repository name
    if (queryUses.startsWith("./")) {
-        await addLocalQueries(configFile, resultMap, queryUses.slice(2));
+        await addLocalQueries(configFile, codeQL, resultMap, queryUses.slice(2));
        return;
    }
    // Check for one of the builtin suites
    if (queryUses.indexOf('/') === -1 && queryUses.indexOf('@') === -1) {
-        await addBuiltinSuiteQueries(configFile, languages, resultMap, queryUses);
+        await addBuiltinSuiteQueries(configFile, languages, codeQL, resultMap, queryUses);
        return;
    }
    // Otherwise, must be a reference to another repo
-    await addRemoteQueries(configFile, resultMap, queryUses);
+    await addRemoteQueries(configFile, codeQL, resultMap, queryUses, tempDir);
 }
 // Regex validating stars in paths or paths-ignore entries.
 // The intention is to only allow ** to appear when immediately
@@ -300,17 +292,6 @@ exports.getUnknownLanguagesError = getUnknownLanguagesError;
 */
 async function getLanguagesInRepo() {
    var _a;
-    // Translate between GitHub's API names for languages and ours
-    const codeqlLanguages = {
-        'C': 'cpp',
-        'C++': 'cpp',
-        'C#': 'csharp',
-        'Go': 'go',
-        'Java': 'java',
-        'JavaScript': 'javascript',
-        'TypeScript': 'javascript',
-        'Python': 'python',
-    };
    let repo_nwo = (_a = process.env['GITHUB_REPOSITORY']) === null || _a === void 0 ? void 0 : _a.split("/");
    if (repo_nwo) {
        let owner = repo_nwo[0];
@@ -326,9 +307,10 @@ async function getLanguagesInRepo() {
        // Since sets in javascript maintain insertion order, using a set here and then splatting it
        // into an array gives us an array of languages ordered by popularity
        let languages = new Set();
-        for (let lang in response.data) {
-            if (lang in codeqlLanguages) {
-                languages.add(codeqlLanguages[lang]);
+        for (let lang of Object.keys(response.data)) {
+            let parsedLang = languages_1.parseLanguage(lang);
+            if (parsedLang !== undefined) {
+                languages.add(parsedLang);
            }
        }
        return [...languages];
@@ -365,48 +347,45 @@ async function getLanguages() {
        throw new Error(getNoLanguagesError());
    }
    // Make sure they are supported
-    const checkedLanguages = [];
+    const parsedLanguages = [];
    const unknownLanguages = [];
    for (let language of languages) {
-        // Normalise to lower case
-        language = language.toLowerCase();
-        // Resolve any known aliases
-        if (language in LANGUAGE_ALIASES) {
-            language = LANGUAGE_ALIASES[language];
-        }
-        const checkedLanguage = ALL_LANGUAGES.find(l => l === language);
-        if (checkedLanguage === undefined) {
+        const parsedLanguage = languages_1.parseLanguage(language);
+        if (parsedLanguage === undefined) {
            unknownLanguages.push(language);
        }
-        else if (checkedLanguages.indexOf(checkedLanguage) === -1) {
-            checkedLanguages.push(checkedLanguage);
+        else if (parsedLanguages.indexOf(parsedLanguage) === -1) {
+            parsedLanguages.push(parsedLanguage);
        }
    }
    if (unknownLanguages.length > 0) {
        throw new Error(getUnknownLanguagesError(unknownLanguages));
    }
-    return checkedLanguages;
+    return parsedLanguages;
 }
 /**
 * Get the default config for when the user has not supplied one.
 */
-async function getDefaultConfig() {
+async function getDefaultConfig(tempDir, toolCacheDir, codeQL) {
    const languages = await getLanguages();
    const queries = {};
-    await addDefaultQueries(languages, queries);
+    await addDefaultQueries(codeQL, languages, queries);
    return {
        languages: languages,
        queries: queries,
        pathsIgnore: [],
        paths: [],
        originalUserInput: {},
+        tempDir,
+        toolCacheDir,
+        codeQLCmd: codeQL.getPath(),
    };
 }
 exports.getDefaultConfig = getDefaultConfig;
 /**
 * Load the config from the given file.
 */
-async function loadConfig(configFile) {
+async function loadConfig(configFile, tempDir, toolCacheDir, codeQL) {
    let parsedYAML;
    if (isLocal(configFile)) {
        // Treat the config file as relative to the workspace
@@ -439,7 +418,7 @@ async function loadConfig(configFile) {
        disableDefaultQueries = parsedYAML[DISABLE_DEFAULT_QUERIES_PROPERTY];
    }
    if (!disableDefaultQueries) {
-        await addDefaultQueries(languages, queries);
+        await addDefaultQueries(codeQL, languages, queries);
    }
    if (QUERIES_PROPERTY in parsedYAML) {
        if (!(parsedYAML[QUERIES_PROPERTY] instanceof Array)) {
@@ -449,7 +428,7 @@ async function loadConfig(configFile) {
            if (!(QUERIES_USES_PROPERTY in query) || typeof query[QUERIES_USES_PROPERTY] !== "string") {
                throw new Error(getQueryUsesInvalid(configFile));
            }
-            await parseQueryUses(configFile, languages, queries, query[QUERIES_USES_PROPERTY]);
+            await parseQueryUses(configFile, languages, codeQL, queries, query[QUERIES_USES_PROPERTY], tempDir);
        }
    }
    if (PATHS_IGNORE_PROPERTY in parsedYAML) {
@@ -487,7 +466,10 @@ async function loadConfig(configFile) {
        queries,
        pathsIgnore,
        paths,
-        originalUserInput: parsedYAML
+        originalUserInput: parsedYAML,
+        tempDir,
+        toolCacheDir,
+        codeQLCmd: codeQL.getPath(),
    };
 }
 /**
@@ -496,16 +478,16 @@ async function loadConfig(configFile) {
 * This will parse the config from the user input if present, or generate
 * a default config. The parsed config is then stored to a known location.
 */
-async function initConfig() {
+async function initConfig(tempDir, toolCacheDir, codeQL) {
    const configFile = core.getInput('config-file');
    let config;
    // If no config file was provided create an empty one
    if (configFile === '') {
        core.debug('No configuration file was provided');
-        config = await getDefaultConfig();
+        config = await getDefaultConfig(tempDir, toolCacheDir, codeQL);
    }
    else {
-        config = await loadConfig(configFile);
+        config = await loadConfig(configFile, tempDir, toolCacheDir, codeQL);
    }
    // Save the config so we can easily access it again in the future
    await saveConfig(config);
@@ -559,8 +541,8 @@ async function getRemoteConfig(configFile) {
 /**
 * Get the file path where the parsed config will be stored.
 */
-function getPathToParsedConfigFile() {
-    return path.join(util.getRequiredEnvParam('RUNNER_TEMP'), 'config');
+function getPathToParsedConfigFile(tempDir) {
+    return path.join(tempDir, 'config');
 }
 exports.getPathToParsedConfigFile = getPathToParsedConfigFile;
 /**
@@ -568,7 +550,7 @@ exports.getPathToParsedConfigFile = getPathToParsedConfigFile;
 */
 async function saveConfig(config) {
    const configString = JSON.stringify(config);
-    const configFile = getPathToParsedConfigFile();
+    const configFile = getPathToParsedConfigFile(config.tempDir);
    fs.mkdirSync(path.dirname(configFile), { recursive: true });
    fs.writeFileSync(configFile, configString, 'utf8');
    core.debug('Saved config:');
@@ -582,8 +564,8 @@ async function saveConfig(config) {
 * stored to a known location. On the second and further calls, this will
 * return the contents of the parsed config from the known location.
 */
-async function getConfig() {
-    const configFile = getPathToParsedConfigFile();
+async function getConfig(tempDir) {
+    const configFile = getPathToParsedConfigFile(tempDir);
    if (!fs.existsSync(configFile)) {
        throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
    }
--- a/lib/config-utils.js.map
+++ b/lib/config-utils.js.map
--- a/lib/config-utils.test.js
+++ b/lib/config-utils.test.js
@@ -16,8 +16,9 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const sinon_1 = __importDefault(require("sinon"));
 const api = __importStar(require("./api-client"));
-const CodeQL = __importStar(require("./codeql"));
+const codeql_1 = require("./codeql");
 const configUtils = __importStar(require("./config-utils"));
+const languages_1 = require("./languages");
 const testing_utils_1 = require("./testing-utils");
 const util = __importStar(require("./util"));
 testing_utils_1.setupTests(ava_1.default);
@@ -60,7 +61,7 @@ ava_1.default("load empty config", async (t) => {
        process.env['GITHUB_WORKSPACE'] = tmpDir;
        setInput('config-file', undefined);
        setInput('languages', 'javascript,python');
-        CodeQL.setCodeQL({
+        const codeQL = codeql_1.setCodeQL({
            resolveQueries: async function () {
                return {
                    byLanguage: {},
@@ -69,8 +70,8 @@ ava_1.default("load empty config", async (t) => {
                };
            },
        });
-        const config = await configUtils.initConfig();
-        t.deepEqual(config, await configUtils.getDefaultConfig());
+        const config = await configUtils.initConfig(tmpDir, tmpDir, codeQL);
+        t.deepEqual(config, await configUtils.getDefaultConfig(tmpDir, tmpDir, codeQL));
    });
 });
 ava_1.default("loading config saves config", async (t) => {
@@ -79,7 +80,7 @@ ava_1.default("loading config saves config", async (t) => {
        process.env['GITHUB_WORKSPACE'] = tmpDir;
        setInput('config-file', undefined);
        setInput('languages', 'javascript,python');
-        CodeQL.setCodeQL({
+        const codeQL = codeql_1.setCodeQL({
            resolveQueries: async function () {
                return {
                    byLanguage: {},
@@ -89,14 +90,14 @@ ava_1.default("loading config saves config", async (t) => {
            },
        });
        // Sanity check the saved config file does not already exist
-        t.false(fs.existsSync(configUtils.getPathToParsedConfigFile()));
+        t.false(fs.existsSync(configUtils.getPathToParsedConfigFile(tmpDir)));
        // Sanity check that getConfig throws before we have called initConfig
-        await t.throwsAsync(configUtils.getConfig);
-        const config1 = await configUtils.initConfig();
+        await t.throwsAsync(() => configUtils.getConfig(tmpDir));
+        const config1 = await configUtils.initConfig(tmpDir, tmpDir, codeQL);
        // The saved config file should now exist
-        t.true(fs.existsSync(configUtils.getPathToParsedConfigFile()));
+        t.true(fs.existsSync(configUtils.getPathToParsedConfigFile(tmpDir)));
        // And that same newly-initialised config should now be returned by getConfig
-        const config2 = await configUtils.getConfig();
+        const config2 = await configUtils.getConfig(tmpDir);
        t.deepEqual(config1, config2);
    });
 });
@@ -106,7 +107,7 @@ ava_1.default("load input outside of workspace", async (t) => {
        process.env['GITHUB_WORKSPACE'] = tmpDir;
        setInput('config-file', '../input');
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -121,7 +122,7 @@ ava_1.default("load non-local input with invalid repo syntax", async (t) => {
        // no filename given, just a repo
        setInput('config-file', 'octo-org/codeql-config@main');
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -137,7 +138,7 @@ ava_1.default("load non-existent input", async (t) => {
        setInput('config-file', 'input');
        setInput('languages', 'javascript');
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -149,7 +150,7 @@ ava_1.default("load non-empty input", async (t) => {
    return await util.withTmpDir(async (tmpDir) => {
        process.env['RUNNER_TEMP'] = tmpDir;
        process.env['GITHUB_WORKSPACE'] = tmpDir;
-        CodeQL.setCodeQL({
+        const codeQL = codeql_1.setCodeQL({
            resolveQueries: async function () {
                return {
                    byLanguage: {
@@ -177,7 +178,7 @@ ava_1.default("load non-empty input", async (t) => {
        fs.mkdirSync(path.join(tmpDir, 'foo'));
        // And the config we expect it to parse to
        const expectedConfig = {
-            languages: ['javascript'],
+            languages: [languages_1.Language.javascript],
            queries: { 'javascript': ['/foo/a.ql', '/bar/b.ql'] },
            pathsIgnore: ['a', 'b'],
            paths: ['c/d'],
@@ -188,11 +189,14 @@ ava_1.default("load non-empty input", async (t) => {
                'paths-ignore': ['a', 'b'],
                paths: ['c/d'],
            },
+            tempDir: tmpDir,
+            toolCacheDir: tmpDir,
+            codeQLCmd: codeQL.getPath(),
        };
        fs.writeFileSync(path.join(tmpDir, 'input'), inputFileContents, 'utf8');
        setInput('config-file', 'input');
        setInput('languages', 'javascript');
-        const actualConfig = await configUtils.initConfig();
+        const actualConfig = await configUtils.initConfig(tmpDir, tmpDir, codeQL);
        // Should exactly equal the object we constructed earlier
        t.deepEqual(actualConfig, expectedConfig);
    });
@@ -207,7 +211,7 @@ ava_1.default("default queries are used", async (t) => {
        // We determine this by whether CodeQL.resolveQueries is called
        // with the correct arguments.
        const resolveQueriesArgs = [];
-        CodeQL.setCodeQL({
+        const codeQL = codeql_1.setCodeQL({
            resolveQueries: async function (queries, extraSearchPath) {
                resolveQueriesArgs.push({ queries, extraSearchPath });
                return {
@@ -231,7 +235,7 @@ ava_1.default("default queries are used", async (t) => {
        fs.writeFileSync(path.join(tmpDir, 'input'), inputFileContents, 'utf8');
        setInput('config-file', 'input');
        setInput('languages', 'javascript');
-        await configUtils.initConfig();
+        await configUtils.initConfig(tmpDir, tmpDir, codeQL);
        // Check resolve queries was called correctly
        t.deepEqual(resolveQueriesArgs.length, 1);
        t.deepEqual(resolveQueriesArgs[0].queries, ['javascript-code-scanning.qls']);
@@ -242,7 +246,7 @@ ava_1.default("API client used when reading remote config", async (t) => {
    return await util.withTmpDir(async (tmpDir) => {
        process.env['RUNNER_TEMP'] = tmpDir;
        process.env['GITHUB_WORKSPACE'] = tmpDir;
-        CodeQL.setCodeQL({
+        const codeQL = codeql_1.setCodeQL({
            resolveQueries: async function () {
                return {
                    byLanguage: {
@@ -275,7 +279,7 @@ ava_1.default("API client used when reading remote config", async (t) => {
        fs.mkdirSync(path.join(tmpDir, 'foo/bar'), { recursive: true });
        setInput('config-file', 'octo-org/codeql-config/config.yaml@main');
        setInput('languages', 'javascript');
-        await configUtils.initConfig();
+        await configUtils.initConfig(tmpDir, tmpDir, codeQL);
        t.assert(spyGetContents.called);
    });
 });
@@ -288,7 +292,7 @@ ava_1.default("Remote config handles the case where a directory is provided", as
        const repoReference = 'octo-org/codeql-config/config.yaml@main';
        setInput('config-file', repoReference);
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -307,7 +311,7 @@ ava_1.default("Invalid format of remote config handled correctly", async (t) =>
        const repoReference = 'octo-org/codeql-config/config.yaml@main';
        setInput('config-file', repoReference);
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -321,7 +325,7 @@ ava_1.default("No detected languages", async (t) => {
        process.env['GITHUB_WORKSPACE'] = tmpDir;
        mockListLanguages([]);
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -335,7 +339,7 @@ ava_1.default("Unknown languages", async (t) => {
        process.env['GITHUB_WORKSPACE'] = tmpDir;
        setInput('languages', 'ruby,english');
        try {
-            await configUtils.initConfig();
+            await configUtils.initConfig(tmpDir, tmpDir, codeql_1.getCachedCodeQL());
            throw new Error('initConfig did not throw error');
        }
        catch (err) {
@@ -348,7 +352,7 @@ function doInvalidInputTest(testName, inputFileContents, expectedErrorMessageGen
        return await util.withTmpDir(async (tmpDir) => {
            process.env['RUNNER_TEMP'] = tmpDir;
            process.env['GITHUB_WORKSPACE'] = tmpDir;
-            CodeQL.setCodeQL({
+            const codeQL = codeql_1.setCodeQL({
                resolveQueries: async function () {
                    return {
                        byLanguage: {},
@@ -362,7 +366,7 @@ function doInvalidInputTest(testName, inputFileContents, expectedErrorMessageGen
            setInput('config-file', 'input');
            setInput('languages', 'javascript');
            try {
-                await configUtils.initConfig();
+                await configUtils.initConfig(tmpDir, tmpDir, codeQL);
                throw new Error('initConfig did not throw error');
            }
            catch (err) {
--- a/lib/config-utils.test.js.map
+++ b/lib/config-utils.test.js.map
--- a/lib/external-queries.js
+++ b/lib/external-queries.js
@@ -11,14 +11,12 @@ const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const util = __importStar(require("./util"));
 /**
 * Check out repository at the given ref, and return the directory of the checkout.
 */
-async function checkoutExternalRepository(repository, ref) {
-    const folder = util.getRequiredEnvParam('RUNNER_TEMP');
+async function checkoutExternalRepository(repository, ref, tempDir) {
    core.info('Checking out ' + repository);
-    const checkoutLocation = path.join(folder, repository);
+    const checkoutLocation = path.join(tempDir, repository);
    if (!fs.existsSync(checkoutLocation)) {
        const repoURL = 'https://github.com/' + repository + '.git';
        await exec.exec('git', ['clone', repoURL, checkoutLocation]);
--- a/lib/external-queries.js.map
+++ b/lib/external-queries.js.map
@@ -1 +1 @@
-{"version":3,"file":"external-queries.js","sourceRoot":"","sources":["../src/external-queries.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AACtC,oDAAsC;AACtC,uCAAyB;AACzB,2CAA6B;AAE7B,6CAA+B;AAE/B;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAAC,UAAkB,EAAE,GAAW;IAC9E,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAEvD,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,CAAC;IAExC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,MAAM,OAAO,GAAG,qBAAqB,GAAG,UAAU,GAAG,MAAM,CAAC;QAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACrB,cAAc,GAAG,gBAAgB;YACjC,YAAY,GAAG,gBAAgB,GAAG,OAAO;YACzC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;KACJ;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAjBD,gEAiBC"}
+{"version":3,"file":"external-queries.js","sourceRoot":"","sources":["../src/external-queries.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AACtC,oDAAsC;AACtC,uCAAyB;AACzB,2CAA6B;AAE7B;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAAC,UAAkB,EAAE,GAAW,EAAE,OAAe;IAC/F,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,CAAC;IAExC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACxD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,MAAM,OAAO,GAAG,qBAAqB,GAAG,UAAU,GAAG,MAAM,CAAC;QAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACrB,cAAc,GAAG,gBAAgB;YACjC,YAAY,GAAG,gBAAgB,GAAG,OAAO;YACzC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;KACJ;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAfD,gEAeC"}
--- a/lib/external-queries.test.js
+++ b/lib/external-queries.test.js
@@ -19,8 +19,7 @@ const util = __importStar(require("./util"));
 testing_utils_1.setupTests(ava_1.default);
 ava_1.default("checkoutExternalQueries", async (t) => {
    await util.withTmpDir(async (tmpDir) => {
-        process.env["RUNNER_TEMP"] = tmpDir;
-        await externalQueries.checkoutExternalRepository("github/codeql-go", "df4c6869212341b601005567381944ed90906b6b");
+        await externalQueries.checkoutExternalRepository("github/codeql-go", "df4c6869212341b601005567381944ed90906b6b", tmpDir);
        // COPYRIGHT file existed in df4c6869212341b601005567381944ed90906b6b but not in the default branch
        t.true(fs.existsSync(path.join(tmpDir, "github", "codeql-go", "COPYRIGHT")));
    });
--- a/lib/external-queries.test.js.map
+++ b/lib/external-queries.test.js.map
@@ -1 +1 @@
-{"version":3,"file":"external-queries.test.js","sourceRoot":"","sources":["../src/external-queries.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAuB;AACvB,uCAAyB;AACzB,2CAA6B;AAE7B,oEAAsD;AACtD,mDAA2C;AAC3C,6CAA+B;AAE/B,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,aAAI,CAAC,yBAAyB,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACxC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;QACpC,MAAM,eAAe,CAAC,0BAA0B,CAAC,kBAAkB,EAAE,0CAA0C,CAAC,CAAC;QAEjH,mGAAmG;QACnG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"external-queries.test.js","sourceRoot":"","sources":["../src/external-queries.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAuB;AACvB,uCAAyB;AACzB,2CAA6B;AAE7B,oEAAsD;AACtD,mDAA2C;AAC3C,6CAA+B;AAE/B,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,aAAI,CAAC,yBAAyB,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACxC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QACnC,MAAM,eAAe,CAAC,0BAA0B,CAC9C,kBAAkB,EAClB,0CAA0C,EAC1C,MAAM,CAAC,CAAC;QAEV,mGAAmG;QACnG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
--- a/lib/finalize-db.js
+++ b/lib/finalize-db.js
@@ -12,6 +12,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const codeql_1 = require("./codeql");
 const configUtils = __importStar(require("./config-utils"));
+const languages_1 = require("./languages");
 const logging_1 = require("./logging");
 const repository_1 = require("./repository");
 const sharedEnv = __importStar(require("./shared-environment"));
@@ -29,9 +30,9 @@ async function sendStatusReport(startedAt, queriesStats, uploadStats, error) {
    await util.sendStatusReport(statusReport);
 }
 async function createdDBForScannedLanguages(databaseFolder, config) {
-    const codeql = codeql_1.getCodeQL();
+    const codeql = codeql_1.getCodeQL(config.codeQLCmd);
    for (const language of config.languages) {
-        if (codeql_1.isScannedLanguage(language)) {
+        if (languages_1.isScannedLanguage(language)) {
            core.startGroup('Extracting ' + language);
            await codeql.extractScannedLanguage(path.join(databaseFolder, language), language);
            core.endGroup();
@@ -40,7 +41,7 @@ async function createdDBForScannedLanguages(databaseFolder, config) {
 }
 async function finalizeDatabaseCreation(databaseFolder, config) {
    await createdDBForScannedLanguages(databaseFolder, config);
-    const codeql = codeql_1.getCodeQL();
+    const codeql = codeql_1.getCodeQL(config.codeQLCmd);
    for (const language of config.languages) {
        core.startGroup('Finalizing ' + language);
        await codeql.finalizeDatabase(path.join(databaseFolder, language));
@@ -49,7 +50,7 @@ async function finalizeDatabaseCreation(databaseFolder, config) {
 }
 // Runs queries and creates sarif files in the given folder
 async function runQueries(databaseFolder, sarifFolder, config) {
-    const codeql = codeql_1.getCodeQL();
+    const codeql = codeql_1.getCodeQL(config.codeQLCmd);
    for (let language of fs.readdirSync(databaseFolder)) {
        core.startGroup('Analyzing ' + language);
        const queries = config.queries[language] || [];
@@ -86,10 +87,10 @@ async function run() {
        if (!await util.sendStatusReport(await util.createStatusReportBase('finish', 'starting', startedAt), true)) {
            return;
        }
-        const config = await configUtils.getConfig();
+        const config = await configUtils.getConfig(util.getRequiredEnvParam('RUNNER_TEMP'));
        core.exportVariable(sharedEnv.ODASA_TRACER_CONFIGURATION, '');
        delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION];
-        const databaseFolder = util.getCodeQLDatabasesDir();
+        const databaseFolder = util.getCodeQLDatabasesDir(config.tempDir);
        const sarifFolder = core.getInput('output');
        fs.mkdirSync(sarifFolder, { recursive: true });
        core.info('Finalizing database creation');
@@ -101,7 +102,7 @@ async function run() {
        }
    }
    catch (error) {
-        // core.setFailed(error.message);
+        core.setFailed(error.message);
        console.log(error);
        await sendStatusReport(startedAt, queriesStats, uploadStats, error);
        return;
--- a/lib/finalize-db.js.map
+++ b/lib/finalize-db.js.map
@@ -1 +1 @@
-{"version":3,"file":"finalize-db.js","sourceRoot":"","sources":["../src/finalize-db.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"finalize-db.js","sourceRoot":"","sources":["../src/finalize-db.ts"],"names":[],"mappings":"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"}
--- a/lib/fingerprints.js
+++ b/lib/fingerprints.js
@@ -10,7 +10,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core = __importStar(require("@actions/core"));
 const fs = __importStar(require("fs"));
 const long_1 = __importDefault(require("long"));
 const tab = '\t'.charCodeAt(0);
@@ -122,7 +121,7 @@ function hash(callback, input) {
 exports.hash = hash;
 // Generate a hash callback function that updates the given result in-place
 // when it recieves a hash for the correct line number. Ignores hashes for other lines.
-function locationUpdateCallback(result, location) {
+function locationUpdateCallback(result, location, logger) {
    var _a, _b;
    let locationStartLine = (_b = (_a = location.physicalLocation) === null || _a === void 0 ? void 0 : _a.region) === null || _b === void 0 ? void 0 : _b.startLine;
    if (locationStartLine === undefined) {
@@ -146,7 +145,7 @@ function locationUpdateCallback(result, location) {
            result.partialFingerprints.primaryLocationLineHash = hash;
        }
        else if (existingFingerprint !== hash) {
-            core.warning('Calculated fingerprint of ' + hash +
+            logger.warning('Calculated fingerprint of ' + hash +
                ' for file ' + location.physicalLocation.artifactLocation.uri +
                ' line ' + lineNumber +
                ', but found existing inconsistent fingerprint value ' + existingFingerprint);
@@ -157,21 +156,21 @@ function locationUpdateCallback(result, location) {
 // the source file so we can hash it.
 // If possible returns a absolute file path for the source file,
 // or if not possible then returns undefined.
-function resolveUriToFile(location, artifacts) {
+function resolveUriToFile(location, artifacts, logger) {
    // This may be referencing an artifact
    if (!location.uri && location.index !== undefined) {
        if (typeof location.index !== 'number' ||
            location.index < 0 ||
            location.index >= artifacts.length ||
            typeof artifacts[location.index].location !== 'object') {
-            core.debug(`Ignoring location as URI "${location.index}" is invalid`);
+            logger.debug(`Ignoring location as URI "${location.index}" is invalid`);
            return undefined;
        }
        location = artifacts[location.index].location;
    }
    // Get the URI and decode
    if (typeof location.uri !== 'string') {
-        core.debug(`Ignoring location as index "${location.uri}" is invalid`);
+        logger.debug(`Ignoring location as index "${location.uri}" is invalid`);
        return undefined;
    }
    let uri = decodeURIComponent(location.uri);
@@ -181,13 +180,13 @@ function resolveUriToFile(location, artifacts) {
        uri = uri.substring(fileUriPrefix.length);
    }
    if (uri.indexOf('://') !== -1) {
-        core.debug(`Ignoring location URI "${uri}" as the scheme is not recognised`);
+        logger.debug(`Ignoring location URI "${uri}" as the scheme is not recognised`);
        return undefined;
    }
    // Discard any absolute paths that aren't in the src root
    const srcRootPrefix = process.env['GITHUB_WORKSPACE'] + '/';
    if (uri.startsWith('/') && !uri.startsWith(srcRootPrefix)) {
-        core.debug(`Ignoring location URI "${uri}" as it is outside of the src root`);
+        logger.debug(`Ignoring location URI "${uri}" as it is outside of the src root`);
        return undefined;
    }
    // Just assume a relative path is relative to the src root.
@@ -198,7 +197,7 @@ function resolveUriToFile(location, artifacts) {
    }
    // Check the file exists
    if (!fs.existsSync(uri)) {
-        core.debug(`Unable to compute fingerprint for non-existent file: ${uri}`);
+        logger.debug(`Unable to compute fingerprint for non-existent file: ${uri}`);
        return undefined;
    }
    return uri;
@@ -206,7 +205,7 @@ function resolveUriToFile(location, artifacts) {
 exports.resolveUriToFile = resolveUriToFile;
 // Compute fingerprints for results in the given sarif file
 // and return an updated sarif file contents.
-function addFingerprints(sarifContents) {
+function addFingerprints(sarifContents, logger) {
    var _a, _b;
    let sarif = JSON.parse(sarifContents);
    // Gather together results for the same file and construct
@@ -219,17 +218,17 @@ function addFingerprints(sarifContents) {
            // Check the primary location is defined correctly and is in the src root
            const primaryLocation = (result.locations || [])[0];
            if (!((_b = (_a = primaryLocation) === null || _a === void 0 ? void 0 : _a.physicalLocation) === null || _b === void 0 ? void 0 : _b.artifactLocation)) {
-                core.debug(`Unable to compute fingerprint for invalid location: ${JSON.stringify(primaryLocation)}`);
+                logger.debug(`Unable to compute fingerprint for invalid location: ${JSON.stringify(primaryLocation)}`);
                continue;
            }
-            const filepath = resolveUriToFile(primaryLocation.physicalLocation.artifactLocation, artifacts);
+            const filepath = resolveUriToFile(primaryLocation.physicalLocation.artifactLocation, artifacts, logger);
            if (!filepath) {
                continue;
            }
            if (!callbacksByFile[filepath]) {
                callbacksByFile[filepath] = [];
            }
-            callbacksByFile[filepath].push(locationUpdateCallback(result, primaryLocation));
+            callbacksByFile[filepath].push(locationUpdateCallback(result, primaryLocation, logger));
        }
    }
    // Now hash each file that was found
--- a/lib/fingerprints.js.map
+++ b/lib/fingerprints.js.map
--- a/lib/fingerprints.test.js
+++ b/lib/fingerprints.test.js
@@ -14,6 +14,7 @@ const ava_1 = __importDefault(require("ava"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const fingerprints = __importStar(require("./fingerprints"));
+const logging_1 = require("./logging");
 const testing_utils_1 = require("./testing-utils");
 testing_utils_1.setupTests(ava_1.default);
 function testHash(t, input, expectedHashes) {
@@ -98,7 +99,7 @@ ava_1.default('hash', (t) => {
 function testResolveUriToFile(uri, index, artifactsURIs) {
    const location = { "uri": uri, "index": index };
    const artifacts = artifactsURIs.map(uri => ({ "location": { "uri": uri } }));
-    return fingerprints.resolveUriToFile(location, artifacts);
+    return fingerprints.resolveUriToFile(location, artifacts, logging_1.getCLILogger());
 }
 ava_1.default('resolveUriToFile', t => {
    // The resolveUriToFile method checks that the file exists and is in the right directory
@@ -143,7 +144,7 @@ ava_1.default('addFingerprints', t => {
    expected = JSON.stringify(JSON.parse(expected));
    // The URIs in the SARIF files resolve to files in the testdata directory
    process.env['GITHUB_WORKSPACE'] = path.normalize(__dirname + '/../src/testdata');
-    t.deepEqual(fingerprints.addFingerprints(input), expected);
+    t.deepEqual(fingerprints.addFingerprints(input, logging_1.getCLILogger()), expected);
 });
 ava_1.default('missingRegions', t => {
    // Run an end-to-end test on a test file
@@ -154,6 +155,6 @@ ava_1.default('missingRegions', t => {
    expected = JSON.stringify(JSON.parse(expected));
    // The URIs in the SARIF files resolve to files in the testdata directory
    process.env['GITHUB_WORKSPACE'] = path.normalize(__dirname + '/../src/testdata');
-    t.deepEqual(fingerprints.addFingerprints(input), expected);
+    t.deepEqual(fingerprints.addFingerprints(input, logging_1.getCLILogger()), expected);
 });
 //# sourceMappingURL=fingerprints.test.js.map
--- a/lib/fingerprints.test.js.map
+++ b/lib/fingerprints.test.js.map
--- a/lib/languages.js
+++ b/lib/languages.js
@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// All the languages supported by CodeQL
+var Language;
+(function (Language) {
+    Language["csharp"] = "csharp";
+    Language["cpp"] = "cpp";
+    Language["go"] = "go";
+    Language["java"] = "java";
+    Language["javascript"] = "javascript";
+    Language["python"] = "python";
+})(Language = exports.Language || (exports.Language = {}));
+// Additional names for languages
+const LANGUAGE_ALIASES = {
+    'c': Language.cpp,
+    'c++': Language.cpp,
+    'c#': Language.csharp,
+    'typescript': Language.javascript,
+};
+// Translate from user input or GitHub's API names for languages to CodeQL's names for languages
+function parseLanguage(language) {
+    // Normalise to lower case
+    language = language.toLowerCase();
+    // See if it's an exact match
+    if (language in Language) {
+        return language;
+    }
+    // Check language aliases
+    if (language in LANGUAGE_ALIASES) {
+        return LANGUAGE_ALIASES[language];
+    }
+    return undefined;
+}
+exports.parseLanguage = parseLanguage;
+function isTracedLanguage(language) {
+    return ['cpp', 'java', 'csharp'].includes(language);
+}
+exports.isTracedLanguage = isTracedLanguage;
+function isScannedLanguage(language) {
+    return !isTracedLanguage(language);
+}
+exports.isScannedLanguage = isScannedLanguage;
+//# sourceMappingURL=languages.js.map
--- a/lib/languages.js.map
+++ b/lib/languages.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"languages.js","sourceRoot":"","sources":["../src/languages.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AACxC,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,qBAAS,CAAA;IACT,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;AACnB,CAAC,EAPW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAOnB;AAED,iCAAiC;AACjC,MAAM,gBAAgB,GAA+B;IACnD,GAAG,EAAE,QAAQ,CAAC,GAAG;IACjB,KAAK,EAAE,QAAQ,CAAC,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,YAAY,EAAE,QAAQ,CAAC,UAAU;CAClC,CAAC;AAEF,gGAAgG;AAChG,SAAgB,aAAa,CAAC,QAAgB;IAC5C,0BAA0B;IAC1B,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAElC,6BAA6B;IAC7B,IAAI,QAAQ,IAAI,QAAQ,EAAE;QACxB,OAAO,QAAoB,CAAC;KAC7B;IAED,yBAAyB;IACzB,IAAI,QAAQ,IAAI,gBAAgB,EAAE;QAChC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACnC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,sCAeC;AAGD,SAAgB,gBAAgB,CAAC,QAAkB;IACjD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACtD,CAAC;AAFD,4CAEC;AAED,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC;AAFD,8CAEC"}
--- a/lib/languages.test.js
+++ b/lib/languages.test.js
@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ava_1 = __importDefault(require("ava"));
+const languages_1 = require("./languages");
+const testing_utils_1 = require("./testing-utils");
+testing_utils_1.setupTests(ava_1.default);
+ava_1.default('parseLangauge', async (t) => {
+    // Exact matches
+    t.deepEqual(languages_1.parseLanguage('csharp'), languages_1.Language.csharp);
+    t.deepEqual(languages_1.parseLanguage('cpp'), languages_1.Language.cpp);
+    t.deepEqual(languages_1.parseLanguage('go'), languages_1.Language.go);
+    t.deepEqual(languages_1.parseLanguage('java'), languages_1.Language.java);
+    t.deepEqual(languages_1.parseLanguage('javascript'), languages_1.Language.javascript);
+    t.deepEqual(languages_1.parseLanguage('python'), languages_1.Language.python);
+    // Aliases
+    t.deepEqual(languages_1.parseLanguage('c'), languages_1.Language.cpp);
+    t.deepEqual(languages_1.parseLanguage('c++'), languages_1.Language.cpp);
+    t.deepEqual(languages_1.parseLanguage('c#'), languages_1.Language.csharp);
+    t.deepEqual(languages_1.parseLanguage('typescript'), languages_1.Language.javascript);
+    // Not matches
+    t.deepEqual(languages_1.parseLanguage('foo'), undefined);
+    t.deepEqual(languages_1.parseLanguage(' '), undefined);
+    t.deepEqual(languages_1.parseLanguage(''), undefined);
+});
+ava_1.default('isTracedLanguage', async (t) => {
+    t.true(languages_1.isTracedLanguage(languages_1.Language.cpp));
+    t.true(languages_1.isTracedLanguage(languages_1.Language.java));
+    t.true(languages_1.isTracedLanguage(languages_1.Language.csharp));
+    t.false(languages_1.isTracedLanguage(languages_1.Language.go));
+    t.false(languages_1.isTracedLanguage(languages_1.Language.javascript));
+    t.false(languages_1.isTracedLanguage(languages_1.Language.python));
+});
+ava_1.default('isScannedLanguage', async (t) => {
+    t.false(languages_1.isScannedLanguage(languages_1.Language.cpp));
+    t.false(languages_1.isScannedLanguage(languages_1.Language.java));
+    t.false(languages_1.isScannedLanguage(languages_1.Language.csharp));
+    t.true(languages_1.isScannedLanguage(languages_1.Language.go));
+    t.true(languages_1.isScannedLanguage(languages_1.Language.javascript));
+    t.true(languages_1.isScannedLanguage(languages_1.Language.python));
+});
+//# sourceMappingURL=languages.test.js.map
--- a/lib/languages.test.js.map
+++ b/lib/languages.test.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"languages.test.js","sourceRoot":"","sources":["../src/languages.test.ts"],"names":[],"mappings":"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"}
--- a/lib/setup-tracer.js
+++ b/lib/setup-tracer.js
@@ -14,6 +14,7 @@ const path = __importStar(require("path"));
 const analysisPaths = __importStar(require("./analysis-paths"));
 const codeql_1 = require("./codeql");
 const configUtils = __importStar(require("./config-utils"));
+const languages_1 = require("./languages");
 const util = __importStar(require("./util"));
 const CRITICAL_TRACER_VARS = new Set(['SEMMLE_PRELOAD_libtrace',
    ,
@@ -49,14 +50,14 @@ async function tracerConfig(codeql, database, compilerSpec) {
    }
    return info;
 }
-function concatTracerConfigs(configs) {
+function concatTracerConfigs(tracerConfigs, config) {
    // A tracer config is a map containing additional environment variables and a tracer 'spec' file.
    // A tracer 'spec' file has the following format [log_file, number_of_blocks, blocks_text]
    // Merge the environments
    const env = {};
    let copyExecutables = false;
    let envSize = 0;
-    for (const v of configs) {
+    for (const v of tracerConfigs) {
        for (let e of Object.entries(v.env)) {
            const name = e[0];
            const value = e[1];
@@ -77,7 +78,7 @@ function concatTracerConfigs(configs) {
        }
    }
    // Concatenate spec files into a new spec file
-    let languages = Object.keys(configs);
+    let languages = Object.keys(tracerConfigs);
    const cppIndex = languages.indexOf('cpp');
    // Make sure cpp is the last language, if it's present since it must be concatenated last
    if (cppIndex !== -1) {
@@ -88,15 +89,14 @@ function concatTracerConfigs(configs) {
    let totalLines = [];
    let totalCount = 0;
    for (let lang of languages) {
-        const lines = fs.readFileSync(configs[lang].spec, 'utf8').split(/\r?\n/);
+        const lines = fs.readFileSync(tracerConfigs[lang].spec, 'utf8').split(/\r?\n/);
        const count = parseInt(lines[1], 10);
        totalCount += count;
        totalLines.push(...lines.slice(2));
    }
-    const tempFolder = util.getRequiredEnvParam('RUNNER_TEMP');
-    const newLogFilePath = path.resolve(tempFolder, 'compound-build-tracer.log');
-    const spec = path.resolve(tempFolder, 'compound-spec');
-    const compoundTempFolder = path.resolve(tempFolder, 'compound-temp');
+    const newLogFilePath = path.resolve(config.tempDir, 'compound-build-tracer.log');
+    const spec = path.resolve(config.tempDir, 'compound-spec');
+    const compoundTempFolder = path.resolve(config.tempDir, 'compound-temp');
    const newSpecContent = [newLogFilePath, totalCount.toString(10), ...totalLines];
    if (copyExecutables) {
        env['SEMMLE_COPY_EXECUTABLES_ROOT'] = compoundTempFolder;
@@ -142,7 +142,6 @@ async function run() {
    const startedAt = new Date();
    let config;
    let codeql;
-    core.warning('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam mattis sit amet neque vitae ullamcorper. Et esse qui ipsa dignissimos ut voluptatibus sed nesciunt. Aliquam exercitationem sit commodi est. Dolores at in autem laudantium exercitationem ut aliquam quis.\nDignissimos et dolore dolorem cumque quis. Et porro velit sit temporibus. Similique tempora sed illo. Alias iure nihil laudantium.');
    try {
        util.prepareLocalRunEnvironment();
        if (!await util.sendStatusReport(await util.createStatusReportBase('init', 'starting', startedAt), true)) {
@@ -153,7 +152,7 @@ async function run() {
        await codeql.printVersion();
        core.endGroup();
        core.startGroup('Load language configuration');
-        config = await configUtils.initConfig();
+        config = await configUtils.initConfig(util.getRequiredEnvParam('RUNNER_TEMP'), util.getRequiredEnvParam('RUNNER_TOOL_CACHE'), codeql);
        analysisPaths.includeAndExcludeAnalysisPaths(config);
        core.endGroup();
    }
@@ -174,7 +173,7 @@ async function run() {
        // Setup CODEQL_RAM flag (todo improve this https://github.com/github/dsp-code-scanning/issues/935)
        const codeqlRam = process.env['CODEQL_RAM'] || '6500';
        core.exportVariable('CODEQL_RAM', codeqlRam);
-        const databaseFolder = util.getCodeQLDatabasesDir();
+        const databaseFolder = util.getCodeQLDatabasesDir(config.tempDir);
        fs.mkdirSync(databaseFolder, { recursive: true });
        let tracedLanguageConfigs = [];
        // TODO: replace this code once CodeQL supports multi-language tracing
@@ -183,29 +182,30 @@ async function run() {
            // Init language database
            await codeql.databaseInit(languageDatabase, language, sourceRoot);
            // TODO: add better detection of 'traced languages' instead of using a hard coded list
-            if (codeql_1.isTracedLanguage(language)) {
+            if (languages_1.isTracedLanguage(language)) {
                const config = await tracerConfig(codeql, languageDatabase);
                tracedLanguageConfigs.push(config);
            }
        }
        if (tracedLanguageConfigs.length > 0) {
-            const mainTracerConfig = concatTracerConfigs(tracedLanguageConfigs);
+            const mainTracerConfig = concatTracerConfigs(tracedLanguageConfigs, config);
            if (mainTracerConfig.spec) {
                for (let entry of Object.entries(mainTracerConfig.env)) {
                    core.exportVariable(entry[0], entry[1]);
                }
                core.exportVariable('ODASA_TRACER_CONFIGURATION', mainTracerConfig.spec);
+                const codeQLDir = path.dirname(codeql.getPath());
                if (process.platform === 'darwin') {
-                    core.exportVariable('DYLD_INSERT_LIBRARIES', path.join(codeql.getDir(), 'tools', 'osx64', 'libtrace.dylib'));
+                    core.exportVariable('DYLD_INSERT_LIBRARIES', path.join(codeQLDir, 'tools', 'osx64', 'libtrace.dylib'));
                }
                else if (process.platform === 'win32') {
                    await exec.exec('powershell', [
                        path.resolve(__dirname, '..', 'src', 'inject-tracer.ps1'),
-                        path.resolve(codeql.getDir(), 'tools', 'win64', 'tracer.exe'),
+                        path.resolve(codeQLDir, 'tools', 'win64', 'tracer.exe'),
                    ], { env: { 'ODASA_TRACER_CONFIGURATION': mainTracerConfig.spec } });
                }
                else {
-                    core.exportVariable('LD_PRELOAD', path.join(codeql.getDir(), 'tools', 'linux64', '${LIB}trace.so'));
+                    core.exportVariable('LD_PRELOAD', path.join(codeQLDir, 'tools', 'linux64', '${LIB}trace.so'));
                }
            }
        }
--- a/lib/setup-tracer.js.map
+++ b/lib/setup-tracer.js.map
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -92,6 +92,9 @@ async function uploadPayload(payload, repositoryNwo, githubAuth, githubApiUrl, m
            // We avoid marking the job as failed to avoid breaking CI workflows.
            throw new Error('Upload failed (' + requestID + '): (' + statusCode + ') ' + JSON.stringify(response.data));
        }
+        console.log("X-RateLimit-Limit = " + response.headers["X-RateLimit-Limit"]);
+        console.log("X-RateLimit-Remaining = " + response.headers["X-RateLimit-Remaining"]);
+        throw new Error('Abort here for testing purposes...');
    }
    // This case shouldn't ever happen as the final iteration of the loop
    // will always throw an error instead of exiting to here.
@@ -166,7 +169,7 @@ async function uploadFiles(sarifFiles, repositoryNwo, commitOid, ref, analysisKe
        validateSarifFileSchema(file, logger);
    }
    let sarifPayload = combineSarifFiles(sarifFiles);
-    sarifPayload = fingerprints.addFingerprints(sarifPayload);
+    sarifPayload = fingerprints.addFingerprints(sarifPayload, logger);
    const zipped_sarif = zlib_1.default.gzipSync(sarifPayload).toString('base64');
    let checkoutURI = file_url_1.default(checkoutPath);
    const toolNames = util.getToolNames(sarifPayload);
--- a/lib/upload-lib.js.map
+++ b/lib/upload-lib.js.map
--- a/lib/util.js
+++ b/lib/util.js
@@ -374,8 +374,8 @@ exports.getThreadsFlag = getThreadsFlag;
 /**
 * Get the directory where CodeQL databases should be placed.
 */
-function getCodeQLDatabasesDir() {
-    return path.resolve(getRequiredEnvParam('RUNNER_TEMP'), 'codeql_databases');
+function getCodeQLDatabasesDir(tempDir) {
+    return path.resolve(tempDir, 'codeql_databases');
 }
 exports.getCodeQLDatabasesDir = getCodeQLDatabasesDir;
 //# sourceMappingURL=util.js.map
--- a/lib/util.js.map
+++ b/lib/util.js.map
--- a/queries/unguarded-action-lib.ql
+++ b/queries/unguarded-action-lib.ql
@@ -0,0 +1,108 @@
+/**
+ * @name Unguarded actions library use
+ * @description Code that runs outside of GitHub Actions tries to use a library that should only be used when running on actions.
+ * @kind problem
+ * @problem.severity error
+ * @id javascript/codeql-action/unguarded-action-lib
+ */
+
+import javascript
+
+/**
+ * An import from a library that is meant for GitHub Actions and
+ * we do not want to be using outside of actions.
+ */
+class ActionsLibImport extends ImportDeclaration {
+  ActionsLibImport() {
+    getImportedPath().getValue().matches("@actions/%")
+  }
+
+  string getName() {
+    result = getImportedPath().getValue()
+  }
+
+  Variable getAProvidedVariable() {
+    result = getASpecifier().getLocal().getVariable()
+  }
+}
+
+/**
+ * An entrypoint to the CLI.
+ */
+class ClIEntrypoint extends Function {
+  ClIEntrypoint() {
+    getFile().getAbsolutePath().matches("%/cli.ts")
+  }
+}
+
+/**
+ * A check of whether we are in actions mode or CLI mode.
+ */
+class ModeGuard extends IfStmt {
+  ModeGuard() {
+    getCondition().(EqualityTest).getAnOperand().(StringLiteral).getValue() = "actions" or
+    getCondition().(EqualityTest).getAnOperand().(StringLiteral).getValue() = "cli"
+  }
+
+  string getOperand() {
+    result = getCondition().(EqualityTest).getAnOperand().(StringLiteral).getValue()
+  }
+
+  predicate isPositive() {
+    getCondition().(EqualityTest).getPolarity() = true
+  }
+
+  /**
+   * Get the then or else block that is the "actions" path.
+   */
+  Stmt getActionsBlock() {
+    (getOperand() = "actions" and isPositive() and result = getThen())
+    or
+    (getOperand() = "cli" and not isPositive() and result = getThen())
+    or
+    (getOperand() = "actions" and not isPositive() and result = getElse())
+    or
+    (getOperand() = "cli" and isPositive() and result = getElse())
+  }
+
+  /**
+   * Get an expr that is only executed on actions
+   */
+  Expr getAnActionsExpr() {
+    getActionsBlock().getAChildStmt*().getAChildExpr*() = result
+  }
+}
+
+/**
+ * Any expr that is a transitive child of the given function
+ * and is not only called on actions.
+ */
+Expr getAFunctionChildExpr(Function f) {
+  not exists(ModeGuard guard | guard.getAnActionsExpr() = result) and
+  result.getContainer() = f
+}
+
+/*
+ * Result is a function that is called from the body of the given function `f`
+ * and is not only called on actions.
+ */
+Function calledBy(Function f) {
+  exists(InvokeExpr invokeExpr |
+    invokeExpr = getAFunctionChildExpr(f) and
+    invokeExpr.getResolvedCallee() = result and
+    not exists(ModeGuard guard | guard.getAnActionsExpr() = invokeExpr)
+  )
+  or
+  // Assume outer function causes inner function to be called
+  (result instanceof Expr and
+  result.getEnclosingContainer() = f and
+  not exists(ModeGuard guard | guard.getAnActionsExpr() = result))
+}
+
+from VarAccess v, ActionsLibImport actionsLib, ClIEntrypoint cliEntry 
+where actionsLib.getAProvidedVariable() = v.getVariable()
+  and getAFunctionChildExpr(calledBy*(cliEntry)) = v
+select v, "$@ is imported from $@ and this code can be called from $@",
+  v, v.getName(),
+  actionsLib, actionsLib.getName(),
+  cliEntry, "the CLI"
--- a/src/analysis-paths.test.ts
+++ b/src/analysis-paths.test.ts
@@ -2,33 +2,44 @@ import test from 'ava';

 import * as analysisPaths from './analysis-paths';
 import {setupTests} from './testing-utils';
+import * as util from './util';

 setupTests(test);

 test("emptyPaths", async t => {
-  const config = {
-    languages: [],
-    queries: {},
-    pathsIgnore: [],
-    paths: [],
-    originalUserInput: {},
-  };
-  analysisPaths.includeAndExcludeAnalysisPaths(config);
-  t.is(process.env['LGTM_INDEX_INCLUDE'], undefined);
-  t.is(process.env['LGTM_INDEX_EXCLUDE'], undefined);
-  t.is(process.env['LGTM_INDEX_FILTERS'], undefined);
+  return await util.withTmpDir(async tmpDir => {
+    const config = {
+      languages: [],
+      queries: {},
+      pathsIgnore: [],
+      paths: [],
+      originalUserInput: {},
+      tempDir: tmpDir,
+      toolCacheDir: tmpDir,
+      codeQLCmd: '',
+    };
+    analysisPaths.includeAndExcludeAnalysisPaths(config);
+    t.is(process.env['LGTM_INDEX_INCLUDE'], undefined);
+    t.is(process.env['LGTM_INDEX_EXCLUDE'], undefined);
+    t.is(process.env['LGTM_INDEX_FILTERS'], undefined);
+  });
 });

 test("nonEmptyPaths", async t => {
-  const config = {
-    languages: [],
-    queries: {},
-    paths: ['path1', 'path2', '**/path3'],
-    pathsIgnore: ['path4', 'path5', 'path6/**'],
-    originalUserInput: {},
-  };
-  analysisPaths.includeAndExcludeAnalysisPaths(config);
-  t.is(process.env['LGTM_INDEX_INCLUDE'], 'path1\npath2');
-  t.is(process.env['LGTM_INDEX_EXCLUDE'], 'path4\npath5');
-  t.is(process.env['LGTM_INDEX_FILTERS'], 'include:path1\ninclude:path2\ninclude:**/path3\nexclude:path4\nexclude:path5\nexclude:path6/**');
+  return await util.withTmpDir(async tmpDir => {
+    const config = {
+      languages: [],
+      queries: {},
+      paths: ['path1', 'path2', '**/path3'],
+      pathsIgnore: ['path4', 'path5', 'path6/**'],
+      originalUserInput: {},
+      tempDir: tmpDir,
+      toolCacheDir: tmpDir,
+      codeQLCmd: '',
+    };
+    analysisPaths.includeAndExcludeAnalysisPaths(config);
+    t.is(process.env['LGTM_INDEX_INCLUDE'], 'path1\npath2');
+    t.is(process.env['LGTM_INDEX_EXCLUDE'], 'path4\npath5');
+    t.is(process.env['LGTM_INDEX_FILTERS'], 'include:path1\ninclude:path2\ninclude:**/path3\nexclude:path4\nexclude:path5\nexclude:path6/**');
+  });
 });
--- a/src/autobuild.ts
+++ b/src/autobuild.ts
@@ -1,7 +1,8 @@
 import * as core from '@actions/core';

-import { getCodeQL, isTracedLanguage } from './codeql';
+import { getCodeQL } from './codeql';
 import * as config_utils from './config-utils';
+import { isTracedLanguage } from './languages';
 import * as util from './util';

 interface AutobuildStatusReport extends util.StatusReportBase {
@@ -41,7 +42,7 @@ async function run() {
      return;
    }

-    const config = await config_utils.getConfig();
+    const config = await config_utils.getConfig(util.getRequiredEnvParam('RUNNER_TEMP'));

    // Attempt to find a language to autobuild
    // We want pick the dominant language in the repo from the ones we're able to build
@@ -62,7 +63,7 @@ async function run() {
    }

    core.startGroup(`Attempting to automatically build ${language} code`);
-    const codeQL = getCodeQL();
+    const codeQL = getCodeQL(config.codeQLCmd);
    await codeQL.runAutobuild(language);

    core.endGroup();
--- a/src/codeql.ts
+++ b/src/codeql.ts
@@ -12,6 +12,7 @@ import uuidV4 from 'uuid/v4';

 import * as api from './api-client';
 import * as defaults from './defaults.json'; // Referenced from codeql-action-sync-tool!
+import { Language } from './languages';
 import * as util from './util';

 type Options = (string|number|boolean)[];
@@ -37,9 +38,9 @@ interface ExtraOptions {

 export interface CodeQL {
  /**
-   * Get the directory where the CodeQL executable is located.
+   * Get the path of the CodeQL executable.
   */
-  getDir(): string;
+  getPath(): string;
  /**
   * Print version information about CodeQL.
   */
@@ -52,16 +53,16 @@ export interface CodeQL {
  /**
   * Run 'codeql database init'.
   */
-  databaseInit(databasePath: string, language: string, sourceRoot: string): Promise<void>;
+  databaseInit(databasePath: string, language: Language, sourceRoot: string): Promise<void>;
  /**
   * Runs the autobuilder for the given language.
   */
-  runAutobuild(language: string): Promise<void>;
+  runAutobuild(language: Language): Promise<void>;
  /**
   * Extract code for a scanned language using 'codeql database trace-command'
   * and running the language extracter.
   */
-  extractScannedLanguage(database: string, language: string): Promise<void>;
+  extractScannedLanguage(database: string, language: Language): Promise<void>;
  /**
   * Finalize a database using 'codeql database finalize'.
   */
@@ -96,12 +97,6 @@ export interface ResolveQueriesOutput {
 */
 let cachedCodeQL: CodeQL | undefined = 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";
@@ -219,7 +214,6 @@ export async function setupCodeQL(): Promise<CodeQL> {
    }

    cachedCodeQL = getCodeQLForCmd(codeqlCmd);
-    core.exportVariable(CODEQL_ACTION_CMD, codeqlCmd);
    return cachedCodeQL;

  } catch (e) {
@@ -250,16 +244,24 @@ export function getCodeQLURLVersion(url: string): string {
  return s;
 }

-export function getCodeQL(): CodeQL {
+/**
+ * Use the CodeQL executable located at the given path.
+ */
+export function getCodeQL(cmd: string): CodeQL {
  if (cachedCodeQL === undefined) {
-    const codeqlCmd = util.getRequiredEnvParam(CODEQL_ACTION_CMD);
-    cachedCodeQL = getCodeQLForCmd(codeqlCmd);
+    cachedCodeQL = getCodeQLForCmd(cmd);
  }
  return cachedCodeQL;
 }

-function resolveFunction<T>(partialCodeql: Partial<CodeQL>, methodName: string): T {
+function resolveFunction<T>(
+  partialCodeql: Partial<CodeQL>,
+  methodName: string,
+  defaultImplementation?: T): T {
  if (typeof partialCodeql[methodName] !== 'function') {
+    if (defaultImplementation !== undefined) {
+      return defaultImplementation;
+    }
    const dummyMethod = () => {
      throw new Error('CodeQL ' + methodName + ' method not correctly defined');
    };
@@ -274,9 +276,9 @@ function resolveFunction<T>(partialCodeql: Partial<CodeQL>, methodName: string):
 * Accepts a partial object and any undefined methods will be implemented
 * to immediately throw an exception indicating which method is missing.
 */
-export function setCodeQL(partialCodeql: Partial<CodeQL>) {
+export function setCodeQL(partialCodeql: Partial<CodeQL>): CodeQL {
  cachedCodeQL = {
-    getDir: resolveFunction(partialCodeql, 'getDir'),
+    getPath: resolveFunction(partialCodeql, 'getPath', () => '/tmp/dummy-path'),
    printVersion: resolveFunction(partialCodeql, 'printVersion'),
    getTracerEnv: resolveFunction(partialCodeql, 'getTracerEnv'),
    databaseInit: resolveFunction(partialCodeql, 'databaseInit'),
@@ -286,12 +288,27 @@ export function setCodeQL(partialCodeql: Partial<CodeQL>) {
    resolveQueries: resolveFunction(partialCodeql, 'resolveQueries'),
    databaseAnalyze: resolveFunction(partialCodeql, 'databaseAnalyze')
  };
+  return cachedCodeQL;
+}
+
+/**
+ * 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.
+ */
+export function getCachedCodeQL(): CodeQL {
+  if (cachedCodeQL === undefined) {
+    // Should never happen as setCodeQL is called by testing-utils.setupTests
+    throw new Error('cachedCodeQL undefined');
+  }
+  return cachedCodeQL;
 }

 function getCodeQLForCmd(cmd: string): CodeQL {
  return {
-    getDir: function() {
-      return path.dirname(cmd);
+    getPath: function() {
+      return cmd;
    },
    printVersion: async function() {
      await exec.exec(cmd, [
@@ -314,7 +331,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
      ]);
      return JSON.parse(fs.readFileSync(envFile, 'utf-8'));
    },
-    databaseInit: async function(databasePath: string, language: string, sourceRoot: string) {
+    databaseInit: async function(databasePath: string, language: Language, sourceRoot: string) {
      await exec.exec(cmd, [
        'database',
        'init',
@@ -324,7 +341,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
        ...getExtraOptionsFromEnv(['database', 'init']),
      ]);
    },
-    runAutobuild: async function(language: string) {
+    runAutobuild: async function(language: Language) {
      const cmdName = process.platform === 'win32' ? 'autobuild.cmd' : 'autobuild.sh';
      const autobuildCmd = path.join(path.dirname(cmd), language, 'tools', cmdName);

@@ -338,7 +355,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {

      await exec.exec(autobuildCmd);
    },
-    extractScannedLanguage: async function(databasePath: string, language: string) {
+    extractScannedLanguage: async function(databasePath: string, language: Language) {
      // Get extractor location
      let extractorPath = '';
      await exec.exec(
@@ -419,14 +436,6 @@ function getCodeQLForCmd(cmd: string): CodeQL {
  };
 }

-export function isTracedLanguage(language: string): boolean {
-  return ['cpp', 'java', 'csharp'].includes(language);
-}
-
-export function isScannedLanguage(language: string): boolean {
-  return !isTracedLanguage(language);
-}
-
 /**
 * Gets the options for `path` of `options` as an array of extra option strings.
 */
--- a/src/config-utils.test.ts
+++ b/src/config-utils.test.ts
@@ -5,8 +5,9 @@ import * as path from 'path';
 import sinon from 'sinon';

 import * as api from './api-client';
-import * as CodeQL from './codeql';
+import { getCachedCodeQL, setCodeQL } from './codeql';
 import * as configUtils from './config-utils';
+import { Language } from "./languages";
 import {setupTests} from './testing-utils';
 import * as util from './util';

@@ -57,7 +58,7 @@ test("load empty config", async t => {
    setInput('config-file', undefined);
    setInput('languages', 'javascript,python');

-    CodeQL.setCodeQL({
+    const codeQL = setCodeQL({
      resolveQueries: async function() {
        return {
          byLanguage: {},
@@ -67,9 +68,9 @@ test("load empty config", async t => {
      },
    });

-    const config = await configUtils.initConfig();
+    const config = await configUtils.initConfig(tmpDir, tmpDir, codeQL);

-    t.deepEqual(config, await configUtils.getDefaultConfig());
+    t.deepEqual(config, await configUtils.getDefaultConfig(tmpDir, tmpDir, codeQL));
  });
 });

@@ -81,7 +82,7 @@ test("loading config saves config", async t => {
    setInput('config-file', undefined);
    setInput('languages', 'javascript,python');

-    CodeQL.setCodeQL({
+    const codeQL = setCodeQL({
      resolveQueries: async function() {
        return {
          byLanguage: {},
@@ -93,18 +94,18 @@ test("loading config saves config", async t => {


    // Sanity check the saved config file does not already exist
-    t.false(fs.existsSync(configUtils.getPathToParsedConfigFile()));
+    t.false(fs.existsSync(configUtils.getPathToParsedConfigFile(tmpDir)));

    // Sanity check that getConfig throws before we have called initConfig
-    await t.throwsAsync(configUtils.getConfig);
+    await t.throwsAsync(() => configUtils.getConfig(tmpDir));

-    const config1 = await configUtils.initConfig();
+    const config1 = await configUtils.initConfig(tmpDir, tmpDir, codeQL);

    // The saved config file should now exist
-    t.true(fs.existsSync(configUtils.getPathToParsedConfigFile()));
+    t.true(fs.existsSync(configUtils.getPathToParsedConfigFile(tmpDir)));

    // And that same newly-initialised config should now be returned by getConfig
-    const config2 = await configUtils.getConfig();
+    const config2 = await configUtils.getConfig(tmpDir);
    t.deepEqual(config1, config2);
  });
 });
@@ -117,7 +118,7 @@ test("load input outside of workspace", async t => {
    setInput('config-file', '../input');

    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getConfigFileOutsideWorkspaceErrorMessage(path.join(tmpDir, '../input'))));
@@ -134,7 +135,7 @@ test("load non-local input with invalid repo syntax", async t => {
    setInput('config-file', 'octo-org/codeql-config@main');

    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getConfigFileRepoFormatInvalidMessage('octo-org/codeql-config@main')));
@@ -152,7 +153,7 @@ test("load non-existent input", async t => {
    setInput('languages', 'javascript');

    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getConfigFileDoesNotExistErrorMessage(path.join(tmpDir, 'input'))));
@@ -165,7 +166,7 @@ test("load non-empty input", async t => {
    process.env['RUNNER_TEMP'] = tmpDir;
    process.env['GITHUB_WORKSPACE'] = tmpDir;

-    CodeQL.setCodeQL({
+    const codeQL = setCodeQL({
      resolveQueries: async function() {
        return {
          byLanguage: {
@@ -196,7 +197,7 @@ test("load non-empty input", async t => {

    // And the config we expect it to parse to
    const expectedConfig: configUtils.Config = {
-      languages: ['javascript'],
+      languages: [Language.javascript],
      queries: {'javascript': ['/foo/a.ql', '/bar/b.ql']},
      pathsIgnore: ['a', 'b'],
      paths: ['c/d'],
@@ -207,13 +208,16 @@ test("load non-empty input", async t => {
        'paths-ignore': ['a', 'b'],
        paths: ['c/d'],
      },
+      tempDir: tmpDir,
+      toolCacheDir: tmpDir,
+      codeQLCmd: codeQL.getPath(),
    };

    fs.writeFileSync(path.join(tmpDir, 'input'), inputFileContents, 'utf8');
    setInput('config-file', 'input');
    setInput('languages', 'javascript');

-    const actualConfig = await configUtils.initConfig();
+    const actualConfig = await configUtils.initConfig(tmpDir, tmpDir, codeQL);

    // Should exactly equal the object we constructed earlier
    t.deepEqual(actualConfig, expectedConfig);
@@ -232,7 +236,7 @@ test("default queries are used", async t => {
    // with the correct arguments.

    const resolveQueriesArgs: {queries: string[], extraSearchPath: string | undefined}[] = [];
-    CodeQL.setCodeQL({
+    const codeQL = setCodeQL({
      resolveQueries: async function(queries: string[], extraSearchPath: string | undefined) {
        resolveQueriesArgs.push({queries, extraSearchPath});
        return {
@@ -260,7 +264,7 @@ test("default queries are used", async t => {
    setInput('config-file', 'input');
    setInput('languages', 'javascript');

-    await configUtils.initConfig();
+    await configUtils.initConfig(tmpDir, tmpDir, codeQL);

    // Check resolve queries was called correctly
    t.deepEqual(resolveQueriesArgs.length, 1);
@@ -274,7 +278,7 @@ test("API client used when reading remote config", async t => {
    process.env['RUNNER_TEMP'] = tmpDir;
    process.env['GITHUB_WORKSPACE'] = tmpDir;

-    CodeQL.setCodeQL({
+    const codeQL = setCodeQL({
      resolveQueries: async function() {
        return {
          byLanguage: {
@@ -311,7 +315,7 @@ test("API client used when reading remote config", async t => {
    setInput('config-file', 'octo-org/codeql-config/config.yaml@main');
    setInput('languages', 'javascript');

-    await configUtils.initConfig();
+    await configUtils.initConfig(tmpDir, tmpDir, codeQL);
    t.assert(spyGetContents.called);
  });
 });
@@ -327,7 +331,7 @@ test("Remote config handles the case where a directory is provided", async t =>
    const repoReference = 'octo-org/codeql-config/config.yaml@main';
    setInput('config-file', repoReference);
    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getConfigFileDirectoryGivenMessage(repoReference)));
@@ -348,7 +352,7 @@ test("Invalid format of remote config handled correctly", async t => {
    const repoReference = 'octo-org/codeql-config/config.yaml@main';
    setInput('config-file', repoReference);
    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getConfigFileFormatInvalidMessage(repoReference)));
@@ -364,7 +368,7 @@ test("No detected languages", async t => {
    mockListLanguages([]);

    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getNoLanguagesError()));
@@ -380,7 +384,7 @@ test("Unknown languages", async t => {
    setInput('languages', 'ruby,english');

    try {
-      await configUtils.initConfig();
+      await configUtils.initConfig(tmpDir, tmpDir, getCachedCodeQL());
      throw new Error('initConfig did not throw error');
    } catch (err) {
      t.deepEqual(err, new Error(configUtils.getUnknownLanguagesError(['ruby', 'english'])));
@@ -398,7 +402,7 @@ function doInvalidInputTest(
      process.env['RUNNER_TEMP'] = tmpDir;
      process.env['GITHUB_WORKSPACE'] = tmpDir;

-      CodeQL.setCodeQL({
+      const codeQL = setCodeQL({
        resolveQueries: async function() {
          return {
            byLanguage: {},
@@ -414,7 +418,7 @@ function doInvalidInputTest(
      setInput('languages', 'javascript');

      try {
-        await configUtils.initConfig();
+        await configUtils.initConfig(tmpDir, tmpDir, codeQL);
        throw new Error('initConfig did not throw error');
      } catch (err) {
        t.deepEqual(err, new Error(expectedErrorMessageGenerator(inputFile)));
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -4,8 +4,9 @@ import * as yaml from 'js-yaml';
 import * as path from 'path';

 import * as api from './api-client';
-import { getCodeQL, ResolveQueriesOutput } from './codeql';
+import { CodeQL, ResolveQueriesOutput } from './codeql';
 import * as externalQueries from "./external-queries";
+import { Language, parseLanguage } from "./languages";
 import * as util from './util';

 // Property names from the user-supplied config file.
@@ -16,16 +17,6 @@ const QUERIES_USES_PROPERTY = 'uses';
 const PATHS_IGNORE_PROPERTY = 'paths-ignore';
 const PATHS_PROPERTY = 'paths';

-// All the languages supported by CodeQL
-const ALL_LANGUAGES = ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] as const;
-type Language = (typeof ALL_LANGUAGES)[number];
-
-// Some alternate names for languages
-const LANGUAGE_ALIASES: {[name: string]: Language} = {
-  'c': 'cpp',
-  'typescript': 'javascript',
-};
-
 /**
 * Format of the config file supplied by the user.
 */
@@ -70,6 +61,20 @@ export interface Config {
   * top-level field above.
   */
  originalUserInput: UserConfig;
+  /**
+   * Directory to use for temporary files that should be
+   * deleted at the end of the job.
+   */
+  tempDir: string;
+  /**
+   * Directory to use for the tool cache.
+   * This may be persisted between jobs but this is not guaranteed.
+   */
+  toolCacheDir: string;
+  /**
+   * Path of the CodeQL executable.
+   */
+  codeQLCmd: string;
 }

 /**
@@ -119,13 +124,13 @@ function validateQueries(resolvedQueries: ResolveQueriesOutput) {
 * Run 'codeql resolve queries' and add the results to resultMap
 */
 async function runResolveQueries(
+  codeQL: CodeQL,
  resultMap: { [language: string]: string[] },
  toResolve: string[],
  extraSearchPath: string | undefined,
  errorOnInvalidQueries: boolean) {

-  const codeQl = getCodeQL();
-  const resolvedQueries = await codeQl.resolveQueries(toResolve, extraSearchPath);
+  const resolvedQueries = await codeQL.resolveQueries(toResolve, extraSearchPath);

  for (const [language, queries] of Object.entries(resolvedQueries.byLanguage)) {
    if (resultMap[language] === undefined) {
@@ -142,9 +147,9 @@ async function runResolveQueries(
 /**
 * Get the set of queries included by default.
 */
-async function addDefaultQueries(languages: string[], resultMap: { [language: string]: string[] }) {
+async function addDefaultQueries(codeQL: CodeQL, languages: string[], resultMap: { [language: string]: string[] }) {
  const suites = languages.map(l => l + '-code-scanning.qls');
-  await runResolveQueries(resultMap, suites, undefined, false);
+  await runResolveQueries(codeQL, resultMap, suites, undefined, false);
 }

 // The set of acceptable values for built-in suites from the codeql bundle
@@ -157,6 +162,7 @@ const builtinSuites = ['security-extended', 'security-and-quality'] as const;
 async function addBuiltinSuiteQueries(
  configFile: string,
  languages: string[],
+  codeQL: CodeQL,
  resultMap: { [language: string]: string[] },
  suiteName: string) {

@@ -166,7 +172,7 @@ async function addBuiltinSuiteQueries(
  }

  const suites = languages.map(l => l + '-' + suiteName + '.qls');
-  await runResolveQueries(resultMap, suites, undefined, false);
+  await runResolveQueries(codeQL, resultMap, suites, undefined, false);
 }

 /**
@@ -174,6 +180,7 @@ async function addBuiltinSuiteQueries(
 */
 async function addLocalQueries(
  configFile: string,
+  codeQL: CodeQL,
  resultMap: { [language: string]: string[] },
  localQueryPath: string) {

@@ -198,13 +205,19 @@ async function addLocalQueries(
  // Get the root of the current repo to use when resolving query dependencies
  const rootOfRepo = util.getRequiredEnvParam('GITHUB_WORKSPACE');

-  await runResolveQueries(resultMap, [absoluteQueryPath], rootOfRepo, true);
+  await runResolveQueries(codeQL, resultMap, [absoluteQueryPath], rootOfRepo, true);
 }

 /**
 * Retrieve the set of queries at the referenced remote repo and add them to resultMap.
 */
-async function addRemoteQueries(configFile: string, resultMap: { [language: string]: string[] }, queryUses: string) {
+async function addRemoteQueries(
+  configFile: string,
+  codeQL: CodeQL,
+  resultMap: { [language: string]: string[] },
+  queryUses: string,
+  tempDir: string) {
+
  let tok = queryUses.split('@');
  if (tok.length !== 2) {
    throw new Error(getQueryUsesInvalid(configFile, queryUses));
@@ -226,13 +239,13 @@ async function addRemoteQueries(configFile: string, resultMap: { [language: stri
  const nwo = tok[0] + '/' + tok[1];

  // Checkout the external repository
-  const rootOfRepo = await externalQueries.checkoutExternalRepository(nwo, ref);
+  const rootOfRepo = await externalQueries.checkoutExternalRepository(nwo, ref, tempDir);

  const queryPath = tok.length > 2
    ? path.join(rootOfRepo, tok.slice(2).join('/'))
    : rootOfRepo;

-  await runResolveQueries(resultMap, [queryPath], rootOfRepo, true);
+  await runResolveQueries(codeQL, resultMap, [queryPath], rootOfRepo, true);
 }

 /**
@@ -246,8 +259,10 @@ async function addRemoteQueries(configFile: string, resultMap: { [language: stri
 async function parseQueryUses(
  configFile: string,
  languages: string[],
+  codeQL: CodeQL,
  resultMap: { [language: string]: string[] },
-  queryUses: string) {
+  queryUses: string,
+  tempDir: string) {

  queryUses = queryUses.trim();
  if (queryUses === "") {
@@ -256,18 +271,18 @@ async function parseQueryUses(

  // Check for the local path case before we start trying to parse the repository name
  if (queryUses.startsWith("./")) {
-    await addLocalQueries(configFile, resultMap, queryUses.slice(2));
+    await addLocalQueries(configFile, codeQL, resultMap, queryUses.slice(2));
    return;
  }

  // Check for one of the builtin suites
  if (queryUses.indexOf('/') === -1 && queryUses.indexOf('@') === -1) {
-    await addBuiltinSuiteQueries(configFile, languages, resultMap, queryUses);
+    await addBuiltinSuiteQueries(configFile, languages, codeQL, resultMap, queryUses);
    return;
  }

  // Otherwise, must be a reference to another repo
-  await addRemoteQueries(configFile, resultMap, queryUses);
+  await addRemoteQueries(configFile, codeQL, resultMap, queryUses, tempDir);
 }

 // Regex validating stars in paths or paths-ignore entries.
@@ -424,17 +439,6 @@ export function getUnknownLanguagesError(languages: string[]): string {
 * Gets the set of languages in the current repository
 */
 async function getLanguagesInRepo(): Promise<Language[]> {
-  // Translate between GitHub's API names for languages and ours
-  const codeqlLanguages: {[lang: string]: Language} = {
-    'C': 'cpp',
-    'C++': 'cpp',
-    'C#': 'csharp',
-    'Go': 'go',
-    'Java': 'java',
-    'JavaScript': 'javascript',
-    'TypeScript': 'javascript',
-    'Python': 'python',
-  };
  let repo_nwo = process.env['GITHUB_REPOSITORY']?.split("/");
  if (repo_nwo) {
    let owner = repo_nwo[0];
@@ -453,9 +457,10 @@ async function getLanguagesInRepo(): Promise<Language[]> {
    // Since sets in javascript maintain insertion order, using a set here and then splatting it
    // into an array gives us an array of languages ordered by popularity
    let languages: Set<Language> = new Set();
-    for (let lang in response.data) {
-      if (lang in codeqlLanguages) {
-        languages.add(codeqlLanguages[lang]);
+    for (let lang of Object.keys(response.data)) {
+      let parsedLang = parseLanguage(lang);
+      if (parsedLang !== undefined) {
+        languages.add(parsedLang);
      }
    }
    return [...languages];
@@ -496,50 +501,46 @@ async function getLanguages(): Promise<Language[]> {
  }

  // Make sure they are supported
-  const checkedLanguages: Language[] = [];
+  const parsedLanguages: Language[] = [];
  const unknownLanguages: string[] = [];
  for (let language of languages) {
-    // Normalise to lower case
-    language = language.toLowerCase();
-    // Resolve any known aliases
-    if (language in LANGUAGE_ALIASES) {
-      language = LANGUAGE_ALIASES[language];
-    }
-
-    const checkedLanguage = ALL_LANGUAGES.find(l => l === language);
-    if (checkedLanguage === undefined) {
+    const parsedLanguage = parseLanguage(language);
+    if (parsedLanguage === undefined) {
      unknownLanguages.push(language);
-    } else if (checkedLanguages.indexOf(checkedLanguage) === -1) {
-      checkedLanguages.push(checkedLanguage);
+    } else if (parsedLanguages.indexOf(parsedLanguage) === -1) {
+      parsedLanguages.push(parsedLanguage);
    }
  }
  if (unknownLanguages.length > 0) {
    throw new Error(getUnknownLanguagesError(unknownLanguages));
  }

-  return checkedLanguages;
+  return parsedLanguages;
 }

 /**
 * Get the default config for when the user has not supplied one.
 */
-export async function getDefaultConfig(): Promise<Config> {
+export async function getDefaultConfig(tempDir: string, toolCacheDir: string, codeQL: CodeQL): Promise<Config> {
  const languages = await getLanguages();
  const queries = {};
-  await addDefaultQueries(languages, queries);
+  await addDefaultQueries(codeQL, languages, queries);
  return {
    languages: languages,
    queries: queries,
    pathsIgnore: [],
    paths: [],
    originalUserInput: {},
+    tempDir,
+    toolCacheDir,
+    codeQLCmd: codeQL.getPath(),
  };
 }

 /**
 * Load the config from the given file.
 */
-async function loadConfig(configFile: string): Promise<Config> {
+async function loadConfig(configFile: string, tempDir: string, toolCacheDir: string, codeQL: CodeQL): Promise<Config> {
  let parsedYAML: UserConfig;

  if (isLocal(configFile)) {
@@ -577,7 +578,7 @@ async function loadConfig(configFile: string): Promise<Config> {
    disableDefaultQueries = parsedYAML[DISABLE_DEFAULT_QUERIES_PROPERTY]!;
  }
  if (!disableDefaultQueries) {
-    await addDefaultQueries(languages, queries);
+    await addDefaultQueries(codeQL, languages, queries);
  }

  if (QUERIES_PROPERTY in parsedYAML) {
@@ -588,7 +589,7 @@ async function loadConfig(configFile: string): Promise<Config> {
      if (!(QUERIES_USES_PROPERTY in query) || typeof query[QUERIES_USES_PROPERTY] !== "string") {
        throw new Error(getQueryUsesInvalid(configFile));
      }
-      await parseQueryUses(configFile, languages, queries, query[QUERIES_USES_PROPERTY]);
+      await parseQueryUses(configFile, languages, codeQL, queries, query[QUERIES_USES_PROPERTY], tempDir);
    }
  }

@@ -630,7 +631,10 @@ async function loadConfig(configFile: string): Promise<Config> {
    queries,
    pathsIgnore,
    paths,
-    originalUserInput: parsedYAML
+    originalUserInput: parsedYAML,
+    tempDir,
+    toolCacheDir,
+    codeQLCmd: codeQL.getPath(),
  };
 }

@@ -640,16 +644,16 @@ async function loadConfig(configFile: string): Promise<Config> {
 * This will parse the config from the user input if present, or generate
 * a default config. The parsed config is then stored to a known location.
 */
-export async function initConfig(): Promise<Config> {
+export async function initConfig(tempDir: string, toolCacheDir: string, codeQL: CodeQL): Promise<Config> {
  const configFile = core.getInput('config-file');
  let config: Config;

  // If no config file was provided create an empty one
  if (configFile === '') {
    core.debug('No configuration file was provided');
-    config = await getDefaultConfig();
+    config = await getDefaultConfig(tempDir, toolCacheDir, codeQL);
  } else {
-    config = await loadConfig(configFile);
+    config = await loadConfig(configFile, tempDir, toolCacheDir, codeQL);
  }

  // Save the config so we can easily access it again in the future
@@ -711,8 +715,8 @@ async function getRemoteConfig(configFile: string): Promise<UserConfig> {
 /**
 * Get the file path where the parsed config will be stored.
 */
-export function getPathToParsedConfigFile(): string {
-  return path.join(util.getRequiredEnvParam('RUNNER_TEMP'), 'config');
+export function getPathToParsedConfigFile(tempDir: string): string {
+  return path.join(tempDir, 'config');
 }

 /**
@@ -720,7 +724,7 @@ export function getPathToParsedConfigFile(): string {
 */
 async function saveConfig(config: Config) {
  const configString = JSON.stringify(config);
-  const configFile = getPathToParsedConfigFile();
+  const configFile = getPathToParsedConfigFile(config.tempDir);
  fs.mkdirSync(path.dirname(configFile), { recursive: true });
  fs.writeFileSync(configFile, configString, 'utf8');
  core.debug('Saved config:');
@@ -735,8 +739,8 @@ async function saveConfig(config: Config) {
 * stored to a known location. On the second and further calls, this will
 * return the contents of the parsed config from the known location.
 */
-export async function getConfig(): Promise<Config> {
-  const configFile = getPathToParsedConfigFile();
+export async function getConfig(tempDir: string): Promise<Config> {
+  const configFile = getPathToParsedConfigFile(tempDir);
  if (!fs.existsSync(configFile)) {
    throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
  }
--- a/src/external-queries.test.ts
+++ b/src/external-queries.test.ts
@@ -10,8 +10,10 @@ setupTests(test);

 test("checkoutExternalQueries", async t => {
  await util.withTmpDir(async tmpDir => {
-    process.env["RUNNER_TEMP"] = tmpDir;
-    await externalQueries.checkoutExternalRepository("github/codeql-go", "df4c6869212341b601005567381944ed90906b6b");
+    await externalQueries.checkoutExternalRepository(
+      "github/codeql-go",
+      "df4c6869212341b601005567381944ed90906b6b",
+      tmpDir);

    // COPYRIGHT file existed in df4c6869212341b601005567381944ed90906b6b but not in the default branch
    t.true(fs.existsSync(path.join(tmpDir, "github", "codeql-go", "COPYRIGHT")));
--- a/src/external-queries.ts
+++ b/src/external-queries.ts
@@ -3,17 +3,13 @@ import * as exec from '@actions/exec';
 import * as fs from 'fs';
 import * as path from 'path';

-import * as util from './util';
-
 /**
 * Check out repository at the given ref, and return the directory of the checkout.
 */
-export async function checkoutExternalRepository(repository: string, ref: string): Promise<string> {
-  const folder = util.getRequiredEnvParam('RUNNER_TEMP');
-
+export async function checkoutExternalRepository(repository: string, ref: string, tempDir: string): Promise<string> {
  core.info('Checking out ' + repository);

-  const checkoutLocation = path.join(folder, repository);
+  const checkoutLocation = path.join(tempDir, repository);
  if (!fs.existsSync(checkoutLocation)) {
    const repoURL = 'https://github.com/' + repository + '.git';
    await exec.exec('git', ['clone', repoURL, checkoutLocation]);
--- a/src/finalize-db.ts
+++ b/src/finalize-db.ts
@@ -2,8 +2,9 @@ import * as core from '@actions/core';
 import * as fs from 'fs';
 import * as path from 'path';

-import { getCodeQL, isScannedLanguage } from './codeql';
+import { getCodeQL } from './codeql';
 import * as configUtils from './config-utils';
+import { isScannedLanguage } from './languages';
 import { getActionsLogger } from './logging';
 import { parseRepositoryNwo } from './repository';
 import * as sharedEnv from './shared-environment';
@@ -58,7 +59,7 @@ async function sendStatusReport(
 }

 async function createdDBForScannedLanguages(databaseFolder: string, config: configUtils.Config) {
-  const codeql = getCodeQL();
+  const codeql = getCodeQL(config.codeQLCmd);
  for (const language of config.languages) {
    if (isScannedLanguage(language)) {
      core.startGroup('Extracting ' + language);
@@ -71,7 +72,7 @@ async function createdDBForScannedLanguages(databaseFolder: string, config: conf
 async function finalizeDatabaseCreation(databaseFolder: string, config: configUtils.Config) {
  await createdDBForScannedLanguages(databaseFolder, config);

-  const codeql = getCodeQL();
+  const codeql = getCodeQL(config.codeQLCmd);
  for (const language of config.languages) {
    core.startGroup('Finalizing ' + language);
    await codeql.finalizeDatabase(path.join(databaseFolder, language));
@@ -85,7 +86,7 @@ async function runQueries(
  sarifFolder: string,
  config: configUtils.Config): Promise<QueriesStatusReport> {

-  const codeql = getCodeQL();
+  const codeql = getCodeQL(config.codeQLCmd);
  for (let language of fs.readdirSync(databaseFolder)) {
    core.startGroup('Analyzing ' + language);

@@ -129,12 +130,12 @@ async function run() {
    if (!await util.sendStatusReport(await util.createStatusReportBase('finish', 'starting', startedAt), true)) {
      return;
    }
-    const config = await configUtils.getConfig();
+    const config = await configUtils.getConfig(util.getRequiredEnvParam('RUNNER_TEMP'));

    core.exportVariable(sharedEnv.ODASA_TRACER_CONFIGURATION, '');
    delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION];

-    const databaseFolder = util.getCodeQLDatabasesDir();
+    const databaseFolder = util.getCodeQLDatabasesDir(config.tempDir);

    const sarifFolder = core.getInput('output');
    fs.mkdirSync(sarifFolder, { recursive: true });
@@ -163,7 +164,7 @@ async function run() {
    }

  } catch (error) {
-    // core.setFailed(error.message);
+    core.setFailed(error.message);
    console.log(error);
    await sendStatusReport(startedAt, queriesStats, uploadStats, error);
    return;
--- a/src/fingerprints.test.ts
+++ b/src/fingerprints.test.ts
@@ -4,6 +4,7 @@ import * as fs from 'fs';
 import * as path from 'path';

 import * as fingerprints from './fingerprints';
+import { getCLILogger } from './logging';
 import {setupTests} from './testing-utils';

 setupTests(test);
@@ -115,7 +116,7 @@ test('hash', (t: ava.Assertions) => {
 function testResolveUriToFile(uri: any, index: any, artifactsURIs: any[]) {
  const location = { "uri": uri, "index": index };
  const artifacts = artifactsURIs.map(uri => ({ "location": { "uri": uri } }));
-  return fingerprints.resolveUriToFile(location, artifacts);
+  return fingerprints.resolveUriToFile(location, artifacts, getCLILogger());
 }

 test('resolveUriToFile', t => {
@@ -174,7 +175,7 @@ test('addFingerprints', t => {
  // The URIs in the SARIF files resolve to files in the testdata directory
  process.env['GITHUB_WORKSPACE'] = path.normalize(__dirname + '/../src/testdata');

-  t.deepEqual(fingerprints.addFingerprints(input), expected);
+  t.deepEqual(fingerprints.addFingerprints(input, getCLILogger()), expected);
 });

 test('missingRegions', t => {
@@ -189,5 +190,5 @@ test('missingRegions', t => {
  // The URIs in the SARIF files resolve to files in the testdata directory
  process.env['GITHUB_WORKSPACE'] = path.normalize(__dirname + '/../src/testdata');

-  t.deepEqual(fingerprints.addFingerprints(input), expected);
+  t.deepEqual(fingerprints.addFingerprints(input, getCLILogger()), expected);
 });
--- a/src/fingerprints.ts
+++ b/src/fingerprints.ts
@@ -1,7 +1,8 @@
-import * as core from '@actions/core';
 import * as fs from 'fs';
 import Long from 'long';

+import { Logger } from './logging';
+
 const tab = '\t'.charCodeAt(0);
 const space = ' '.charCodeAt(0);
 const lf = '\n'.charCodeAt(0);
@@ -124,7 +125,7 @@ export function hash(callback: hashCallback, input: string) {

 // Generate a hash callback function that updates the given result in-place
 // when it recieves a hash for the correct line number. Ignores hashes for other lines.
-function locationUpdateCallback(result: any, location: any): hashCallback {
+function locationUpdateCallback(result: any, location: any, logger: Logger): hashCallback {
  let locationStartLine = location.physicalLocation?.region?.startLine;
  if (locationStartLine === undefined) {
    // We expect the region section to be present, but it can be absent if the
@@ -148,7 +149,7 @@ function locationUpdateCallback(result: any, location: any): hashCallback {
    if (!existingFingerprint) {
      result.partialFingerprints.primaryLocationLineHash = hash;
    } else if (existingFingerprint !== hash) {
-      core.warning('Calculated fingerprint of ' + hash +
+      logger.warning('Calculated fingerprint of ' + hash +
        ' for file ' + location.physicalLocation.artifactLocation.uri +
        ' line ' + lineNumber +
        ', but found existing inconsistent fingerprint value ' + existingFingerprint);
@@ -160,14 +161,14 @@ function locationUpdateCallback(result: any, location: any): hashCallback {
 // the source file so we can hash it.
 // If possible returns a absolute file path for the source file,
 // or if not possible then returns undefined.
-export function resolveUriToFile(location: any, artifacts: any[]): string | undefined {
+export function resolveUriToFile(location: any, artifacts: any[], logger: Logger): string | undefined {
  // This may be referencing an artifact
  if (!location.uri && location.index !== undefined) {
    if (typeof location.index !== 'number' ||
      location.index < 0 ||
      location.index >= artifacts.length ||
      typeof artifacts[location.index].location !== 'object') {
-      core.debug(`Ignoring location as URI "${location.index}" is invalid`);
+      logger.debug(`Ignoring location as URI "${location.index}" is invalid`);
      return undefined;
    }
    location = artifacts[location.index].location;
@@ -175,7 +176,7 @@ export function resolveUriToFile(location: any, artifacts: any[]): string | unde

  // Get the URI and decode
  if (typeof location.uri !== 'string') {
-    core.debug(`Ignoring location as index "${location.uri}" is invalid`);
+    logger.debug(`Ignoring location as index "${location.uri}" is invalid`);
    return undefined;
  }
  let uri = decodeURIComponent(location.uri);
@@ -186,14 +187,14 @@ export function resolveUriToFile(location: any, artifacts: any[]): string | unde
    uri = uri.substring(fileUriPrefix.length);
  }
  if (uri.indexOf('://') !== -1) {
-    core.debug(`Ignoring location URI "${uri}" as the scheme is not recognised`);
+    logger.debug(`Ignoring location URI "${uri}" as the scheme is not recognised`);
    return undefined;
  }

  // Discard any absolute paths that aren't in the src root
  const srcRootPrefix = process.env['GITHUB_WORKSPACE'] + '/';
  if (uri.startsWith('/') && !uri.startsWith(srcRootPrefix)) {
-    core.debug(`Ignoring location URI "${uri}" as it is outside of the src root`);
+    logger.debug(`Ignoring location URI "${uri}" as it is outside of the src root`);
    return undefined;
  }

@@ -206,7 +207,7 @@ export function resolveUriToFile(location: any, artifacts: any[]): string | unde

  // Check the file exists
  if (!fs.existsSync(uri)) {
-    core.debug(`Unable to compute fingerprint for non-existent file: ${uri}`);
+    logger.debug(`Unable to compute fingerprint for non-existent file: ${uri}`);
    return undefined;
  }

@@ -215,7 +216,7 @@ export function resolveUriToFile(location: any, artifacts: any[]): string | unde

 // Compute fingerprints for results in the given sarif file
 // and return an updated sarif file contents.
-export function addFingerprints(sarifContents: string): string {
+export function addFingerprints(sarifContents: string, logger: Logger): string {
  let sarif = JSON.parse(sarifContents);

  // Gather together results for the same file and construct
@@ -229,18 +230,18 @@ export function addFingerprints(sarifContents: string): string {
      // Check the primary location is defined correctly and is in the src root
      const primaryLocation = (result.locations || [])[0];
      if (!primaryLocation?.physicalLocation?.artifactLocation) {
-        core.debug(`Unable to compute fingerprint for invalid location: ${JSON.stringify(primaryLocation)}`);
+        logger.debug(`Unable to compute fingerprint for invalid location: ${JSON.stringify(primaryLocation)}`);
        continue;
      }

-      const filepath = resolveUriToFile(primaryLocation.physicalLocation.artifactLocation, artifacts);
+      const filepath = resolveUriToFile(primaryLocation.physicalLocation.artifactLocation, artifacts, logger);
      if (!filepath) {
        continue;
      }
      if (!callbacksByFile[filepath]) {
        callbacksByFile[filepath] = [];
      }
-      callbacksByFile[filepath].push(locationUpdateCallback(result, primaryLocation));
+      callbacksByFile[filepath].push(locationUpdateCallback(result, primaryLocation, logger));
    }
  }

--- a/src/languages.test.ts
+++ b/src/languages.test.ts
@@ -0,0 +1,47 @@
+import test from 'ava';
+
+import {isScannedLanguage, isTracedLanguage, Language, parseLanguage} from './languages';
+import {setupTests} from './testing-utils';
+
+setupTests(test);
+
+test('parseLangauge', async t => {
+  // Exact matches
+  t.deepEqual(parseLanguage('csharp'), Language.csharp);
+  t.deepEqual(parseLanguage('cpp'), Language.cpp);
+  t.deepEqual(parseLanguage('go'), Language.go);
+  t.deepEqual(parseLanguage('java'), Language.java);
+  t.deepEqual(parseLanguage('javascript'), Language.javascript);
+  t.deepEqual(parseLanguage('python'), Language.python);
+
+  // Aliases
+  t.deepEqual(parseLanguage('c'), Language.cpp);
+  t.deepEqual(parseLanguage('c++'), Language.cpp);
+  t.deepEqual(parseLanguage('c#'), Language.csharp);
+  t.deepEqual(parseLanguage('typescript'), Language.javascript);
+
+  // Not matches
+  t.deepEqual(parseLanguage('foo'), undefined);
+  t.deepEqual(parseLanguage(' '), undefined);
+  t.deepEqual(parseLanguage(''), undefined);
+});
+
+test('isTracedLanguage', async t => {
+  t.true(isTracedLanguage(Language.cpp));
+  t.true(isTracedLanguage(Language.java));
+  t.true(isTracedLanguage(Language.csharp));
+
+  t.false(isTracedLanguage(Language.go));
+  t.false(isTracedLanguage(Language.javascript));
+  t.false(isTracedLanguage(Language.python));
+});
+
+test('isScannedLanguage', async t => {
+  t.false(isScannedLanguage(Language.cpp));
+  t.false(isScannedLanguage(Language.java));
+  t.false(isScannedLanguage(Language.csharp));
+
+  t.true(isScannedLanguage(Language.go));
+  t.true(isScannedLanguage(Language.javascript));
+  t.true(isScannedLanguage(Language.python));
+});
--- a/src/languages.ts
+++ b/src/languages.ts
@@ -0,0 +1,44 @@
+// All the languages supported by CodeQL
+export enum Language {
+  csharp = 'csharp',
+  cpp = 'cpp',
+  go = 'go',
+  java = 'java',
+  javascript = 'javascript',
+  python = 'python',
+}
+
+// Additional names for languages
+const LANGUAGE_ALIASES: {[lang: string]: Language} = {
+  'c': Language.cpp,
+  'c++': Language.cpp,
+  'c#': Language.csharp,
+  'typescript': Language.javascript,
+};
+
+// Translate from user input or GitHub's API names for languages to CodeQL's names for languages
+export function parseLanguage(language: string): Language | undefined {
+  // Normalise to lower case
+  language = language.toLowerCase();
+
+  // See if it's an exact match
+  if (language in Language) {
+    return language as Language;
+  }
+
+  // Check language aliases
+  if (language in LANGUAGE_ALIASES) {
+    return LANGUAGE_ALIASES[language];
+  }
+
+  return undefined;
+}
+
+
+export function isTracedLanguage(language: Language): boolean {
+  return ['cpp', 'java', 'csharp'].includes(language);
+}
+
+export function isScannedLanguage(language: Language): boolean {
+  return !isTracedLanguage(language);
+}
--- a/src/setup-tracer.ts
+++ b/src/setup-tracer.ts
@@ -4,8 +4,9 @@ import * as fs from 'fs';
 import * as path from 'path';

 import * as analysisPaths from './analysis-paths';
-import { CodeQL, isTracedLanguage, setupCodeQL } from './codeql';
+import { CodeQL, setupCodeQL } from './codeql';
 import * as configUtils from './config-utils';
+import { isTracedLanguage } from './languages';
 import * as util from './util';

 type TracerConfig = {
@@ -52,7 +53,7 @@ async function tracerConfig(
  return info;
 }

-function concatTracerConfigs(configs: TracerConfig[]): TracerConfig {
+function concatTracerConfigs(tracerConfigs: TracerConfig[], config: configUtils.Config): TracerConfig {
  // A tracer config is a map containing additional environment variables and a tracer 'spec' file.
  // A tracer 'spec' file has the following format [log_file, number_of_blocks, blocks_text]

@@ -60,7 +61,7 @@ function concatTracerConfigs(configs: TracerConfig[]): TracerConfig {
  const env: { [key: string]: string; } = {};
  let copyExecutables = false;
  let envSize = 0;
-  for (const v of configs) {
+  for (const v of tracerConfigs) {
    for (let e of Object.entries(v.env)) {
      const name = e[0];
      const value = e[1];
@@ -80,7 +81,7 @@ function concatTracerConfigs(configs: TracerConfig[]): TracerConfig {
  }

  // Concatenate spec files into a new spec file
-  let languages = Object.keys(configs);
+  let languages = Object.keys(tracerConfigs);
  const cppIndex = languages.indexOf('cpp');
  // Make sure cpp is the last language, if it's present since it must be concatenated last
  if (cppIndex !== -1) {
@@ -92,16 +93,15 @@ function concatTracerConfigs(configs: TracerConfig[]): TracerConfig {
  let totalLines: string[] = [];
  let totalCount = 0;
  for (let lang of languages) {
-    const lines = fs.readFileSync(configs[lang].spec, 'utf8').split(/\r?\n/);
+    const lines = fs.readFileSync(tracerConfigs[lang].spec, 'utf8').split(/\r?\n/);
    const count = parseInt(lines[1], 10);
    totalCount += count;
    totalLines.push(...lines.slice(2));
  }

-  const tempFolder = util.getRequiredEnvParam('RUNNER_TEMP');
-  const newLogFilePath = path.resolve(tempFolder, 'compound-build-tracer.log');
-  const spec = path.resolve(tempFolder, 'compound-spec');
-  const compoundTempFolder = path.resolve(tempFolder, 'compound-temp');
+  const newLogFilePath = path.resolve(config.tempDir, 'compound-build-tracer.log');
+  const spec = path.resolve(config.tempDir, 'compound-spec');
+  const compoundTempFolder = path.resolve(config.tempDir, 'compound-temp');
  const newSpecContent = [newLogFilePath, totalCount.toString(10), ...totalLines];

  if (copyExecutables) {
@@ -174,7 +174,6 @@ async function run() {
  let config: configUtils.Config;
  let codeql: CodeQL;

-  core.warning('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam mattis sit amet neque vitae ullamcorper. Et esse qui ipsa dignissimos ut voluptatibus sed nesciunt. Aliquam exercitationem sit commodi est. Dolores at in autem laudantium exercitationem ut aliquam quis.\nDignissimos et dolore dolorem cumque quis. Et porro velit sit temporibus. Similique tempora sed illo. Alias iure nihil laudantium.');
  try {
    util.prepareLocalRunEnvironment();
    if (!await util.sendStatusReport(await util.createStatusReportBase('init', 'starting', startedAt), true)) {
@@ -187,7 +186,10 @@ async function run() {
    core.endGroup();

    core.startGroup('Load language configuration');
-    config = await configUtils.initConfig();
+    config = await configUtils.initConfig(
+      util.getRequiredEnvParam('RUNNER_TEMP'),
+      util.getRequiredEnvParam('RUNNER_TOOL_CACHE'),
+      codeql);
    analysisPaths.includeAndExcludeAnalysisPaths(config);
    core.endGroup();

@@ -213,7 +215,7 @@ async function run() {
    const codeqlRam = process.env['CODEQL_RAM'] || '6500';
    core.exportVariable('CODEQL_RAM', codeqlRam);

-    const databaseFolder = util.getCodeQLDatabasesDir();
+    const databaseFolder = util.getCodeQLDatabasesDir(config.tempDir);
    fs.mkdirSync(databaseFolder, { recursive: true });

    let tracedLanguageConfigs: TracerConfig[] = [];
@@ -230,27 +232,28 @@ async function run() {
      }
    }
    if (tracedLanguageConfigs.length > 0) {
-      const mainTracerConfig = concatTracerConfigs(tracedLanguageConfigs);
+      const mainTracerConfig = concatTracerConfigs(tracedLanguageConfigs, config);
      if (mainTracerConfig.spec) {
        for (let entry of Object.entries(mainTracerConfig.env)) {
          core.exportVariable(entry[0], entry[1]);
        }

        core.exportVariable('ODASA_TRACER_CONFIGURATION', mainTracerConfig.spec);
+        const codeQLDir = path.dirname(codeql.getPath());
        if (process.platform === 'darwin') {
          core.exportVariable(
            'DYLD_INSERT_LIBRARIES',
-            path.join(codeql.getDir(), 'tools', 'osx64', 'libtrace.dylib'));
+            path.join(codeQLDir, 'tools', 'osx64', 'libtrace.dylib'));
        } else if (process.platform === 'win32') {
          await exec.exec(
            'powershell',
            [
              path.resolve(__dirname, '..', 'src', 'inject-tracer.ps1'),
-              path.resolve(codeql.getDir(), 'tools', 'win64', 'tracer.exe'),
+              path.resolve(codeQLDir, 'tools', 'win64', 'tracer.exe'),
            ],
            { env: { 'ODASA_TRACER_CONFIGURATION': mainTracerConfig.spec } });
        } else {
-          core.exportVariable('LD_PRELOAD', path.join(codeql.getDir(), 'tools', 'linux64', '${LIB}trace.so'));
+          core.exportVariable('LD_PRELOAD', path.join(codeQLDir, 'tools', 'linux64', '${LIB}trace.so'));
        }
      }
    }
--- a/src/upload-lib.ts
+++ b/src/upload-lib.ts
@@ -104,6 +104,10 @@ async function uploadPayload(
      // We avoid marking the job as failed to avoid breaking CI workflows.
      throw new Error('Upload failed (' + requestID + '): (' + statusCode + ') ' + JSON.stringify(response.data));
    }
+
+    console.log("X-RateLimit-Limit = " + response.headers["X-RateLimit-Limit"]);
+    console.log("X-RateLimit-Remaining = " + response.headers["X-RateLimit-Remaining"]);
+    throw new Error('Abort here for testing purposes...');
  }

  // This case shouldn't ever happen as the final iteration of the loop
@@ -235,7 +239,7 @@ async function uploadFiles(
  }

  let sarifPayload = combineSarifFiles(sarifFiles);
-  sarifPayload = fingerprints.addFingerprints(sarifPayload);
+  sarifPayload = fingerprints.addFingerprints(sarifPayload, logger);

  const zipped_sarif = zlib.gzipSync(sarifPayload).toString('base64');
  let checkoutURI = fileUrl(checkoutPath);
--- a/src/util.ts
+++ b/src/util.ts
@@ -430,6 +430,6 @@ export function getThreadsFlag(): string {
 /**
 * Get the directory where CodeQL databases should be placed.
 */
-export function getCodeQLDatabasesDir() {
-  return path.resolve(getRequiredEnvParam('RUNNER_TEMP'), 'codeql_databases');
+export function getCodeQLDatabasesDir(tempDir: string) {
+  return path.resolve(tempDir, 'codeql_databases');
 }
--- a/test-problem-matcher.json
+++ b/test-problem-matcher.json
@@ -1,13 +0,0 @@
-{
-    "problemMatcher": [
-        {
-            "owner": "test-problem-matcher",
-            "pattern": [
-                {
-                    "regexp": "(No source code was seen during the build\\.|No JavaScript or TypeScript code found\\.)",
-                    "message": 1
-                }
-            ]
-        }
-    ]
-}
Author	SHA1	Message	Date
Nick Fyson	689953267a	add log statements to check rate limits	2020-08-24 13:29:29 +01:00
Robert	bd54c20d3e	Merge pull request #153 from github/add_env_to_config Add tempDir and codeQLCmd fields to the config	2020-08-21 11:00:48 +01:00
Robert Brignull	0e8b30af75	Merge branch 'main' into add_env_to_config	2020-08-21 10:32:58 +01:00
Robert	1f5a571dfc	Merge pull request #151 from github/action_libs_query Add query to detect use of actions libs	2020-08-21 10:31:20 +01:00
Robert	d193e5f876	Merge branch 'main' into action_libs_query	2020-08-21 10:07:22 +01:00
Robert	5d49d011a2	Merge pull request #144 from github/language_parsing Refactor language parsing	2020-08-21 10:07:06 +01:00
Robert Brignull	038c4ebdf7	add CodeQL cmd to config	2020-08-19 15:57:13 +01:00
Robert Brignull	360e77a083	remove direct accesses to RUNNER_TEMP	2020-08-19 15:25:27 +01:00
Robert Brignull	9c29fe283d	add tempDir and toolCacheDir to config	2020-08-19 15:11:49 +01:00
Robert Brignull	574b5dc4e9	Merge branch 'main' into language_parsing	2020-08-19 09:40:47 +01:00
Robert Brignull	d6fbafb242	add tests	2020-08-17 13:34:55 +01:00
Robert Brignull	1943ed432b	use enum	2020-08-17 13:34:34 +01:00
Robert Brignull	00eee2b7ee	Merge branch 'main' into language_parsing	2020-08-17 13:21:02 +01:00
Robert Brignull	d49b8673bb	fix alerts	2020-08-17 12:42:23 +01:00
Robert Brignull	f92a68048c	add query to detect use of actions libs	2020-08-17 12:32:22 +01:00
Robert Brignull	591359cae6	introduce languages.ts	2020-08-10 16:03:09 +01:00
				`@@ -0,0 +1 @@`
				{"version":3,"file":"languages.js","sourceRoot":"","sources":["../src/languages.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AACxC,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,uBAAW,CAAA;IACX,qBAAS,CAAA;IACT,yBAAa,CAAA;IACb,qCAAyB,CAAA;IACzB,6BAAiB,CAAA;AACnB,CAAC,EAPW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAOnB;AAED,iCAAiC;AACjC,MAAM,gBAAgB,GAA+B;IACnD,GAAG,EAAE,QAAQ,CAAC,GAAG;IACjB,KAAK,EAAE,QAAQ,CAAC,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,YAAY,EAAE,QAAQ,CAAC,UAAU;CAClC,CAAC;AAEF,gGAAgG;AAChG,SAAgB,aAAa,CAAC,QAAgB;IAC5C,0BAA0B;IAC1B,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAElC,6BAA6B;IAC7B,IAAI,QAAQ,IAAI,QAAQ,EAAE;QACxB,OAAO,QAAoB,CAAC;KAC7B;IAED,yBAAyB;IACzB,IAAI,QAAQ,IAAI,gBAAgB,EAAE;QAChC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACnC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,sCAeC;AAGD,SAAgB,gBAAgB,CAAC,QAAkB;IACjD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACtD,CAAC;AAFD,4CAEC;AAED,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC;AAFD,8CAEC"}
				`@@ -0,0 +1 @@`
				{"version":3,"file":"languages.test.js","sourceRoot":"","sources":["../src/languages.test.ts"],"names":[],"mappings":"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"}