Output final hash for debuggin

.eslintrc.json

@@ -44,6 +44,7 @@
             "@typescript-eslint/no-unsafe-call": "off",
             "@typescript-eslint/no-unsafe-member-access": "off",
             "@typescript-eslint/no-unsafe-return": "off",
+            "@typescript-eslint/no-unused-vars": "off",
             "@typescript-eslint/no-var-requires": "off",
             "@typescript-eslint/prefer-regexp-exec": "off",
             "@typescript-eslint/require-await": "off",

.github/update-release-branch.py

@@ -35,7 +35,7 @@ def open_pr(repo, all_commits, short_main_sha, branch_name):
   commits_without_pull_requests = []
   for commit in all_commits:
     pr = get_pr_for_commit(repo, commit)
-
+    
     if pr is None:
       commits_without_pull_requests.append(commit)
     elif not any(p for p in pull_requests if p.number == pr.number):
@@ -47,7 +47,7 @@ def open_pr(repo, all_commits, short_main_sha, branch_name):
   # Sort PRs and commits by age
   pull_requests = sorted(pull_requests, key=lambda pr: pr.number)
   commits_without_pull_requests = sorted(commits_without_pull_requests, key=lambda c: c.commit.author.date)
-
+  
   # Start constructing the body text
   body = 'Merging ' + short_main_sha + ' into ' + LATEST_RELEASE_BRANCH
 
@@ -62,7 +62,7 @@ def open_pr(repo, all_commits, short_main_sha, branch_name):
       body += '\n- #' + str(pr.number)
       body += ' - ' + pr.title
       body += ' (@' + merger + ')'
-
+  
   # List all commits not part of a PR
   if len(commits_without_pull_requests) > 0:
     body += '\n\nContains the following commits not from a pull request:'
@@ -86,7 +86,7 @@ def get_conductor(repo, pull_requests, other_commits):
   # If there are any PRs then use whoever merged the last one
   if len(pull_requests) > 0:
     return get_merger_of_pr(repo, pull_requests[-1])
-
+  
   # Otherwise take the author of the latest commit
   return other_commits[-1].author.login
 
@@ -95,7 +95,7 @@ def get_conductor(repo, pull_requests, other_commits):
 # This will not include any commits that exist on the release branch
 # that aren't on main.
 def get_commit_difference(repo):
-  commits = run_git('log', '--pretty=format:%H', ORIGIN + '/' + LATEST_RELEASE_BRANCH + '..' + MAIN_BRANCH).strip().split('\n')
+  commits = run_git('log', '--pretty=format:%H', ORIGIN + '/' + LATEST_RELEASE_BRANCH + '...' + MAIN_BRANCH).strip().split('\n')
 
   # Convert to full-fledged commit objects
   commits = [repo.get_commit(c) for c in commits]
@@ -119,7 +119,7 @@ def get_truncated_commit_message(commit):
 # Returns the PR object, or None if no PR could be found.
 def get_pr_for_commit(repo, commit):
   prs = commit.get_pulls()
-
+  
   if prs.totalCount > 0:
     # In the case that there are multiple PRs, return the earliest one
     prs = list(prs)
@@ -165,7 +165,7 @@ def main():
   if branch_exists_on_remote(new_branch_name):
     print('Branch ' + new_branch_name + ' already exists. Nothing to do.')
     return
-
+  
   # Create the new branch and push it to the remote
   print('Creating branch ' + new_branch_name)
   run_git('checkout', '-b', new_branch_name, MAIN_BRANCH)

.github/workflows/codeql.yml

@@ -7,56 +7,10 @@ on:
     branches: [main, v1]
 
 jobs:
-  # Identify the CodeQL tool versions to use in the analysis job.
-  check-codeql-versions:
-    runs-on: ubuntu-latest
-    outputs:
-      versions: ${{ steps.compare.outputs.versions }}
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Init with default CodeQL bundle from the VM image
-      id: init-default
-      uses: ./init
-      with:
-        languages: javascript
-    - name: Remove empty database
-      # allows us to run init a second time
-      run: |
-        rm -rf "$RUNNER_TEMP/codeql_databases"
-    - name: Init with latest CodeQL bundle
-      id: init-latest
-      uses: ./init
-      with:
-        tools: latest
-        languages: javascript
-    - name: Compare default and latest CodeQL bundle versions
-      id: compare
-      env:
-        CODEQL_DEFAULT: ${{ steps.init-default.outputs.codeql-path }}
-        CODEQL_LATEST: ${{ steps.init-latest.outputs.codeql-path }}
-      run: |
-        CODEQL_VERSION_DEFAULT="$("$CODEQL_DEFAULT" version --format terse)"
-        CODEQL_VERSION_LATEST="$("$CODEQL_LATEST" version --format terse)"
-        echo "Default CodeQL bundle version is $CODEQL_VERSION_DEFAULT"
-        echo "Latest CodeQL bundle version is $CODEQL_VERSION_LATEST"
-        if [[ "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then
-          # Just use `tools: null` to avoid duplication in the analysis job.
-          VERSIONS_JSON='[null]'
-        else
-          # Use both `tools: null` and `tools: latest` in the analysis job.
-          VERSIONS_JSON='[null, "latest"]'
-        fi
-        # Output a JSON-encoded list with the distinct versions to test against.
-        echo "Suggested matrix config for analysis job: $VERSIONS_JSON"
-        echo "::set-output name=versions::${VERSIONS_JSON}"
-
   build:
-    needs: [check-codeql-versions]
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest,macos-latest]
-        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -66,7 +20,6 @@ jobs:
       with:
         languages: javascript
         config-file: ./.github/codeql/codeql-config.yml
-        tools: ${{ matrix.tools }}
     # confirm steps.init.outputs.codeql-path points to the codeql binary
     - name: Print CodeQL Version
       run: ${{steps.init.outputs.codeql-path}} version --format=json

.github/workflows/integration-testing.yml

@@ -0,0 +1,507 @@
+name: "Integration Testing"
+
+on:
+  push:
+    branches: [main, v1]
+  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]
+        tools: [~, 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:
+        tools: ${{ matrix.tools }}
+        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
+
+  go-custom-tracing:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    env:
+      CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
+
+    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
+    - name: Build code
+      shell: bash
+      run: go build main.go
+    - uses: ./../action/analyze
+      env:
+        TEST_MODE: true
+
+  go-custom-tracing-autobuild:
+    # No need to test Go autobuild on multiple OSes since
+    # we're testing Go custom tracing with a manual build on all OSes.
+    runs-on: ubuntu-latest
+    env:
+      CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
+
+    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: go
+    - uses: ./../action/autobuild
+    - 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
+
+  runner-analyze-javascript-ubuntu:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build runner
+      run: |
+        cd runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        # Pass --config-file here, but not for other jobs in this workflow.
+        # This means we're testing the config file parsing in the runner
+        # but not slowing down all jobs unnecessarily as it doesn't add much
+        # testing the parsing on different operating systems and languages.
+        runner/dist/codeql-runner-linux init --repository $GITHUB_REPOSITORY --languages javascript --config-file ./.github/codeql/codeql-config.yml --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Run analyze
+      run: |
+        runner/dist/codeql-runner-linux analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-javascript-windows:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build runner
+      run: |
+        cd runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        runner/dist/codeql-runner-win.exe init --repository $Env:GITHUB_REPOSITORY --languages javascript --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Run analyze
+      run: |
+        runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-javascript-macos:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build runner
+      run: |
+        cd runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages javascript --config-file ./.github/codeql/codeql-config.yml --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Run analyze
+      run: |
+        runner/dist/codeql-runner-macos analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-csharp-ubuntu:
+    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: Build runner
+      run: |
+        cd ../action/runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        ../action/runner/dist/codeql-runner-linux init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Build code
+      run: |
+        . ./codeql-runner/codeql-env.sh
+        dotnet build
+
+    - name: Run analyze
+      run: |
+        ../action/runner/dist/codeql-runner-linux analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-csharp-windows:
+    runs-on: windows-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: Build runner
+      run: |
+        cd ../action/runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        ../action/runner/dist/codeql-runner-win.exe init --repository $Env:GITHUB_REPOSITORY --languages csharp --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Build code
+      shell: powershell
+      run: |
+        cat ./codeql-runner/codeql-env.sh | Invoke-Expression
+        dotnet build
+
+    - name: Run analyze
+      run: |
+        ../action/runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-csharp-macos:
+    runs-on: macos-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: Build runner
+      run: |
+        cd ../action/runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        ../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Build code
+      shell: bash
+      run: |
+        . ./codeql-runner/codeql-env.sh
+        dotnet build
+
+    - name: Run analyze
+      run: |
+        ../action/runner/dist/codeql-runner-macos analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+
+  runner-analyze-csharp-autobuild-ubuntu:
+    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: Build runner
+      run: |
+        cd ../action/runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        ../action/runner/dist/codeql-runner-linux init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Build code
+      run: |
+        ../action/runner/dist/codeql-runner-linux autobuild
+
+    - name: Run analyze
+      run: |
+        ../action/runner/dist/codeql-runner-linux analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-csharp-autobuild-windows:
+    runs-on: windows-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: Build runner
+      run: |
+        cd ../action/runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        ../action/runner/dist/codeql-runner-win.exe init --repository $Env:GITHUB_REPOSITORY --languages csharp --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Build code
+      shell: powershell
+      run: |
+        ../action/runner/dist/codeql-runner-win.exe autobuild
+
+    - name: Run analyze
+      run: |
+        ../action/runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-analyze-csharp-autobuild-macos:
+    runs-on: macos-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: Build runner
+      run: |
+        cd ../action/runner
+        npm install
+        npm run build-runner
+
+    - name: Run init
+      run: |
+        ../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+
+    - name: Build code
+      shell: bash
+      run: |
+        ../action/runner/dist/codeql-runner-macos autobuild
+
+    - name: Run analyze
+      run: |
+        ../action/runner/dist/codeql-runner-macos analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
+      env:
+        TEST_MODE: true
+
+  runner-upload-sarif:
+    runs-on: ubuntu-latest
+
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build runner
+      run: |
+        cd runner
+        npm install
+        npm run build-runner
+
+    - name: Upload with runner
+      run: |
+        # Deliberately don't use TEST_MODE here. This is specifically testing
+        # the compatibility with the API.
+        runner/dist/codeql-runner-linux upload --sarif-file src/testdata/empty-sarif.sarif --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}

.github/workflows/pr-checks.yml

@@ -1,8 +1,5 @@
 name: "PR checks"
 
-env:
-  GO111MODULE: auto
-
 on:
   push:
     branches: [main, v1]
@@ -23,7 +20,25 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Check generated JavaScript
-      run: .github/workflows/script/check-js.sh
+      run: |
+        # Sanity check that repo is clean to start with
+        if [ ! -z "$(git status --porcelain)" ]; then
+          # If we get a fail here then this workflow needs attention...
+          >&2 echo "Failed: Repo should be clean before testing!"
+          exit 1
+        fi
+        # Wipe the lib directory incase there are extra unnecessary files in there
+        rm -rf lib
+        # Generate the JavaScript files
+        npm run-script build
+        # Check that repo is still clean
+        if [ ! -z "$(git status --porcelain)" ]; then
+          # If we get a fail here then the PR needs attention
+          >&2 echo "Failed: JavaScript files are not up to date. Run 'npm run-script build' to update"
+          git status
+          exit 1
+        fi
+        echo "Success: JavaScript files are up to date"
 
   check-node-modules:
     runs-on: ubuntu-latest
@@ -31,10 +46,27 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Check node modules up to date
-      run: .github/workflows/script/check-node-modules.sh
+      run: |
+        # Sanity check that repo is clean to start with
+        if [ ! -z "$(git status --porcelain)" ]; then
+          # If we get a fail here then this workflow needs attention...
+          >&2 echo "Failed: Repo should be clean before testing!"
+          exit 1
+        fi
+        # Reinstall modules and then clean to remove absolute paths
+        # Use 'npm ci' instead of 'npm install' as this is intended to be reproducible
+        npm ci
+        npm run removeNPMAbsolutePaths
+        # Check that repo is still clean
+        if [ ! -z "$(git status --porcelain)" ]; then
+          # If we get a fail here then the PR needs attention
+          >&2 echo "Failed: node_modules are not up to date. Run 'npm ci' and 'npm run removeNPMAbsolutePaths' to update"
+          git status
+          exit 1
+        fi
+        echo "Success: node_modules are up to date"
 
   npm-test:
-    needs: [check-js, check-node-modules]
     strategy:
       matrix:
         os: [ubuntu-latest,macos-latest]
@@ -44,599 +76,3 @@ jobs:
     - uses: actions/checkout@v2
     - name: npm run-script test
       run: npm run-script test
-
-  multi-language-repo_test-autodetect-languages:
-    needs: [check-js, check-node-modules]
-    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} .
-        mv ../action/.github/workflows .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
-
-  # Identify the CodeQL tool versions to integration test against.
-  check-codeql-versions:
-    needs: [check-js, check-node-modules]
-    runs-on: ubuntu-latest
-    outputs:
-      versions: ${{ steps.compare.outputs.versions }}
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Move codeql-action
-      shell: bash
-      run: |
-        mkdir ../action
-        mv * .github ../action/
-        mv ../action/tests/multi-language-repo/{*,.github} .
-        mv ../action/.github/workflows .github
-    - name: Init with default CodeQL bundle from the VM image
-      id: init-default
-      uses: ./../action/init
-      with:
-        languages: javascript
-    - name: Remove empty database
-      # allows us to run init a second time
-      run: |
-        rm -rf "$RUNNER_TEMP/codeql_databases"
-    - name: Init with latest CodeQL bundle
-      id: init-latest
-      uses: ./../action/init
-      with:
-        tools: latest
-        languages: javascript
-    - name: Compare default and latest CodeQL bundle versions
-      id: compare
-      env:
-        CODEQL_DEFAULT: ${{ steps.init-default.outputs.codeql-path }}
-        CODEQL_LATEST: ${{ steps.init-latest.outputs.codeql-path }}
-      run: |
-        CODEQL_VERSION_DEFAULT="$("$CODEQL_DEFAULT" version --format terse)"
-        CODEQL_VERSION_LATEST="$("$CODEQL_LATEST" version --format terse)"
-        echo "Default CodeQL bundle version is $CODEQL_VERSION_DEFAULT"
-        echo "Latest CodeQL bundle version is $CODEQL_VERSION_LATEST"
-        if [[ "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then
-          # Just use `tools: null` to avoid duplication in the integration tests.
-          VERSIONS_JSON='[null]'
-        else
-          # Use both `tools: null` and `tools: latest` in the integration tests.
-          VERSIONS_JSON='[null, "latest"]'
-        fi
-        # Output a JSON-encoded list with the distinct versions to test against.
-        echo "Suggested matrix config for integration tests: $VERSIONS_JSON"
-        echo "::set-output name=versions::${VERSIONS_JSON}"
-
-  multi-language-repo_test-custom-queries-and-remote-config:
-    needs: [check-js, check-node-modules, check-codeql-versions]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
-    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} .
-        mv ../action/.github/workflows .github
-    - uses: ./../action/init
-      with:
-        tools: ${{ matrix.tools }}
-        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:
-    needs: [check-js, check-node-modules, check-codeql-versions]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
-    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} .
-        mv ../action/.github/workflows .github
-    - uses: ./../action/init
-      with:
-        languages: go
-        config-file: ./.github/codeql/custom-queries.yml
-        tools: ${{ matrix.tools }}
-    - name: Build code
-      shell: bash
-      run: ./build.sh
-    - uses: ./../action/analyze
-      env:
-        TEST_MODE: true
-
-  go-custom-tracing:
-    needs: [check-js, check-node-modules, check-codeql-versions]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
-    runs-on: ${{ matrix.os }}
-    env:
-      CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
-
-    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} .
-        mv ../action/.github/workflows .github
-    - uses: ./../action/init
-      with:
-        languages: go
-        tools: ${{ matrix.tools }}
-    - name: Build code
-      shell: bash
-      run: go build main.go
-    - uses: ./../action/analyze
-      env:
-        TEST_MODE: true
-
-  go-custom-tracing-autobuild:
-    needs: [check-js, check-node-modules, check-codeql-versions]
-    strategy:
-      fail-fast: false
-      matrix:
-        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
-    # No need to test Go autobuild on multiple OSes since
-    # we're testing Go custom tracing with a manual build on all OSes.
-    runs-on: ubuntu-latest
-    env:
-      CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Move codeql-action
-      shell: bash
-      run: |
-        mkdir ../action
-        mv * .github ../action/
-        mv ../action/tests/multi-language-repo/{*,.github} .
-        mv ../action/.github/workflows .github
-    - uses: ./../action/init
-      with:
-        languages: go
-        tools: ${{ matrix.tools }}
-    - uses: ./../action/autobuild
-    - uses: ./../action/analyze
-      env:
-        TEST_MODE: true
-
-  multi-language-repo_rubocop:
-    needs: [check-js, check-node-modules]
-    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} .
-        mv ../action/.github/workflows .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:
-    needs: [check-js, check-node-modules, check-codeql-versions]
-    strategy:
-      fail-fast: false
-      matrix:
-        tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
-    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} .
-        mv ../action/.github/workflows .github
-    - uses: ./../action/init
-      with:
-        languages: javascript
-        tools: ${{ matrix.tools }}
-    - uses: ./../action/analyze
-      env:
-        TEST_MODE: true
-
-  runner-analyze-javascript-ubuntu:
-    needs: [check-js, check-node-modules]
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Build runner
-      run: |
-        cd runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        # Pass --config-file here, but not for other jobs in this workflow.
-        # This means we're testing the config file parsing in the runner
-        # but not slowing down all jobs unnecessarily as it doesn't add much
-        # testing the parsing on different operating systems and languages.
-        runner/dist/codeql-runner-linux init --repository $GITHUB_REPOSITORY --languages javascript --config-file ./.github/codeql/codeql-config.yml --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Run analyze
-      run: |
-        runner/dist/codeql-runner-linux analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-javascript-windows:
-    needs: [check-js, check-node-modules]
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Build runner
-      run: |
-        cd runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        runner/dist/codeql-runner-win.exe init --repository $Env:GITHUB_REPOSITORY --languages javascript --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Run analyze
-      run: |
-        runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-javascript-macos:
-    needs: [check-js, check-node-modules]
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Build runner
-      run: |
-        cd runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages javascript --config-file ./.github/codeql/codeql-config.yml --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Run analyze
-      run: |
-        runner/dist/codeql-runner-macos analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-csharp-ubuntu:
-    needs: [check-js, check-node-modules]
-    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} .
-        mv ../action/.github/workflows .github
-
-    - name: Build runner
-      run: |
-        cd ../action/runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        ../action/runner/dist/codeql-runner-linux init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Build code
-      run: |
-        . ./codeql-runner/codeql-env.sh
-        $CODEQL_RUNNER dotnet build
-
-    - name: Run analyze
-      run: |
-        ../action/runner/dist/codeql-runner-linux analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-csharp-windows:
-    needs: [check-js, check-node-modules]
-    runs-on: windows-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} .
-        mv ../action/.github/workflows .github
-
-    - name: Build runner
-      run: |
-        cd ../action/runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        ../action/runner/dist/codeql-runner-win.exe init --repository $Env:GITHUB_REPOSITORY --languages csharp --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Build code
-      shell: powershell
-      run: |
-        cat ./codeql-runner/codeql-env.sh | Invoke-Expression
-        & $Env:CODEQL_RUNNER dotnet build
-
-    - name: Run analyze
-      run: |
-        ../action/runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-csharp-macos:
-    needs: [check-js, check-node-modules]
-    runs-on: macos-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} .
-        mv ../action/.github/workflows .github
-
-    - name: Build runner
-      run: |
-        cd ../action/runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        ../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Build code
-      shell: bash
-      run: |
-        . ./codeql-runner/codeql-env.sh
-        $CODEQL_RUNNER dotnet build
-
-    - name: Run analyze
-      run: |
-        ../action/runner/dist/codeql-runner-macos analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-
-  runner-analyze-csharp-autobuild-ubuntu:
-    needs: [check-js, check-node-modules]
-    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} .
-        mv ../action/.github/workflows .github
-
-    - name: Build runner
-      run: |
-        cd ../action/runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        ../action/runner/dist/codeql-runner-linux init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Build code
-      run: |
-        ../action/runner/dist/codeql-runner-linux autobuild
-
-    - name: Run analyze
-      run: |
-        ../action/runner/dist/codeql-runner-linux analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-csharp-autobuild-windows:
-    needs: [check-js, check-node-modules]
-    runs-on: windows-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} .
-        mv ../action/.github/workflows .github
-
-    - name: Build runner
-      run: |
-        cd ../action/runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        ../action/runner/dist/codeql-runner-win.exe init --repository $Env:GITHUB_REPOSITORY --languages csharp --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Build code
-      shell: powershell
-      run: |
-        ../action/runner/dist/codeql-runner-win.exe autobuild
-
-    - name: Run analyze
-      run: |
-        ../action/runner/dist/codeql-runner-win.exe analyze --repository $Env:GITHUB_REPOSITORY --commit $Env:GITHUB_SHA --ref $Env:GITHUB_REF --github-url $Env:GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-analyze-csharp-autobuild-macos:
-    needs: [check-js, check-node-modules]
-    runs-on: macos-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} .
-        mv ../action/.github/workflows .github
-
-    - name: Build runner
-      run: |
-        cd ../action/runner
-        npm install
-        npm run build-runner
-
-    - name: Run init
-      run: |
-        ../action/runner/dist/codeql-runner-macos init --repository $GITHUB_REPOSITORY --languages csharp --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-
-    - name: Build code
-      shell: bash
-      run: |
-        ../action/runner/dist/codeql-runner-macos autobuild
-
-    - name: Run analyze
-      run: |
-        ../action/runner/dist/codeql-runner-macos analyze --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
-      env:
-        TEST_MODE: true
-
-  runner-upload-sarif:
-    needs: [check-js, check-node-modules]
-    runs-on: ubuntu-latest
-
-    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Build runner
-      run: |
-        cd runner
-        npm install
-        npm run build-runner
-
-    - name: Upload with runner
-      run: |
-        # Deliberately don't use TEST_MODE here. This is specifically testing
-        # the compatibility with the API.
-        runner/dist/codeql-runner-linux upload --sarif-file src/testdata/empty-sarif.sarif --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}

.github/workflows/script/check-js.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eu
-
-# Sanity check that repo is clean to start with
-if [ ! -z "$(git status --porcelain)" ]; then
-    # If we get a fail here then this workflow needs attention...
-    >&2 echo "Failed: Repo should be clean before testing!"
-    exit 1
-fi
-# Wipe the lib directory incase there are extra unnecessary files in there
-rm -rf lib
-# Generate the JavaScript files
-npm run-script build
-# Check that repo is still clean
-if [ ! -z "$(git status --porcelain)" ]; then
-    # If we get a fail here then the PR needs attention
-    >&2 echo "Failed: JavaScript files are not up to date. Run 'npm run-script build' to update"
-    git status
-    exit 1
-fi
-echo "Success: JavaScript files are up to date"

.github/workflows/script/check-node-modules.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eu
-
-# Sanity check that repo is clean to start with
-if [ ! -z "$(git status --porcelain)" ]; then
-    # If we get a fail here then this workflow needs attention...
-    >&2 echo "Failed: Repo should be clean before testing!"
-    exit 1
-fi
-# Reinstall modules and then clean to remove absolute paths
-# Use 'npm ci' instead of 'npm install' as this is intended to be reproducible
-npm ci
-npm run removeNPMAbsolutePaths
-# Check that repo is still clean
-if [ ! -z "$(git status --porcelain)" ]; then
-    # If we get a fail here then the PR needs attention
-    >&2 echo "Failed: node_modules are not up to date. Run 'npm ci' and 'npm run removeNPMAbsolutePaths' to update"
-    git status
-    exit 1
-fi
-echo "Success: node_modules are up to date"

.github/workflows/update-release-branch.yml

@@ -12,7 +12,6 @@ on:
 jobs:
   update:
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'github/codeql-action' }}
     steps:
     - uses: actions/checkout@v2
       with:

README.md

@@ -96,16 +96,7 @@ Use the `config-file` parameter of the `init` action to enable the configuration
     config-file: ./.github/codeql/codeql-config.yml
 ```
 
-The configuration file can be located in a different repository. This is useful if you want to share the same configuration across multiple repositories. If the configuration file is in a private repository you can also specify an `external-repository-token` option. This should be a personal access token that has read access to any repositories containing referenced config files and queries.
+The configuration file must be located within the local repository. For information on how to write a configuration file, see "[Using a custom configuration file](https://help.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#using-a-custom-configuration-file)."
-
-```yaml
-- uses: github/codeql-action/init@v1
-  with:
-    config-file: owner/repo/codeql-config.yml@branch
-    external-repository-token: ${{ secrets.EXTERNAL_REPOSITORY_TOKEN }}
-```
-
-For information on how to write a configuration file, see "[Using a custom configuration file](https://help.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#using-a-custom-configuration-file)."
 
 If you only want to customise the queries used, you can specify them in your workflow instead of creating a config file, using the `queries` property of the `init` action:
 

init/action.yml

@@ -19,9 +19,6 @@ inputs:
   queries:
     description: Comma-separated list of additional queries to run. By default, this overrides the same setting in a configuration file; prefix with "+" to use both sets of queries.
     required: false
-  external-repository-token:
-    description: A token for fetching external config files and queries if they reside in a private repository.
-    required: false
   setup-python-dependencies:
     description: Try to auto-install your python dependencies
     required: true

lib/actions-util.js

@@ -51,13 +51,6 @@ function getRequiredEnvParam(paramName) {
     return value;
 }
 exports.getRequiredEnvParam = getRequiredEnvParam;
-function getTemporaryDirectory() {
-    const value = process.env["CODEQL_ACTION_TEMP"];
-    return value !== undefined && value !== ""
-        ? value
-        : getRequiredEnvParam("RUNNER_TEMP");
-}
-exports.getTemporaryDirectory = getTemporaryDirectory;
 /**
  * Ensures all required environment variables are set in the context of a local run.
  */
@@ -77,7 +70,7 @@ exports.prepareLocalRunEnvironment = prepareLocalRunEnvironment;
 /**
  * Gets the SHA of the commit that is currently checked out.
  */
-exports.getCommitOid = async function (ref = "HEAD") {
+exports.getCommitOid = async function () {
     // Try to use git to get the current commit SHA. If that fails then
     // log but otherwise silently fall back to using the SHA from the environment.
     // The only time these two values will differ is during analysis of a PR when
@@ -87,7 +80,7 @@ exports.getCommitOid = async function (ref = "HEAD") {
     // reported on the merge commit.
     try {
         let commitOid = "";
-        await new toolrunner.ToolRunner(await safeWhich.safeWhich("git"), ["rev-parse", ref], {
+        await new toolrunner.ToolRunner(await safeWhich.safeWhich("git"), ["rev-parse", "HEAD"], {
             silent: true,
             listeners: {
                 stdout: (data) => {
@@ -114,7 +107,6 @@ function escapeRegExp(string) {
 }
 function patternToRegExp(value) {
     return new RegExp(`^${value
-        .toString()
         .split(GLOB_PATTERN)
         .reduce(function (arr, cur) {
         if (cur === "**") {
@@ -148,30 +140,35 @@ function branchesToArray(branches) {
     }
     return "**";
 }
+var MissingTriggers;
+(function (MissingTriggers) {
+    MissingTriggers[MissingTriggers["None"] = 0] = "None";
+    MissingTriggers[MissingTriggers["Push"] = 1] = "Push";
+    MissingTriggers[MissingTriggers["PullRequest"] = 2] = "PullRequest";
+})(MissingTriggers || (MissingTriggers = {}));
 function toCodedErrors(errors) {
     return Object.entries(errors).reduce((acc, [key, value]) => {
         acc[key] = { message: value, code: key };
         return acc;
     }, {});
 }
-// code to send back via status report
-// message to add as a warning annotation to the run
 exports.WorkflowErrors = toCodedErrors({
     MismatchedBranches: `Please make sure that every branch in on.pull_request is also in on.push so that Code Scanning can compare pull requests against the state of the base branch.`,
+    MissingHooks: `Please specify on.push and on.pull_request hooks so that Code Scanning can compare pull requests against the state of the base branch.`,
+    MissingPullRequestHook: `Please specify an on.pull_request hook so that Code Scanning is explicitly run against pull requests. This will be required to see results on pull requests from January 31 2021.`,
     MissingPushHook: `Please specify an on.push hook so that Code Scanning can compare pull requests against the state of the base branch.`,
     PathsSpecified: `Using on.push.paths can prevent Code Scanning annotating new alerts in your pull requests.`,
     PathsIgnoreSpecified: `Using on.push.paths-ignore can prevent Code Scanning annotating new alerts in your pull requests.`,
     CheckoutWrongHead: `git checkout HEAD^2 is no longer necessary. Please remove this step as Code Scanning recommends analyzing the merge commit for best results.`,
+    LintFailed: `Unable to lint workflow for CodeQL.`,
 });
-function getWorkflowErrors(doc) {
+function validateWorkflow(doc) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const errors = [];
-    const jobName = process.env.GITHUB_JOB;
+    // .jobs[key].steps[].run
-    if (jobName) {
+    for (const job of Object.values(((_a = doc) === null || _a === void 0 ? void 0 : _a.jobs) || {})) {
-        const job = (_b = (_a = doc) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b[jobName];
+        if (Array.isArray((_b = job) === null || _b === void 0 ? void 0 : _b.steps)) {
-        const steps = (_c = job) === null || _c === void 0 ? void 0 : _c.steps;
+            for (const step of (_c = job) === null || _c === void 0 ? void 0 : _c.steps) {
-        if (Array.isArray(steps)) {
-            for (const step of steps) {
                 // this was advice that we used to give in the README
                 // we actually want to run the analysis on the merge commit
                 // to produce results that are more inline with expectations
@@ -179,34 +176,43 @@ function getWorkflowErrors(doc) {
                 // and avoid some race conditions
                 if (((_d = step) === null || _d === void 0 ? void 0 : _d.run) === "git checkout HEAD^2") {
                     errors.push(exports.WorkflowErrors.CheckoutWrongHead);
-                    break;
                 }
             }
         }
     }
-    let missingPush = false;
+    let missing = MissingTriggers.None;
     if (doc.on === undefined) {
-        // this is not a valid config
+        missing = MissingTriggers.Push | MissingTriggers.PullRequest;
     }
     else if (typeof doc.on === "string") {
-        if (doc.on === "pull_request") {
+        switch (doc.on) {
-            missingPush = true;
+            case "push":
+                missing = MissingTriggers.PullRequest;
+                break;
+            case "pull_request":
+                missing = MissingTriggers.Push;
+                break;
+            default:
+                missing = MissingTriggers.Push | MissingTriggers.PullRequest;
+                break;
         }
     }
     else if (Array.isArray(doc.on)) {
-        const hasPush = doc.on.includes("push");
+        if (!doc.on.includes("push")) {
-        const hasPullRequest = doc.on.includes("pull_request");
+            missing = missing | MissingTriggers.Push;
-        if (hasPullRequest && !hasPush) {
+        }
-            missingPush = true;
+        if (!doc.on.includes("pull_request")) {
+            missing = missing | MissingTriggers.PullRequest;
         }
     }
     else if (isObject(doc.on)) {
-        const hasPush = Object.prototype.hasOwnProperty.call(doc.on, "push");
+        if (!Object.prototype.hasOwnProperty.call(doc.on, "pull_request")) {
-        const hasPullRequest = Object.prototype.hasOwnProperty.call(doc.on, "pull_request");
+            missing = missing | MissingTriggers.PullRequest;
-        if (!hasPush && hasPullRequest) {
-            missingPush = true;
         }
-        if (hasPush && hasPullRequest) {
+        if (!Object.prototype.hasOwnProperty.call(doc.on, "push")) {
+            missing = missing | MissingTriggers.Push;
+        }
+        else {
             const paths = (_e = doc.on.push) === null || _e === void 0 ? void 0 : _e.paths;
             // if you specify paths or paths-ignore you can end up with commits that have no baseline
             // if they didn't change any files
@@ -219,63 +225,56 @@ function getWorkflowErrors(doc) {
                 errors.push(exports.WorkflowErrors.PathsIgnoreSpecified);
             }
         }
-        // if doc.on.pull_request is null that means 'all branches'
+        const push = branchesToArray((_g = doc.on.push) === null || _g === void 0 ? void 0 : _g.branches);
-        // if doc.on.pull_request is undefined that means 'off'
+        if (push !== "**") {
-        // we only want to check for mismatched branches if pull_request is on.
+            const pull_request = branchesToArray((_h = doc.on.pull_request) === null || _h === void 0 ? void 0 : _h.branches);
-        if (doc.on.pull_request !== undefined) {
+            if (pull_request !== "**") {
-            const push = branchesToArray((_g = doc.on.push) === null || _g === void 0 ? void 0 : _g.branches);
+                const difference = pull_request.filter((value) => !push.some((o) => patternIsSuperset(o, value)));
-            if (push !== "**") {
+                if (difference.length > 0) {
-                const pull_request = branchesToArray((_h = doc.on.pull_request) === null || _h === void 0 ? void 0 : _h.branches);
+                    // there are branches in pull_request that may not have a baseline
-                if (pull_request !== "**") {
+                    // because we are not building them on push
-                    const difference = pull_request.filter((value) => !push.some((o) => patternIsSuperset(o, value)));
-                    if (difference.length > 0) {
-                        // there are branches in pull_request that may not have a baseline
-                        // because we are not building them on push
-                        errors.push(exports.WorkflowErrors.MismatchedBranches);
-                    }
-                }
-                else if (push.length > 0) {
-                    // push is set up to run on a subset of branches
-                    // and you could open a PR against a branch with no baseline
                     errors.push(exports.WorkflowErrors.MismatchedBranches);
                 }
             }
+            else if (push.length > 0) {
+                // push is set up to run on a subset of branches
+                // and you could open a PR against a branch with no baseline
+                errors.push(exports.WorkflowErrors.MismatchedBranches);
+            }
         }
     }
-    if (missingPush) {
+    else {
-        errors.push(exports.WorkflowErrors.MissingPushHook);
+        // on is not a known type
+        // this workflow is likely malformed
+        missing = MissingTriggers.Push | MissingTriggers.PullRequest;
+    }
+    switch (missing) {
+        case MissingTriggers.PullRequest | MissingTriggers.Push:
+            errors.push(exports.WorkflowErrors.MissingHooks);
+            break;
+        case MissingTriggers.PullRequest:
+            errors.push(exports.WorkflowErrors.MissingPullRequestHook);
+            break;
+        case MissingTriggers.Push:
+            errors.push(exports.WorkflowErrors.MissingPushHook);
+            break;
     }
     return errors;
 }
-exports.getWorkflowErrors = getWorkflowErrors;
-async function validateWorkflow() {
-    let workflow;
-    try {
-        workflow = await getWorkflow();
-    }
-    catch (e) {
-        return `error: getWorkflow() failed: ${e.toString()}`;
-    }
-    let workflowErrors;
-    try {
-        workflowErrors = getWorkflowErrors(workflow);
-    }
-    catch (e) {
-        return `error: getWorkflowErrors() failed: ${e.toString()}`;
-    }
-    if (workflowErrors.length > 0) {
-        let message;
-        try {
-            message = formatWorkflowErrors(workflowErrors);
-        }
-        catch (e) {
-            return `error: formatWorkflowErrors() failed: ${e.toString()}`;
-        }
-        core.warning(message);
-    }
-    return formatWorkflowCause(workflowErrors);
-}
 exports.validateWorkflow = validateWorkflow;
+async function getWorkflowErrors() {
+    try {
+        const workflow = await getWorkflow();
+        if (workflow === undefined) {
+            return [];
+        }
+        return validateWorkflow(workflow);
+    }
+    catch (e) {
+        return [exports.WorkflowErrors.LintFailed];
+    }
+}
+exports.getWorkflowErrors = getWorkflowErrors;
 function formatWorkflowErrors(errors) {
     const issuesWere = errors.length === 1 ? "issue was" : "issues were";
     const errorsList = errors.map((e) => e.message).join(" ");
@@ -292,7 +291,13 @@ exports.formatWorkflowCause = formatWorkflowCause;
 async function getWorkflow() {
     const relativePath = await getWorkflowPath();
     const absolutePath = path.join(getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath);
-    return yaml.safeLoad(fs.readFileSync(absolutePath, "utf-8"));
+    try {
+        return yaml.safeLoad(fs.readFileSync(absolutePath, "utf-8"));
+    }
+    catch (e) {
+        core.warning(`Could not read workflow: ${e.toString()}`);
+        return undefined;
+    }
 }
 exports.getWorkflow = getWorkflow;
 /**
@@ -328,7 +333,7 @@ function getWorkflowRunID() {
 }
 exports.getWorkflowRunID = getWorkflowRunID;
 /**
- * Get the analysis key parameter for the current job.
+ * Get the analysis key paramter for the current job.
  *
  * This will combine the workflow path and current job name.
  * Computing this the first time requires making requests to
@@ -354,28 +359,15 @@ async function getRef() {
     // Will be in the form "refs/heads/master" on a push event
     // or in the form "refs/pull/N/merge" on a pull_request event
     const ref = getRequiredEnvParam("GITHUB_REF");
-    const sha = getRequiredEnvParam("GITHUB_SHA");
     // For pull request refs we want to detect whether the workflow
     // has run `git checkout HEAD^2` to analyze the 'head' ref rather
     // than the 'merge' ref. If so, we want to convert the ref that
     // we report back.
     const pull_ref_regex = /refs\/pull\/(\d+)\/merge/;
-    if (!pull_ref_regex.test(ref)) {
+    const checkoutSha = await exports.getCommitOid();
-        return ref;
+    if (pull_ref_regex.test(ref) &&
-    }
+        checkoutSha !== getRequiredEnvParam("GITHUB_SHA")) {
-    const head = await exports.getCommitOid("HEAD");
+        return ref.replace(pull_ref_regex, "refs/pull/$1/head");
-    // in actions/checkout@v2 we can check if git rev-parse HEAD == GITHUB_SHA
-    // in actions/checkout@v1 this may not be true as it checks out the repository
-    // using GITHUB_REF. There is a subtle race condition where
-    // git rev-parse GITHUB_REF != GITHUB_SHA, so we must check
-    // git git-parse GITHUB_REF == git rev-parse HEAD instead.
-    const hasChangedRef = sha !== head &&
-        (await exports.getCommitOid(ref.replace(/^refs\/pull\//, "refs/remotes/pull/"))) !==
-            head;
-    if (hasChangedRef) {
-        const newRef = ref.replace(pull_ref_regex, "refs/pull/$1/head");
-        core.debug(`No longer on merge commit, rewriting ref from ${ref} to ${newRef}.`);
-        return newRef;
     }
     else {
         return ref;
@@ -447,10 +439,6 @@ function isHTTPError(arg) {
     var _a;
     return ((_a = arg) === null || _a === void 0 ? void 0 : _a.status) !== undefined && Number.isInteger(arg.status);
 }
-const GENERIC_403_MSG = "The repo on which this action is running is not opted-in to CodeQL code scanning.";
-const GENERIC_404_MSG = "Not authorized to used the CodeQL code scanning feature on this repo.";
-const OUT_OF_DATE_MSG = "CodeQL Action is out-of-date. Please upgrade to the latest version of codeql-action.";
-const INCOMPATIBLE_MSG = "CodeQL Action version is incompatible with the code scanning endpoint. Please update to a compatible version of codeql-action.";
 /**
  * Send a status report to the code_scanning/analysis/status endpoint.
  *
@@ -479,51 +467,34 @@ async function sendStatusReport(statusReport) {
         return true;
     }
     catch (e) {
-        console.log(e);
         if (isHTTPError(e)) {
             switch (e.status) {
                 case 403:
-                    if (workflowIsTriggeredByPushEvent() && isDependabotActor()) {
+                    core.setFailed("The repo on which this action is running is not opted-in to CodeQL code scanning.");
-                        core.setFailed('Workflows triggered by Dependabot on the "push" event run with read-only access. ' +
-                            "Uploading Code Scanning results requires write access. " +
-                            'To use Code Scanning with Dependabot, please ensure you are using the "pull_request" event for this workflow and avoid triggering on the "push" event for Dependabot branches. ' +
-                            "See https://docs.github.com/en/code-security/secure-coding/configuring-code-scanning#scanning-on-push for more information on how to configure these events.");
-                    }
-                    else {
-                        core.setFailed(e.message || GENERIC_403_MSG);
-                    }
                     return false;
                 case 404:
-                    core.setFailed(GENERIC_404_MSG);
+                    core.setFailed("Not authorized to used the CodeQL code scanning feature on this repo.");
                     return false;
                 case 422:
                     // schema incompatibility when reporting status
                     // this means that this action version is no longer compatible with the API
                     // we still want to continue as it is likely the analysis endpoint will work
                     if (getRequiredEnvParam("GITHUB_SERVER_URL") !== util_1.GITHUB_DOTCOM_URL) {
-                        core.debug(INCOMPATIBLE_MSG);
+                        core.debug("CodeQL Action version is incompatible with the code scanning endpoint. Please update to a compatible version of codeql-action.");
                     }
                     else {
-                        core.debug(OUT_OF_DATE_MSG);
+                        core.debug("CodeQL Action is out-of-date. Please upgrade to the latest version of codeql-action.");
                     }
                     return true;
             }
         }
         // something else has gone wrong and the request/response will be logged by octokit
         // it's possible this is a transient error and we should continue scanning
-        core.error("An unexpected error occurred when sending code scanning status report.");
+        core.error("An unexpected error occured when sending code scanning status report.");
         return true;
     }
 }
 exports.sendStatusReport = sendStatusReport;
-// Was the workflow run triggered by a `push` event, for example as opposed to a `pull_request` event.
-function workflowIsTriggeredByPushEvent() {
-    return process.env["GITHUB_EVENT_NAME"] === "push";
-}
-// Is dependabot the actor that triggered the current workflow run.
-function isDependabotActor() {
-    return process.env["GITHUB_ACTOR"] === "dependabot[bot]";
-}
 // Is the current action executing a local copy (i.e. we're running a workflow on the codeql-action repo itself)
 // as opposed to running a remote action (i.e. when another repo references us)
 function isRunningLocalAction() {

lib/actions-util.test.js

@@ -11,13 +11,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ava_1 = __importDefault(require("ava"));
-const yaml = __importStar(require("js-yaml"));
 const sinon_1 = __importDefault(require("sinon"));
 const actionsutil = __importStar(require("./actions-util"));
 const testing_utils_1 = require("./testing-utils");
-function errorCodes(actual, expected) {
-    return [actual.map(({ code }) => code), expected.map(({ code }) => code)];
-}
 testing_utils_1.setupTests(ava_1.default);
 ava_1.default("getRef() throws on the empty string", async (t) => {
     process.env["GITHUB_REF"] = "";
@@ -28,33 +24,16 @@ ava_1.default("getRef() returns merge PR ref if GITHUB_SHA still checked out", a
     const currentSha = "a".repeat(40);
     process.env["GITHUB_REF"] = expectedRef;
     process.env["GITHUB_SHA"] = currentSha;
-    const callback = sinon_1.default.stub(actionsutil, "getCommitOid");
+    sinon_1.default.stub(actionsutil, "getCommitOid").resolves(currentSha);
-    callback.withArgs("HEAD").resolves(currentSha);
     const actualRef = await actionsutil.getRef();
     t.deepEqual(actualRef, expectedRef);
-    callback.restore();
 });
-ava_1.default("getRef() returns merge PR ref if GITHUB_REF still checked out but sha has changed (actions checkout@v1)", async (t) => {
+ava_1.default("getRef() returns head PR ref if GITHUB_SHA not currently checked out", async (t) => {
-    const expectedRef = "refs/pull/1/merge";
-    process.env["GITHUB_REF"] = expectedRef;
-    process.env["GITHUB_SHA"] = "b".repeat(40);
-    const sha = "a".repeat(40);
-    const callback = sinon_1.default.stub(actionsutil, "getCommitOid");
-    callback.withArgs("refs/remotes/pull/1/merge").resolves(sha);
-    callback.withArgs("HEAD").resolves(sha);
-    const actualRef = await actionsutil.getRef();
-    t.deepEqual(actualRef, expectedRef);
-    callback.restore();
-});
-ava_1.default("getRef() returns head PR ref if GITHUB_REF no longer checked out", async (t) => {
     process.env["GITHUB_REF"] = "refs/pull/1/merge";
     process.env["GITHUB_SHA"] = "a".repeat(40);
-    const callback = sinon_1.default.stub(actionsutil, "getCommitOid");
+    sinon_1.default.stub(actionsutil, "getCommitOid").resolves("b".repeat(40));
-    callback.withArgs("refs/pull/1/merge").resolves("a".repeat(40));
-    callback.withArgs("HEAD").resolves("b".repeat(40));
     const actualRef = await actionsutil.getRef();
     t.deepEqual(actualRef, "refs/pull/1/head");
-    callback.restore();
 });
 ava_1.default("getAnalysisKey() when a local run", async (t) => {
     process.env.CODEQL_LOCAL_RUN = "true";
@@ -89,136 +68,141 @@ ava_1.default("prepareEnvironment() when a local run", (t) => {
     t.deepEqual(process.env.GITHUB_JOB, "UNKNOWN-JOB");
     t.deepEqual(process.env.CODEQL_ACTION_ANALYSIS_KEY, "LOCAL-RUN:UNKNOWN-JOB");
 });
-ava_1.default("getWorkflowErrors() when on is empty", (t) => {
+ava_1.default("validateWorkflow() when on is missing", (t) => {
-    const errors = actionsutil.getWorkflowErrors({ on: {} });
+    const errors = actionsutil.validateWorkflow({});
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MissingHooks]);
 });
-ava_1.default("getWorkflowErrors() when on.push is an array missing pull_request", (t) => {
+ava_1.default("validateWorkflow() when on.push is missing", (t) => {
-    const errors = actionsutil.getWorkflowErrors({ on: ["push"] });
+    const errors = actionsutil.validateWorkflow({ on: {} });
-    t.deepEqual(...errorCodes(errors, []));
+    console.log(errors);
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MissingHooks]);
 });
-ava_1.default("getWorkflowErrors() when on.push is an array missing push", (t) => {
+ava_1.default("validateWorkflow() when on.push is an array missing pull_request", (t) => {
-    const errors = actionsutil.getWorkflowErrors({ on: ["pull_request"] });
+    const errors = actionsutil.validateWorkflow({ on: ["push"] });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.MissingPushHook]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MissingPullRequestHook]);
 });
-ava_1.default("getWorkflowErrors() when on.push is valid", (t) => {
+ava_1.default("validateWorkflow() when on.push is an array missing push", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({ on: ["pull_request"] });
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MissingPushHook]);
+});
+ava_1.default("validateWorkflow() when on.push is valid", (t) => {
+    const errors = actionsutil.validateWorkflow({
         on: ["push", "pull_request"],
     });
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, []);
 });
-ava_1.default("getWorkflowErrors() when on.push is a valid superset", (t) => {
+ava_1.default("validateWorkflow() when on.push is a valid superset", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: ["push", "pull_request", "schedule"],
     });
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, []);
 });
-ava_1.default("getWorkflowErrors() when on.push should not have a path", (t) => {
+ava_1.default("validateWorkflow() when on.push should not have a path", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: {
             push: { branches: ["main"], paths: ["test/*"] },
             pull_request: { branches: ["main"] },
         },
     });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.PathsSpecified]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.PathsSpecified]);
 });
-ava_1.default("getWorkflowErrors() when on.push is a correct object", (t) => {
+ava_1.default("validateWorkflow() when on.push is a correct object", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: { push: { branches: ["main"] }, pull_request: { branches: ["main"] } },
     });
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, []);
 });
-ava_1.default("getWorkflowErrors() when on.pull_requests is a string", (t) => {
+ava_1.default("validateWorkflow() when on.pull_requests is a string", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: { push: { branches: ["main"] }, pull_request: { branches: "*" } },
     });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.MismatchedBranches]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MismatchedBranches]);
 });
-ava_1.default("getWorkflowErrors() when on.pull_requests is a string and correct", (t) => {
+ava_1.default("validateWorkflow() when on.pull_requests is a string and correct", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: { push: { branches: "*" }, pull_request: { branches: "*" } },
     });
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, []);
 });
-ava_1.default("getWorkflowErrors() when on.push is correct with empty objects", (t) => {
+ava_1.default("validateWorkflow() when on.push is correct with empty objects", (t) => {
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
+    const errors = actionsutil.validateWorkflow({
-on:
+        on: { push: undefined, pull_request: undefined },
-  push:
+    });
-  pull_request:
+    t.deepEqual(errors, []);
-`));
-    t.deepEqual(...errorCodes(errors, []));
 });
-ava_1.default("getWorkflowErrors() when on.push is mismatched", (t) => {
+ava_1.default("validateWorkflow() when on.push is mismatched", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: {
             push: { branches: ["main"] },
             pull_request: { branches: ["feature"] },
         },
     });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.MismatchedBranches]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MismatchedBranches]);
 });
-ava_1.default("getWorkflowErrors() when on.push is not mismatched", (t) => {
+ava_1.default("validateWorkflow() when on.push is not mismatched", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: {
             push: { branches: ["main", "feature"] },
             pull_request: { branches: ["main"] },
         },
     });
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, []);
 });
-ava_1.default("getWorkflowErrors() when on.push is mismatched for pull_request", (t) => {
+ava_1.default("validateWorkflow() when on.push is mismatched for pull_request", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: {
             push: { branches: ["main"] },
             pull_request: { branches: ["main", "feature"] },
         },
     });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.MismatchedBranches]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MismatchedBranches]);
 });
-ava_1.default("getWorkflowErrors() for a range of malformed workflows", (t) => {
+ava_1.default("validateWorkflow() for a range of malformed workflows", (t) => {
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: {
             push: 1,
             pull_request: 1,
         },
-    }), []));
+    }), []);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: 1,
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: [1],
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: { 1: 1 },
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: { test: 1 },
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: { test: [1] },
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: { test: { steps: 1 } },
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: { test: { steps: [{ notrun: "git checkout HEAD^2" }] } },
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+    t.deepEqual(actionsutil.validateWorkflow({
         on: 1,
         jobs: { test: [undefined] },
-    }), []));
+    }), [actionsutil.WorkflowErrors.MissingHooks]);
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(1), []));
+    t.deepEqual(actionsutil.validateWorkflow(1), [
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
+        actionsutil.WorkflowErrors.MissingHooks,
+    ]);
+    t.deepEqual(actionsutil.validateWorkflow({
         on: {
             push: {
                 branches: 1,
@@ -227,43 +211,41 @@ ava_1.default("getWorkflowErrors() for a range of malformed workflows", (t) => {
                 branches: 1,
             },
         },
-    }), []));
+    }), []);
 });
-ava_1.default("getWorkflowErrors() when on.pull_request for every branch but push specifies branches", (t) => {
+ava_1.default("validateWorkflow() when on.pull_request for every branch but push specifies branches", (t) => {
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
+    const errors = actionsutil.validateWorkflow({
-name: "CodeQL"
+        on: {
-on:
+            push: { branches: ["main"] },
-  push:
+            pull_request: null,
-    branches: ["main"]
+        },
-  pull_request:
+    });
-`));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MismatchedBranches]);
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.MismatchedBranches]));
 });
-ava_1.default("getWorkflowErrors() when on.pull_request for wildcard branches", (t) => {
+ava_1.default("validateWorkflow() when on.pull_request for wildcard branches", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: {
             push: { branches: ["feature/*"] },
             pull_request: { branches: "feature/moose" },
         },
     });
-    t.deepEqual(...errorCodes(errors, []));
+    t.deepEqual(errors, []);
 });
-ava_1.default("getWorkflowErrors() when on.pull_request for mismatched wildcard branches", (t) => {
+ava_1.default("validateWorkflow() when on.pull_request for mismatched wildcard branches", (t) => {
-    const errors = actionsutil.getWorkflowErrors({
+    const errors = actionsutil.validateWorkflow({
         on: {
             push: { branches: ["feature/moose"] },
             pull_request: { branches: "feature/*" },
         },
     });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.MismatchedBranches]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.MismatchedBranches]);
 });
-ava_1.default("getWorkflowErrors() when HEAD^2 is checked out", (t) => {
+ava_1.default("validateWorkflow() when HEAD^2 is checked out", (t) => {
-    process.env.GITHUB_JOB = "test";
+    const errors = actionsutil.validateWorkflow({
-    const errors = actionsutil.getWorkflowErrors({
         on: ["push", "pull_request"],
         jobs: { test: { steps: [{ run: "git checkout HEAD^2" }] } },
     });
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.CheckoutWrongHead]));
+    t.deepEqual(errors, [actionsutil.WorkflowErrors.CheckoutWrongHead]);
 });
 ava_1.default("formatWorkflowErrors() when there is one error", (t) => {
     const message = actionsutil.formatWorkflowErrors([
@@ -278,10 +260,6 @@ ava_1.default("formatWorkflowErrors() when there are multiple errors", (t) => {
     ]);
     t.true(message.startsWith("2 issues were detected with this workflow:"));
 });
-ava_1.default("formatWorkflowCause() with no errors", (t) => {
-    const message = actionsutil.formatWorkflowCause([]);
-    t.deepEqual(message, undefined);
-});
 ava_1.default("formatWorkflowCause()", (t) => {
     const message = actionsutil.formatWorkflowCause([
         actionsutil.WorkflowErrors.CheckoutWrongHead,
@@ -312,108 +290,4 @@ ava_1.default("patternIsSuperset()", (t) => {
     t.true(actionsutil.patternIsSuperset("/robin/*/release/*", "/robin/moose/release/goose"));
     t.false(actionsutil.patternIsSuperset("/robin/moose/release/goose", "/robin/*/release/*"));
 });
-ava_1.default("getWorkflowErrors() when branches contain dots", (t) => {
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
-  on:
-    push:
-      branches: [4.1, master]
-    pull_request:
-      # The branches below must be a subset of the branches above
-      branches: [4.1, master]
-`));
-    t.deepEqual(...errorCodes(errors, []));
-});
-ava_1.default("getWorkflowErrors() when on.push has a trailing comma", (t) => {
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on:
-  push:
-    branches: [master, ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-`));
-    t.deepEqual(...errorCodes(errors, []));
-});
-ava_1.default("getWorkflowErrors() should only report the current job's CheckoutWrongHead", (t) => {
-    process.env.GITHUB_JOB = "test";
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-jobs:
-  test:
-    steps:
-      - run: "git checkout HEAD^2"
-
-  test2:
-    steps:
-      - run: "git checkout HEAD^2"
-
-  test3:
-    steps: []
-`));
-    t.deepEqual(...errorCodes(errors, [actionsutil.WorkflowErrors.CheckoutWrongHead]));
-});
-ava_1.default("getWorkflowErrors() should not report a different job's CheckoutWrongHead", (t) => {
-    process.env.GITHUB_JOB = "test3";
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-jobs:
-  test:
-    steps:
-      - run: "git checkout HEAD^2"
-
-  test2:
-    steps:
-      - run: "git checkout HEAD^2"
-
-  test3:
-    steps: []
-`));
-    t.deepEqual(...errorCodes(errors, []));
-});
-ava_1.default("getWorkflowErrors() when on is missing", (t) => {
-    const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-`));
-    t.deepEqual(...errorCodes(errors, []));
-});
-ava_1.default("getWorkflowErrors() with a different on setup", (t) => {
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on: "workflow_dispatch"
-`)), []));
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on: [workflow_dispatch]
-`)), []));
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on:
-  workflow_dispatch: {}
-`)), []));
-});
-ava_1.default("getWorkflowErrors() should not report an error if PRs are totally unconfigured", (t) => {
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on:
-  push:
-    branches: [master]
-`)), []));
-    t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(`
-name: "CodeQL"
-on: ["push"]
-`)), []));
-});
 //# sourceMappingURL=actions-util.test.js.map

lib/analysis-paths.js

@@ -28,7 +28,7 @@ function printPathFiltersWarning(config, logger) {
     // If any other languages are detected/configured then show a warning.
     if ((config.paths.length !== 0 || config.pathsIgnore.length !== 0) &&
         !config.languages.every(isInterpretedLanguage)) {
-        logger.warning('The "paths"/"paths-ignore" fields of the config only have effect for JavaScript and Python');
+        logger.warning('The "paths"/"paths-ignore" fields of the config only have effect for Javascript and Python');
     }
 }
 exports.printPathFiltersWarning = printPathFiltersWarning;

lib/analysis-paths.test.js

@@ -27,7 +27,7 @@ ava_1.default("emptyPaths", async (t) => {
             tempDir: tmpDir,
             toolCacheDir: tmpDir,
             codeQLCmd: "",
-            gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+            gitHubVersion: { type: "dotcom" },
         };
         analysisPaths.includeAndExcludeAnalysisPaths(config);
         t.is(process.env["LGTM_INDEX_INCLUDE"], undefined);
@@ -46,7 +46,7 @@ ava_1.default("nonEmptyPaths", async (t) => {
             tempDir: tmpDir,
             toolCacheDir: tmpDir,
             codeQLCmd: "",
-            gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+            gitHubVersion: { type: "dotcom" },
         };
         analysisPaths.includeAndExcludeAnalysisPaths(config);
         t.is(process.env["LGTM_INDEX_INCLUDE"], "path1\npath2");
@@ -66,7 +66,7 @@ ava_1.default("exclude temp dir", async (t) => {
             tempDir,
             toolCacheDir,
             codeQLCmd: "",
-            gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+            gitHubVersion: { type: "dotcom" },
         };
         analysisPaths.includeAndExcludeAnalysisPaths(config);
         t.is(process.env["LGTM_INDEX_INCLUDE"], undefined);

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,2CAA6B;AAE7B,8CAAuB;AAEvB,gEAAkD;AAClD,mDAA6C;AAC7C,6CAA+B;AAE/B,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,aAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC7B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5C,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;YACb,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAwB;SACzE,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,EAAE,CAAC,EAAE,EAAE;IAChC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5C,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;YACb,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAwB;SACzE,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,CACF,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EACjC,gGAAgG,CACjG,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACnC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oBAAoB,CAAC,CAAC;QAC/D,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;YACP,YAAY;YACZ,SAAS,EAAE,EAAE;YACb,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAwB;SACzE,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,oBAAoB,CAAC,CAAC;QAC9D,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"analysis-paths.test.js","sourceRoot":"","sources":["../src/analysis-paths.test.ts"],"names":[],"mappings":"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"}

lib/analyze-action.js

@@ -7,14 +7,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
 const core = __importStar(require("@actions/core"));
 const actionsUtil = __importStar(require("./actions-util"));
 const analyze_1 = require("./analyze");
 const config_utils_1 = require("./config-utils");
 const logging_1 = require("./logging");
-const upload_lib = __importStar(require("./upload-lib"));
+const repository_1 = require("./repository");
 const util = __importStar(require("./util"));
 async function sendStatusReport(startedAt, stats, error) {
     var _a, _b, _c;
@@ -31,14 +29,13 @@ async function sendStatusReport(startedAt, stats, error) {
 async function run() {
     const startedAt = new Date();
     let stats = undefined;
-    let config = undefined;
     try {
         actionsUtil.prepareLocalRunEnvironment();
         if (!(await actionsUtil.sendStatusReport(await actionsUtil.createStatusReportBase("finish", "starting", startedAt)))) {
             return;
         }
         const logger = logging_1.getActionsLogger();
-        config = await config_utils_1.getConfig(actionsUtil.getTemporaryDirectory(), logger);
+        const config = await config_utils_1.getConfig(actionsUtil.getRequiredEnvParam("RUNNER_TEMP"), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
         }
@@ -46,16 +43,7 @@ async function run() {
             auth: actionsUtil.getRequiredInput("token"),
             url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
         };
-        const outputDir = actionsUtil.getRequiredInput("output");
+        stats = await analyze_1.runAnalyze(repository_1.parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")), await actionsUtil.getCommitOid(), await actionsUtil.getRef(), await actionsUtil.getAnalysisKey(), actionsUtil.getRequiredEnvParam("GITHUB_WORKFLOW"), actionsUtil.getWorkflowRunID(), actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getRequiredInput("matrix"), apiDetails, actionsUtil.getRequiredInput("upload") === "true", "actions", actionsUtil.getRequiredInput("output"), util.getMemoryFlag(actionsUtil.getOptionalInput("ram")), util.getAddSnippetsFlag(actionsUtil.getRequiredInput("add-snippets")), util.getThreadsFlag(actionsUtil.getOptionalInput("threads"), logger), config, logger);
-        const queriesStats = await analyze_1.runAnalyze(outputDir, util.getMemoryFlag(actionsUtil.getOptionalInput("ram")), util.getAddSnippetsFlag(actionsUtil.getRequiredInput("add-snippets")), util.getThreadsFlag(actionsUtil.getOptionalInput("threads"), logger), config, logger);
-        if (actionsUtil.getRequiredInput("upload") === "true") {
-            const uploadStats = await upload_lib.uploadFromActions(outputDir, config.gitHubVersion, apiDetails, logger);
-            stats = { ...queriesStats, ...uploadStats };
-        }
-        else {
-            logger.info("Not uploading results");
-            stats = { ...queriesStats };
-        }
     }
     catch (error) {
         core.setFailed(error.message);
@@ -66,29 +54,6 @@ async function run() {
         await sendStatusReport(startedAt, stats, error);
         return;
     }
-    finally {
-        if (core.isDebug() && config !== undefined) {
-            core.info("Debug mode is on. Printing CodeQL debug logs...");
-            for (const language of config.languages) {
-                const databaseDirectory = util.getCodeQLDatabasePath(config.tempDir, language);
-                const logsDirectory = path.join(databaseDirectory, "log");
-                const walkLogFiles = (dir) => {
-                    const entries = fs.readdirSync(dir, { withFileTypes: true });
-                    for (const entry of entries) {
-                        if (entry.isFile()) {
-                            core.startGroup(`CodeQL Debug Logs - ${language} - ${entry.name}`);
-                            process.stdout.write(fs.readFileSync(path.resolve(dir, entry.name)));
-                            core.endGroup();
-                        }
-                        else if (entry.isDirectory()) {
-                            walkLogFiles(path.resolve(dir, entry.name));
-                        }
-                    }
-                };
-                walkLogFiles(logsDirectory);
-            }
-        }
-    }
     await sendStatusReport(startedAt, stats);
 }
 async function runWrapper() {

lib/analyze-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-action.js","sourceRoot":"","sources":["../src/analyze-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyze-action.js","sourceRoot":"","sources":["../src/analyze-action.ts"],"names":[],"mappings":"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"}

lib/analyze.js

@@ -14,6 +14,7 @@ const analysisPaths = __importStar(require("./analysis-paths"));
 const codeql_1 = require("./codeql");
 const languages_1 = require("./languages");
 const sharedEnv = __importStar(require("./shared-environment"));
+const upload_lib = __importStar(require("./upload-lib"));
 const util = __importStar(require("./util"));
 class CodeQLAnalysisError extends Error {
     constructor(queriesStatusReport, message) {
@@ -116,7 +117,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
     return statusReport;
 }
 exports.runQueries = runQueries;
-async function runAnalyze(outputDir, memoryFlag, addSnippetsFlag, threadsFlag, config, logger) {
+async function runAnalyze(repositoryNwo, commitOid, ref, analysisKey, analysisName, workflowRunID, checkoutPath, environment, apiDetails, doUpload, mode, outputDir, memoryFlag, addSnippetsFlag, threadsFlag, config, logger) {
     // Delete the tracer config env var to avoid tracing ourselves
     delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION];
     fs.mkdirSync(outputDir, { recursive: true });
@@ -124,7 +125,12 @@ async function runAnalyze(outputDir, memoryFlag, addSnippetsFlag, threadsFlag, c
     await finalizeDatabaseCreation(config, threadsFlag, logger);
     logger.info("Analyzing database");
     const queriesStats = await runQueries(outputDir, memoryFlag, addSnippetsFlag, threadsFlag, config, logger);
-    return { ...queriesStats };
+    if (!doUpload) {
+        logger.info("Not uploading results");
+        return { ...queriesStats };
+    }
+    const uploadStats = await upload_lib.upload(outputDir, repositoryNwo, commitOid, ref, analysisKey, analysisName, workflowRunID, checkoutPath, environment, config.gitHubVersion, apiDetails, mode, logger);
+    return { ...queriesStats, ...uploadStats };
 }
 exports.runAnalyze = runAnalyze;
 //# sourceMappingURL=analyze.js.map

lib/analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"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"}

lib/analyze.test.js

@@ -39,9 +39,7 @@ ava_1.default("status report fields", async (t) => {
                 tempDir: tmpDir,
                 toolCacheDir: tmpDir,
                 codeQLCmd: "",
-                gitHubVersion: {
+                gitHubVersion: { type: "dotcom" },
-                    type: util.GitHubVariant.DOTCOM,
-                },
             };
             fs.mkdirSync(util.getCodeQLDatabasePath(config.tempDir, language), {
                 recursive: true,

lib/analyze.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.test.js","sourceRoot":"","sources":["../src/analyze.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAyB;AAEzB,8CAAuB;AAEvB,uCAAuC;AACvC,qCAAqC;AAErC,2CAAuC;AACvC,uCAA4C;AAC5C,mDAA6C;AAC7C,6CAA+B;AAE/B,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,yEAAyE;AACzE,yCAAyC;AACzC,aAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACvC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5C,kBAAS,CAAC;YACR,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;SACvC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,EAAE,CAAC;QAEvB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAQ,CAAC,EAAE;YAC9C,MAAM,MAAM,GAAW;gBACrB,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,EAAE;gBACT,iBAAiB,EAAE,EAAE;gBACrB,OAAO,EAAE,MAAM;gBACf,YAAY,EAAE,MAAM;gBACpB,SAAS,EAAE,EAAE;gBACb,aAAa,EAAE;oBACb,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;iBACV;aACxB,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;gBACjE,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,OAAO,EAAE,CAAC,QAAQ,CAAC;gBACnB,MAAM,EAAE,EAAE;aACX,CAAC;YACF,MAAM,mBAAmB,GAAG,MAAM,oBAAU,CAC1C,MAAM,EACN,UAAU,EACV,eAAe,EACf,WAAW,EACX,MAAM,EACN,yBAAe,CAAC,IAAI,CAAC,CACtB,CAAC;YACF,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,IAAI,CACJ,2BAA2B,QAAQ,cAAc,IAAI,mBAAmB,CACzE,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,CAAC,QAAQ,CAAC;aACnB,CAAC;YACF,MAAM,kBAAkB,GAAG,MAAM,oBAAU,CACzC,MAAM,EACN,UAAU,EACV,eAAe,EACf,WAAW,EACX,MAAM,EACN,yBAAe,CAAC,IAAI,CAAC,CACtB,CAAC;YACF,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,IAAI,CACJ,0BAA0B,QAAQ,cAAc,IAAI,kBAAkB,CACvE,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"analyze.test.js","sourceRoot":"","sources":["../src/analyze.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAyB;AAEzB,8CAAuB;AAEvB,uCAAuC;AACvC,qCAAqC;AAErC,2CAAuC;AACvC,uCAA4C;AAC5C,mDAA6C;AAC7C,6CAA+B;AAE/B,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,yEAAyE;AACzE,yCAAyC;AACzC,aAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACvC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5C,kBAAS,CAAC;YACR,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;SACvC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,EAAE,CAAC;QAEvB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAQ,CAAC,EAAE;YAC9C,MAAM,MAAM,GAAW;gBACrB,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,EAAE;gBACT,iBAAiB,EAAE,EAAE;gBACrB,OAAO,EAAE,MAAM;gBACf,YAAY,EAAE,MAAM;gBACpB,SAAS,EAAE,EAAE;gBACb,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAwB;aACxD,CAAC;YACF,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;gBACjE,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,OAAO,EAAE,CAAC,QAAQ,CAAC;gBACnB,MAAM,EAAE,EAAE;aACX,CAAC;YACF,MAAM,mBAAmB,GAAG,MAAM,oBAAU,CAC1C,MAAM,EACN,UAAU,EACV,eAAe,EACf,WAAW,EACX,MAAM,EACN,yBAAe,CAAC,IAAI,CAAC,CACtB,CAAC;YACF,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,IAAI,CACJ,2BAA2B,QAAQ,cAAc,IAAI,mBAAmB,CACzE,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,CAAC,QAAQ,CAAC;aACnB,CAAC;YACF,MAAM,kBAAkB,GAAG,MAAM,oBAAU,CACzC,MAAM,EACN,UAAU,EACV,eAAe,EACf,WAAW,EACX,MAAM,EACN,yBAAe,CAAC,IAAI,CAAC,CACtB,CAAC;YACF,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,IAAI,CACJ,0BAA0B,QAAQ,cAAc,IAAI,kBAAkB,CACvE,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

lib/api-client.js

@@ -20,12 +20,11 @@ var DisallowedAPIVersionReason;
     DisallowedAPIVersionReason[DisallowedAPIVersionReason["ACTION_TOO_OLD"] = 0] = "ACTION_TOO_OLD";
     DisallowedAPIVersionReason[DisallowedAPIVersionReason["ACTION_TOO_NEW"] = 1] = "ACTION_TOO_NEW";
 })(DisallowedAPIVersionReason = exports.DisallowedAPIVersionReason || (exports.DisallowedAPIVersionReason = {}));
-exports.getApiClient = function (apiDetails, { allowLocalRun = false, allowExternal = false } = {}) {
+exports.getApiClient = function (apiDetails, allowLocalRun = false) {
     if (util_1.isLocalRun() && !allowLocalRun) {
         throw new Error("Invalid API call in local run");
     }
-    const auth = (allowExternal && apiDetails.externalRepoAuth) || apiDetails.auth;
+    return new githubUtils.GitHub(githubUtils.getOctokitOptions(apiDetails.auth, {
-    return new githubUtils.GitHub(githubUtils.getOctokitOptions(auth, {
         baseUrl: getApiUrl(apiDetails.url),
         userAgent: "CodeQL Action",
         log: console_log_level_1.default({ level: "debug" }),
@@ -50,7 +49,7 @@ function getActionsApiClient(allowLocalRun = false) {
         auth: actions_util_1.getRequiredInput("token"),
         url: actions_util_1.getRequiredEnvParam("GITHUB_SERVER_URL"),
     };
-    return exports.getApiClient(apiDetails, { allowLocalRun });
+    return exports.getApiClient(apiDetails, allowLocalRun);
 }
 exports.getActionsApiClient = getActionsApiClient;
 //# sourceMappingURL=api-client.js.map

lib/api-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6B;AAE7B,uEAAyD;AACzD,0EAAgD;AAEhD,iDAAuE;AACvE,iCAAoC;AAEpC,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,+FAAc,CAAA;IACd,+FAAc,CAAA;AAChB,CAAC,EAHW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAGrC;AAeY,QAAA,YAAY,GAAG,UAC1B,UAAoC,EACpC,EAAE,aAAa,GAAG,KAAK,EAAE,aAAa,GAAG,KAAK,EAAE,GAAG,EAAE;IAErD,IAAI,iBAAU,EAAE,IAAI,CAAC,aAAa,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,IAAI,GACR,CAAC,aAAa,IAAI,UAAU,CAAC,gBAAgB,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC;IACpE,OAAO,IAAI,WAAW,CAAC,MAAM,CAC3B,WAAW,CAAC,iBAAiB,CAAC,IAAI,EAAE;QAClC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QAClC,SAAS,EAAE,eAAe;QAC1B,GAAG,EAAE,2BAAe,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACzC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,SAAS,CAAC,SAAiB;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAE/B,uDAAuD;IACvD,0CAA0C;IAC1C,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE;QACtE,OAAO,wBAAwB,CAAC;KACjC;IAED,6BAA6B;IAC7B,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACpD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,uFAAuF;AACvF,qFAAqF;AACrF,+CAA+C;AAC/C,SAAgB,mBAAmB,CAAC,aAAa,GAAG,KAAK;IACvD,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,+BAAgB,CAAC,OAAO,CAAC;QAC/B,GAAG,EAAE,kCAAmB,CAAC,mBAAmB,CAAC;KAC9C,CAAC;IAEF,OAAO,oBAAY,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;AACrD,CAAC;AAPD,kDAOC"}
+{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6B;AAE7B,uEAAyD;AACzD,0EAAgD;AAEhD,iDAAuE;AACvE,iCAAoC;AAEpC,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,+FAAc,CAAA;IACd,+FAAc,CAAA;AAChB,CAAC,EAHW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAGrC;AAOY,QAAA,YAAY,GAAG,UAC1B,UAA4B,EAC5B,aAAa,GAAG,KAAK;IAErB,IAAI,iBAAU,EAAE,IAAI,CAAC,aAAa,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,OAAO,IAAI,WAAW,CAAC,MAAM,CAC3B,WAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE;QAC7C,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QAClC,SAAS,EAAE,eAAe;QAC1B,GAAG,EAAE,2BAAe,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACzC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,SAAS,CAAC,SAAiB;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAE/B,uDAAuD;IACvD,0CAA0C;IAC1C,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE;QACtE,OAAO,wBAAwB,CAAC;KACjC;IAED,6BAA6B;IAC7B,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACpD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,uFAAuF;AACvF,qFAAqF;AACrF,+CAA+C;AAC/C,SAAgB,mBAAmB,CAAC,aAAa,GAAG,KAAK;IACvD,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,+BAAgB,CAAC,OAAO,CAAC;QAC/B,GAAG,EAAE,kCAAmB,CAAC,mBAAmB,CAAC;KAC9C,CAAC;IAEF,OAAO,oBAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AACjD,CAAC;AAPD,kDAOC"}

lib/api-client.test.js

@@ -1,72 +0,0 @@
-"use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const githubUtils = __importStar(require("@actions/github/lib/utils"));
-const ava_1 = __importDefault(require("ava"));
-const sinon_1 = __importDefault(require("sinon"));
-const api_client_1 = require("./api-client");
-const testing_utils_1 = require("./testing-utils");
-testing_utils_1.setupTests(ava_1.default);
-let githubStub;
-ava_1.default.beforeEach(() => {
-    githubStub = sinon_1.default.stub(githubUtils, "GitHub");
-});
-ava_1.default("Get the client API", async (t) => {
-    doTest(t, {
-        auth: "xyz",
-        externalRepoAuth: "abc",
-        url: "http://hucairz",
-    }, undefined, {
-        auth: "token xyz",
-        baseUrl: "http://hucairz/api/v3",
-        userAgent: "CodeQL Action",
-    });
-});
-ava_1.default("Get the client API external", async (t) => {
-    doTest(t, {
-        auth: "xyz",
-        externalRepoAuth: "abc",
-        url: "http://hucairz",
-    }, { allowExternal: true }, {
-        auth: "token abc",
-        baseUrl: "http://hucairz/api/v3",
-        userAgent: "CodeQL Action",
-    });
-});
-ava_1.default("Get the client API external not present", async (t) => {
-    doTest(t, {
-        auth: "xyz",
-        url: "http://hucairz",
-    }, { allowExternal: true }, {
-        auth: "token xyz",
-        baseUrl: "http://hucairz/api/v3",
-        userAgent: "CodeQL Action",
-    });
-});
-ava_1.default("Get the client API with github url", async (t) => {
-    doTest(t, {
-        auth: "xyz",
-        url: "https://github.com/some/invalid/url",
-    }, undefined, {
-        auth: "token xyz",
-        baseUrl: "https://api.github.com",
-        userAgent: "CodeQL Action",
-    });
-});
-function doTest(t, clientArgs, clientOptions, expected) {
-    api_client_1.getApiClient(clientArgs, clientOptions);
-    const firstCallArgs = githubStub.args[0];
-    // log is a function, so we don't need to test for equality of it
-    delete firstCallArgs[0].log;
-    t.deepEqual(firstCallArgs, [expected]);
-}
-//# sourceMappingURL=api-client.test.js.map

lib/api-client.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"api-client.test.js","sourceRoot":"","sources":["../src/api-client.test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAyD;AACzD,8CAA6C;AAC7C,kDAA0B;AAE1B,6CAA4C;AAC5C,mDAA6C;AAE7C,0BAAU,CAAC,aAAI,CAAC,CAAC;AAEjB,IAAI,UAA2B,CAAC;AAEhC,aAAI,CAAC,UAAU,CAAC,GAAG,EAAE;IACnB,UAAU,GAAG,eAAK,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACrC,MAAM,CACJ,CAAC,EACD;QACE,IAAI,EAAE,KAAK;QACX,gBAAgB,EAAE,KAAK;QACvB,GAAG,EAAE,gBAAgB;KACtB,EACD,SAAS,EACT;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,uBAAuB;QAChC,SAAS,EAAE,eAAe;KAC3B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,6BAA6B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC9C,MAAM,CACJ,CAAC,EACD;QACE,IAAI,EAAE,KAAK;QACX,gBAAgB,EAAE,KAAK;QACvB,GAAG,EAAE,gBAAgB;KACtB,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,EACvB;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,uBAAuB;QAChC,SAAS,EAAE,eAAe;KAC3B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,yCAAyC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1D,MAAM,CACJ,CAAC,EACD;QACE,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,gBAAgB;KACtB,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,EACvB;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,uBAAuB;QAChC,SAAS,EAAE,eAAe;KAC3B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACrD,MAAM,CACJ,CAAC,EACD;QACE,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,qCAAqC;KAC3C,EACD,SAAS,EACT;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,wBAAwB;QACjC,SAAS,EAAE,eAAe;KAC3B,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,SAAS,MAAM,CACb,CAA4B,EAC5B,UAAe,EACf,aAAkB,EAClB,QAAa;IAEb,yBAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAExC,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzC,iEAAiE;IACjE,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5B,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzC,CAAC"}

lib/api-compatibility.json

@@ -1 +1 @@
-{ "maximumVersion": "3.1", "minimumVersion": "2.22" }
+{ "maximumVersion": "3.0", "minimumVersion": "2.22" }

lib/autobuild-action.js

@@ -34,7 +34,7 @@ async function run() {
         if (!(await actionsUtil.sendStatusReport(await actionsUtil.createStatusReportBase("autobuild", "starting", startedAt)))) {
             return;
         }
-        const config = await config_utils.getConfig(actionsUtil.getTemporaryDirectory(), logger);
+        const config = await config_utils.getConfig(actionsUtil.getRequiredEnvParam("RUNNER_TEMP"), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
         }

lib/autobuild-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAEtC,4DAA8C;AAC9C,2CAAuE;AACvE,6DAA+C;AAE/C,uCAA6C;AAS7C,KAAK,UAAU,yBAAyB,CACtC,SAAe,EACf,YAAsB,EACtB,eAAwB,EACxB,KAAa;;IAEb,MAAM,MAAM,GACV,eAAe,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS;QAClD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAC/D,WAAW,EACX,MAAM,EACN,SAAS,QACT,KAAK,0CAAE,OAAO,QACd,KAAK,0CAAE,KAAK,CACb,CAAC;IACF,MAAM,YAAY,GAA0B;QAC1C,GAAG,gBAAgB;QACnB,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,iBAAiB,EAAE,eAAe;KACnC,CAAC;IACF,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,MAAM,GAAG,0BAAgB,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IAAI,QAAQ,GAAyB,SAAS,CAAC;IAC/C,IAAI;QACF,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACzC,IACE,CAAC,CAAC,MAAM,WAAW,CAAC,gBAAgB,CAClC,MAAM,WAAW,CAAC,sBAAsB,CACtC,WAAW,EACX,UAAU,EACV,SAAS,CACV,CACF,CAAC,EACF;YACA,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CACzC,WAAW,CAAC,qBAAqB,EAAE,EACnC,MAAM,CACP,CAAC;QACF,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;SACH;QACD,QAAQ,GAAG,sCAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,wBAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;SAC9C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CACZ,mIAAmI,KAAK,CAAC,OAAO,EAAE,CACnJ,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,yBAAyB,CAC7B,SAAS,EACT,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAC1B,QAAQ,EACR,KAAK,CACN,CAAC;QACF,OAAO;KACR;IAED,MAAM,yBAAyB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACzE,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI;QACF,MAAM,GAAG,EAAE,CAAC;KACb;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}
+{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAEtC,4DAA8C;AAC9C,2CAAuE;AACvE,6DAA+C;AAE/C,uCAA6C;AAS7C,KAAK,UAAU,yBAAyB,CACtC,SAAe,EACf,YAAsB,EACtB,eAAwB,EACxB,KAAa;;IAEb,MAAM,MAAM,GACV,eAAe,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS;QAClD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAC/D,WAAW,EACX,MAAM,EACN,SAAS,QACT,KAAK,0CAAE,OAAO,QACd,KAAK,0CAAE,KAAK,CACb,CAAC;IACF,MAAM,YAAY,GAA0B;QAC1C,GAAG,gBAAgB;QACnB,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,iBAAiB,EAAE,eAAe;KACnC,CAAC;IACF,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,MAAM,GAAG,0BAAgB,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IAAI,QAAQ,GAAyB,SAAS,CAAC;IAC/C,IAAI;QACF,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACzC,IACE,CAAC,CAAC,MAAM,WAAW,CAAC,gBAAgB,CAClC,MAAM,WAAW,CAAC,sBAAsB,CACtC,WAAW,EACX,UAAU,EACV,SAAS,CACV,CACF,CAAC,EACF;YACA,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CACzC,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAC9C,MAAM,CACP,CAAC;QACF,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;SACH;QACD,QAAQ,GAAG,sCAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,wBAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;SAC9C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CACZ,mIAAmI,KAAK,CAAC,OAAO,EAAE,CACnJ,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,yBAAyB,CAC7B,SAAS,EACT,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAC1B,QAAQ,EACR,KAAK,CACN,CAAC;QACF,OAAO;KACR;IAED,MAAM,yBAAyB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACzE,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI;QACF,MAAM,GAAG,EAAE,CAAC;KACb;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}

lib/codeql.js

@@ -6,9 +6,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     result["default"] = mod;
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -17,8 +14,6 @@ const globalutil = __importStar(require("util"));
 const toolrunner = __importStar(require("@actions/exec/lib/toolrunner"));
 const http = __importStar(require("@actions/http-client"));
 const toolcache = __importStar(require("@actions/tool-cache"));
-const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-const query_string_1 = __importDefault(require("query-string"));
 const semver = __importStar(require("semver"));
 const uuid_1 = require("uuid");
 const actions_util_1 = require("./actions-util");
@@ -54,11 +49,6 @@ function getCodeQLActionRepository(mode, logger) {
     if (mode !== "actions") {
         return CODEQL_DEFAULT_ACTION_REPOSITORY;
     }
-    else {
-        return getActionsCodeQLActionRepository(logger);
-    }
-}
-function getActionsCodeQLActionRepository(logger) {
     if (process.env["GITHUB_ACTION_REPOSITORY"] !== undefined) {
         return process.env["GITHUB_ACTION_REPOSITORY"];
     }
@@ -74,7 +64,7 @@ function getActionsCodeQLActionRepository(logger) {
     const relativeScriptPathParts = actions_util_1.getRelativeScriptPath().split(path.sep);
     return `${relativeScriptPathParts[0]}/${relativeScriptPathParts[1]}`;
 }
-async function getCodeQLBundleDownloadURL(apiDetails, mode, variant, logger) {
+async function getCodeQLBundleDownloadURL(apiDetails, mode, logger) {
     const codeQLActionRepository = getCodeQLActionRepository(mode, logger);
     const potentialDownloadSources = [
         // This GitHub instance, and this Action.
@@ -86,34 +76,8 @@ async function getCodeQLBundleDownloadURL(apiDetails, mode, variant, logger) {
     ];
     // We now filter out any duplicates.
     // Duplicates will happen either because the GitHub instance is GitHub.com, or because the Action is not a fork.
-    const uniqueDownloadSources = potentialDownloadSources.filter((source, index, self) => {
+    const uniqueDownloadSources = potentialDownloadSources.filter((url, index, self) => index === self.indexOf(url));
-        return !self.slice(0, index).some((other) => fast_deep_equal_1.default(source, other));
-    });
     const codeQLBundleName = getCodeQLBundleName();
-    if (variant === util.GitHubVariant.GHAE) {
-        try {
-            const release = await api
-                .getApiClient(apiDetails)
-                .request("GET /enterprise/code-scanning/codeql-bundle/find/{tag}", {
-                tag: CODEQL_BUNDLE_VERSION,
-            });
-            const assetID = release.data.assets[codeQLBundleName];
-            if (assetID !== undefined) {
-                const download = await api
-                    .getApiClient(apiDetails)
-                    .request("GET /enterprise/code-scanning/codeql-bundle/download/{asset_id}", { asset_id: assetID });
-                const downloadURL = download.data.url;
-                logger.info(`Found CodeQL bundle at GitHub AE endpoint with URL ${downloadURL}.`);
-                return downloadURL;
-            }
-            else {
-                logger.info(`Attempted to fetch bundle from GitHub AE endpoint but the bundle ${codeQLBundleName} was not found in the assets ${JSON.stringify(release.data.assets)}.`);
-            }
-        }
-        catch (e) {
-            logger.info(`Attempted to fetch bundle from GitHub AE endpoint but got error ${e}.`);
-        }
-    }
     for (const downloadSource of uniqueDownloadSources) {
         const [apiURL, repository] = downloadSource;
         // If we've reached the final case, short-circuit the API check since we know the bundle exists and is public.
@@ -156,7 +120,12 @@ async function toolcacheDownloadTool(url, headers, tempDir, logger) {
     await pipeline(response.message, fs.createWriteStream(dest));
     return dest;
 }
-async function setupCodeQL(codeqlURL, apiDetails, tempDir, mode, variant, logger) {
+async function setupCodeQL(codeqlURL, apiDetails, tempDir, toolsDir, mode, logger) {
+    // Setting these two env vars makes the toolcache code safe to use outside,
+    // of actions but this is obviously not a great thing we're doing and it would
+    // be better to write our own implementation to use outside of actions.
+    process.env["RUNNER_TEMP"] = tempDir;
+    process.env["RUNNER_TOOL_CACHE"] = toolsDir;
     try {
         // We use the special value of 'latest' to prioritize the version in the
         // defaults over any pinned cached version.
@@ -186,17 +155,13 @@ async function setupCodeQL(codeqlURL, apiDetails, tempDir, mode, variant, logger
         }
         else {
             if (!codeqlURL) {
-                codeqlURL = await getCodeQLBundleDownloadURL(apiDetails, mode, variant, logger);
+                codeqlURL = await getCodeQLBundleDownloadURL(apiDetails, mode, logger);
             }
-            const parsedCodeQLURL = new URL(codeqlURL);
-            const parsedQueryString = query_string_1.default.parse(parsedCodeQLURL.search);
             const headers = { accept: "application/octet-stream" };
             // We only want to provide an authorization header if we are downloading
             // from the same GitHub instance the Action is running on.
             // This avoids leaking Enterprise tokens to dotcom.
-            // We also don't want to send an authorization header if there's already a token provided in the URL.
+            if (codeqlURL.startsWith(`${apiDetails.url}/`)) {
-            if (codeqlURL.startsWith(`${apiDetails.url}/`) &&
-                parsedQueryString["token"] === undefined) {
                 logger.debug("Downloading CodeQL bundle with token.");
                 headers.authorization = `token ${apiDetails.auth}`;
             }
@@ -284,6 +249,7 @@ function setCodeQL(partialCodeql) {
         finalizeDatabase: resolveFunction(partialCodeql, "finalizeDatabase"),
         resolveQueries: resolveFunction(partialCodeql, "resolveQueries"),
         databaseAnalyze: resolveFunction(partialCodeql, "databaseAnalyze"),
+        queryCompile: resolveFunction(partialCodeql, "queryCompile"),
     };
     return cachedCodeQL;
 }
@@ -443,6 +409,13 @@ function getCodeQLForCmd(cmd) {
                 querySuite,
             ]).exec();
         },
+        async queryCompile(querySuite) {
+            await new toolrunner.ToolRunner(cmd, [
+                "query",
+                "compile",
+                querySuite,
+            ]).exec();
+        },
     };
 }
 /**

lib/codeql.test.js

@@ -24,20 +24,15 @@ const sampleApiDetails = {
     auth: "token",
     url: "https://github.com",
 };
-const sampleGHAEApiDetails = {
-    auth: "token",
-    url: "https://example.githubenterprise.com",
-};
 ava_1.default("download codeql bundle cache", async (t) => {
     await util.withTmpDir(async (tmpDir) => {
-        util.setupActionsVars(tmpDir, tmpDir);
         const versions = ["20200601", "20200610"];
         for (let i = 0; i < versions.length; i++) {
             const version = versions[i];
             nock_1.default("https://example.com")
                 .get(`/download/codeql-bundle-${version}/codeql-bundle.tar.gz`)
                 .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle.tar.gz`));
-            await codeql.setupCodeQL(`https://example.com/download/codeql-bundle-${version}/codeql-bundle.tar.gz`, sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+            await codeql.setupCodeQL(`https://example.com/download/codeql-bundle-${version}/codeql-bundle.tar.gz`, sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
             t.assert(toolcache.find("CodeQL", `0.0.0-${version}`));
         }
         const cachedVersions = toolcache.findAllVersions("CodeQL");
@@ -46,39 +41,36 @@ ava_1.default("download codeql bundle cache", async (t) => {
 });
 ava_1.default("download codeql bundle cache explicitly requested with pinned different version cached", async (t) => {
     await util.withTmpDir(async (tmpDir) => {
-        util.setupActionsVars(tmpDir, tmpDir);
         nock_1.default("https://example.com")
             .get(`/download/codeql-bundle-20200601/codeql-bundle.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle-pinned.tar.gz`));
-        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         t.assert(toolcache.find("CodeQL", "0.0.0-20200601"));
         nock_1.default("https://example.com")
             .get(`/download/codeql-bundle-20200610/codeql-bundle.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle.tar.gz`));
-        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200610/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200610/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         t.assert(toolcache.find("CodeQL", "0.0.0-20200610"));
     });
 });
 ava_1.default("don't download codeql bundle cache with pinned different version cached", async (t) => {
     await util.withTmpDir(async (tmpDir) => {
-        util.setupActionsVars(tmpDir, tmpDir);
         nock_1.default("https://example.com")
             .get(`/download/codeql-bundle-20200601/codeql-bundle.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle-pinned.tar.gz`));
-        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         t.assert(toolcache.find("CodeQL", "0.0.0-20200601"));
-        await codeql.setupCodeQL(undefined, sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL(undefined, sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         const cachedVersions = toolcache.findAllVersions("CodeQL");
         t.is(cachedVersions.length, 1);
     });
 });
 ava_1.default("download codeql bundle cache with different version cached (not pinned)", async (t) => {
     await util.withTmpDir(async (tmpDir) => {
-        util.setupActionsVars(tmpDir, tmpDir);
         nock_1.default("https://example.com")
             .get(`/download/codeql-bundle-20200601/codeql-bundle.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle.tar.gz`));
-        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         t.assert(toolcache.find("CodeQL", "0.0.0-20200601"));
         const platform = process.platform === "win32"
             ? "win64"
@@ -88,18 +80,17 @@ ava_1.default("download codeql bundle cache with different version cached (not p
         nock_1.default("https://github.com")
             .get(`/github/codeql-action/releases/download/${defaults.bundleVersion}/codeql-bundle-${platform}.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle.tar.gz`));
-        await codeql.setupCodeQL(undefined, sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL(undefined, sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         const cachedVersions = toolcache.findAllVersions("CodeQL");
         t.is(cachedVersions.length, 2);
     });
 });
-ava_1.default('download codeql bundle cache with pinned different version cached if "latest" tools specified', async (t) => {
+ava_1.default('download codeql bundle cache with pinned different version cached if "latests" tools specified', async (t) => {
     await util.withTmpDir(async (tmpDir) => {
-        util.setupActionsVars(tmpDir, tmpDir);
         nock_1.default("https://example.com")
             .get(`/download/codeql-bundle-20200601/codeql-bundle.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle-pinned.tar.gz`));
-        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL("https://example.com/download/codeql-bundle-20200601/codeql-bundle.tar.gz", sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         t.assert(toolcache.find("CodeQL", "0.0.0-20200601"));
         const platform = process.platform === "win32"
             ? "win64"
@@ -109,39 +100,11 @@ ava_1.default('download codeql bundle cache with pinned different version cached
         nock_1.default("https://github.com")
             .get(`/github/codeql-action/releases/download/${defaults.bundleVersion}/codeql-bundle-${platform}.tar.gz`)
             .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle.tar.gz`));
-        await codeql.setupCodeQL("latest", sampleApiDetails, tmpDir, "runner", util.GitHubVariant.DOTCOM, logging_1.getRunnerLogger(true));
+        await codeql.setupCodeQL("latest", sampleApiDetails, tmpDir, tmpDir, "runner", logging_1.getRunnerLogger(true));
         const cachedVersions = toolcache.findAllVersions("CodeQL");
         t.is(cachedVersions.length, 2);
     });
 });
-ava_1.default("download codeql bundle from github ae endpoint", async (t) => {
-    await util.withTmpDir(async (tmpDir) => {
-        util.setupActionsVars(tmpDir, tmpDir);
-        const bundleAssetID = 10;
-        const platform = process.platform === "win32"
-            ? "win64"
-            : process.platform === "linux"
-                ? "linux64"
-                : "osx64";
-        const codeQLBundleName = `codeql-bundle-${platform}.tar.gz`;
-        nock_1.default("https://example.githubenterprise.com")
-            .get(`/api/v3/enterprise/code-scanning/codeql-bundle/find/${defaults.bundleVersion}`)
-            .reply(200, {
-            assets: { [codeQLBundleName]: bundleAssetID },
-        });
-        nock_1.default("https://example.githubenterprise.com")
-            .get(`/api/v3/enterprise/code-scanning/codeql-bundle/download/${bundleAssetID}`)
-            .reply(200, {
-            url: `https://example.githubenterprise.com/github/codeql-action/releases/download/${defaults.bundleVersion}/${codeQLBundleName}`,
-        });
-        nock_1.default("https://example.githubenterprise.com")
-            .get(`/github/codeql-action/releases/download/${defaults.bundleVersion}/${codeQLBundleName}`)
-            .replyWithFile(200, path.join(__dirname, `/../src/testdata/codeql-bundle-pinned.tar.gz`));
-        await codeql.setupCodeQL(undefined, sampleGHAEApiDetails, tmpDir, "runner", util.GitHubVariant.GHAE, logging_1.getRunnerLogger(true));
-        const cachedVersions = toolcache.findAllVersions("CodeQL");
-        t.is(cachedVersions.length, 1);
-    });
-});
 ava_1.default("parse codeql bundle url version", (t) => {
     t.deepEqual(codeql.getCodeQLURLVersion("https://github.com/.../codeql-bundle-20200601/..."), "20200601");
 });

lib/config-utils.js

@@ -128,7 +128,7 @@ async function addLocalQueries(codeQL, resultMap, localQueryPath, checkoutPath,
 /**
  * Retrieve the set of queries at the referenced remote repo and add them to resultMap.
  */
-async function addRemoteQueries(codeQL, resultMap, queryUses, tempDir, apiDetails, logger, configFile) {
+async function addRemoteQueries(codeQL, resultMap, queryUses, tempDir, githubUrl, logger, configFile) {
     let tok = queryUses.split("@");
     if (tok.length !== 2) {
         throw new Error(getQueryUsesInvalid(configFile, queryUses));
@@ -147,7 +147,7 @@ async function addRemoteQueries(codeQL, resultMap, queryUses, tempDir, apiDetail
     }
     const nwo = `${tok[0]}/${tok[1]}`;
     // Checkout the external repository
-    const checkoutPath = await externalQueries.checkoutExternalRepository(nwo, ref, apiDetails, tempDir, logger);
+    const checkoutPath = await externalQueries.checkoutExternalRepository(nwo, ref, githubUrl, tempDir, logger);
     const queryPath = tok.length > 2
         ? path.join(checkoutPath, tok.slice(2).join("/"))
         : checkoutPath;
@@ -161,7 +161,7 @@ async function addRemoteQueries(codeQL, resultMap, queryUses, tempDir, apiDetail
  * local paths starting with './', or references to remote repos, or
  * a finite set of hardcoded terms for builtin suites.
  */
-async function parseQueryUses(languages, codeQL, resultMap, queryUses, tempDir, checkoutPath, apiDetails, logger, configFile) {
+async function parseQueryUses(languages, codeQL, resultMap, queryUses, tempDir, checkoutPath, githubUrl, logger, configFile) {
     queryUses = queryUses.trim();
     if (queryUses === "") {
         throw new Error(getQueryUsesInvalid(configFile));
@@ -177,7 +177,7 @@ async function parseQueryUses(languages, codeQL, resultMap, queryUses, tempDir,
         return;
     }
     // Otherwise, must be a reference to another repo
-    await addRemoteQueries(codeQL, resultMap, queryUses, tempDir, apiDetails, logger, configFile);
+    await addRemoteQueries(codeQL, resultMap, queryUses, tempDir, githubUrl, logger, configFile);
 }
 // Regex validating stars in paths or paths-ignore entries.
 // The intention is to only allow ** to appear when immediately
@@ -304,7 +304,7 @@ exports.getUnknownLanguagesError = getUnknownLanguagesError;
 async function getLanguagesInRepo(repository, apiDetails, logger) {
     logger.debug(`GitHub repo ${repository.owner} ${repository.repo}`);
     const response = await api
-        .getApiClient(apiDetails, { allowLocalRun: true })
+        .getApiClient(apiDetails, true)
         .repos.listLanguages({
         owner: repository.owner,
         repo: repository.repo,
@@ -367,12 +367,12 @@ async function getLanguages(languagesInput, repository, apiDetails, logger) {
     }
     return parsedLanguages;
 }
-async function addQueriesFromWorkflow(codeQL, queriesInput, languages, resultMap, tempDir, checkoutPath, apiDetails, logger) {
+async function addQueriesFromWorkflow(codeQL, queriesInput, languages, resultMap, tempDir, checkoutPath, githubUrl, logger) {
     queriesInput = queriesInput.trim();
     // "+" means "don't override config file" - see shouldAddConfigFileQueries
     queriesInput = queriesInput.replace(/^\+/, "");
     for (const query of queriesInput.split(",")) {
-        await parseQueryUses(languages, codeQL, resultMap, query, tempDir, checkoutPath, apiDetails, logger);
+        await parseQueryUses(languages, codeQL, resultMap, query, tempDir, checkoutPath, githubUrl, logger);
     }
 }
 // Returns true if either no queries were provided in the workflow.
@@ -393,7 +393,7 @@ async function getDefaultConfig(languagesInput, queriesInput, repository, tempDi
     const queries = {};
     await addDefaultQueries(codeQL, languages, queries);
     if (queriesInput) {
-        await addQueriesFromWorkflow(codeQL, queriesInput, languages, queries, tempDir, checkoutPath, apiDetails, logger);
+        await addQueriesFromWorkflow(codeQL, queriesInput, languages, queries, tempDir, checkoutPath, apiDetails.url, logger);
     }
     return {
         languages,
@@ -450,7 +450,7 @@ async function loadConfig(languagesInput, queriesInput, configFile, repository,
     // unless they're prefixed with "+", in which case they supplement those
     // in the config file.
     if (queriesInput) {
-        await addQueriesFromWorkflow(codeQL, queriesInput, languages, queries, tempDir, checkoutPath, apiDetails, logger);
+        await addQueriesFromWorkflow(codeQL, queriesInput, languages, queries, tempDir, checkoutPath, apiDetails.url, logger);
     }
     if (shouldAddConfigFileQueries(queriesInput) &&
         QUERIES_PROPERTY in parsedYAML) {
@@ -462,7 +462,7 @@ async function loadConfig(languagesInput, queriesInput, configFile, repository,
                 typeof query[QUERIES_USES_PROPERTY] !== "string") {
                 throw new Error(getQueryUsesInvalid(configFile));
             }
-            await parseQueryUses(languages, codeQL, queries, query[QUERIES_USES_PROPERTY], tempDir, checkoutPath, apiDetails, logger, configFile);
+            await parseQueryUses(languages, codeQL, queries, query[QUERIES_USES_PROPERTY], tempDir, checkoutPath, apiDetails.url, logger, configFile);
         }
     }
     if (PATHS_IGNORE_PROPERTY in parsedYAML) {
@@ -556,9 +556,7 @@ async function getRemoteConfig(configFile, apiDetails) {
     if (pieces === null || pieces.groups === undefined || pieces.length < 5) {
         throw new Error(getConfigFileRepoFormatInvalidMessage(configFile));
     }
-    const response = await api
+    const response = await api.getApiClient(apiDetails, true).repos.getContent({
-        .getApiClient(apiDetails, { allowLocalRun: true, allowExternal: true })
-        .repos.getContent({
         owner: pieces.groups.owner,
         repo: pieces.groups.repo,
         path: pieces.groups.path,

lib/config-utils.test.js

@@ -25,10 +25,9 @@ const util = __importStar(require("./util"));
 testing_utils_1.setupTests(ava_1.default);
 const sampleApiDetails = {
     auth: "token",
-    externalRepoAuth: "token",
     url: "https://github.example.com",
 };
-const gitHubVersion = { type: util.GitHubVariant.DOTCOM };
+const gitHubVersion = { type: "dotcom" };
 // Returns the filepath of the newly-created file
 function createConfigFile(inputFileContents, tmpDir) {
     const configFilePath = path.join(tmpDir, "input");
@@ -428,7 +427,7 @@ ava_1.default("Invalid queries in workflow file handled correctly", async (t) =>
         // This function just needs to be type-correct; it doesn't need to do anything,
         // since we're deliberately passing in invalid data
         const codeQL = codeql_1.setCodeQL({
-            async resolveQueries() {
+            async resolveQueries(_queries, _extraSearchPath) {
                 return {
                     byLanguage: {
                         javascript: {},

lib/defaults.json

@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20210326"
+    "bundleVersion": "codeql-bundle-20201127"
 }

lib/external-queries.js

@@ -14,7 +14,7 @@ const safeWhich = __importStar(require("@chrisgavin/safe-which"));
 /**
  * Check out repository at the given ref, and return the directory of the checkout.
  */
-async function checkoutExternalRepository(repository, ref, apiDetails, tempDir, logger) {
+async function checkoutExternalRepository(repository, ref, githubUrl, tempDir, logger) {
     logger.info(`Checking out ${repository}`);
     const checkoutLocation = path.join(tempDir, repository, ref);
     if (!checkoutLocation.startsWith(tempDir)) {
@@ -22,10 +22,10 @@ async function checkoutExternalRepository(repository, ref, apiDetails, tempDir,
         throw new Error(`'${repository}@${ref}' is not a valid repository and reference.`);
     }
     if (!fs.existsSync(checkoutLocation)) {
-        const repoCloneURL = buildCheckoutURL(repository, apiDetails);
+        const repoURL = `${githubUrl}/${repository}`;
         await new toolrunner.ToolRunner(await safeWhich.safeWhich("git"), [
             "clone",
-            repoCloneURL,
+            repoURL,
             checkoutLocation,
         ]).exec();
         await new toolrunner.ToolRunner(await safeWhich.safeWhich("git"), [
@@ -38,17 +38,4 @@ async function checkoutExternalRepository(repository, ref, apiDetails, tempDir,
     return checkoutLocation;
 }
 exports.checkoutExternalRepository = checkoutExternalRepository;
-function buildCheckoutURL(repository, apiDetails) {
-    const repoCloneURL = new URL(apiDetails.url);
-    if (apiDetails.externalRepoAuth !== undefined) {
-        repoCloneURL.username = "x-access-token";
-        repoCloneURL.password = apiDetails.externalRepoAuth;
-    }
-    if (!repoCloneURL.pathname.endsWith("/")) {
-        repoCloneURL.pathname += "/";
-    }
-    repoCloneURL.pathname += `${repository}`;
-    return repoCloneURL.toString();
-}
-exports.buildCheckoutURL = buildCheckoutURL;
 //# sourceMappingURL=external-queries.js.map

lib/external-queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-queries.js","sourceRoot":"","sources":["../src/external-queries.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,yEAA2D;AAC3D,kEAAoD;AAKpD;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAC9C,UAAkB,EAClB,GAAW,EACX,UAAwC,EACxC,OAAe,EACf,MAAc;IAEd,MAAM,CAAC,IAAI,CAAC,gBAAgB,UAAU,EAAE,CAAC,CAAC;IAE1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAE7D,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACzC,wGAAwG;QACxG,MAAM,IAAI,KAAK,CACb,IAAI,UAAU,IAAI,GAAG,4CAA4C,CAClE,CAAC;KACH;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC9D,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAChE,OAAO;YACP,YAAY;YACZ,gBAAgB;SACjB,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAChE,eAAe,gBAAgB,EAAE;YACjC,aAAa,gBAAgB,OAAO;YACpC,UAAU;YACV,GAAG;SACJ,CAAC,CAAC,IAAI,EAAE,CAAC;KACX;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAlCD,gEAkCC;AAED,SAAgB,gBAAgB,CAC9B,UAAkB,EAClB,UAAwC;IAExC,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,UAAU,CAAC,gBAAgB,KAAK,SAAS,EAAE;QAC7C,YAAY,CAAC,QAAQ,GAAG,gBAAgB,CAAC;QACzC,YAAY,CAAC,QAAQ,GAAG,UAAU,CAAC,gBAAgB,CAAC;KACrD;IACD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACxC,YAAY,CAAC,QAAQ,IAAI,GAAG,CAAC;KAC9B;IACD,YAAY,CAAC,QAAQ,IAAI,GAAG,UAAU,EAAE,CAAC;IACzC,OAAO,YAAY,CAAC,QAAQ,EAAE,CAAC;AACjC,CAAC;AAdD,4CAcC"}
+{"version":3,"file":"external-queries.js","sourceRoot":"","sources":["../src/external-queries.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,yEAA2D;AAC3D,kEAAoD;AAIpD;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAC9C,UAAkB,EAClB,GAAW,EACX,SAAiB,EACjB,OAAe,EACf,MAAc;IAEd,MAAM,CAAC,IAAI,CAAC,gBAAgB,UAAU,EAAE,CAAC,CAAC;IAE1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAE7D,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACzC,wGAAwG;QACxG,MAAM,IAAI,KAAK,CACb,IAAI,UAAU,IAAI,GAAG,4CAA4C,CAClE,CAAC;KACH;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,MAAM,OAAO,GAAG,GAAG,SAAS,IAAI,UAAU,EAAE,CAAC;QAC7C,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAChE,OAAO;YACP,OAAO;YACP,gBAAgB;SACjB,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAChE,eAAe,gBAAgB,EAAE;YACjC,aAAa,gBAAgB,OAAO;YACpC,UAAU;YACV,GAAG;SACJ,CAAC,CAAC,IAAI,EAAE,CAAC;KACX;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAlCD,gEAkCC"}

lib/external-queries.test.js

@@ -81,35 +81,17 @@ ava_1.default("checkoutExternalQueries", async (t) => {
         const commit2Sha = await runGit(["rev-parse", "HEAD"]);
         // Checkout the first commit, which should contain 'a' and 'b'
         t.false(fs.existsSync(path.join(tmpDir, repoName)));
-        await externalQueries.checkoutExternalRepository(repoName, commit1Sha, { url: `file://${testRepoBaseDir}`, externalRepoAuth: "" }, tmpDir, logging_1.getRunnerLogger(true));
+        await externalQueries.checkoutExternalRepository(repoName, commit1Sha, `file://${testRepoBaseDir}`, tmpDir, logging_1.getRunnerLogger(true));
         t.true(fs.existsSync(path.join(tmpDir, repoName)));
         t.true(fs.existsSync(path.join(tmpDir, repoName, commit1Sha)));
         t.true(fs.existsSync(path.join(tmpDir, repoName, commit1Sha, "a")));
         t.true(fs.existsSync(path.join(tmpDir, repoName, commit1Sha, "b")));
         // Checkout the second commit as well, which should only contain 'a'
         t.false(fs.existsSync(path.join(tmpDir, repoName, commit2Sha)));
-        await externalQueries.checkoutExternalRepository(repoName, commit2Sha, { url: `file://${testRepoBaseDir}`, externalRepoAuth: "" }, tmpDir, logging_1.getRunnerLogger(true));
+        await externalQueries.checkoutExternalRepository(repoName, commit2Sha, `file://${testRepoBaseDir}`, tmpDir, logging_1.getRunnerLogger(true));
         t.true(fs.existsSync(path.join(tmpDir, repoName, commit2Sha)));
         t.true(fs.existsSync(path.join(tmpDir, repoName, commit2Sha, "a")));
         t.false(fs.existsSync(path.join(tmpDir, repoName, commit2Sha, "b")));
     });
 });
-ava_1.default("buildCheckoutURL", (t) => {
-    t.deepEqual(externalQueries.buildCheckoutURL("foo/bar", {
-        url: "https://github.com",
-        externalRepoAuth: undefined,
-    }), "https://github.com/foo/bar");
-    t.deepEqual(externalQueries.buildCheckoutURL("foo/bar", {
-        url: "https://github.example.com/",
-        externalRepoAuth: undefined,
-    }), "https://github.example.com/foo/bar");
-    t.deepEqual(externalQueries.buildCheckoutURL("foo/bar", {
-        url: "https://github.com",
-        externalRepoAuth: "abc",
-    }), "https://x-access-token:abc@github.com/foo/bar");
-    t.deepEqual(externalQueries.buildCheckoutURL("foo/bar", {
-        url: "https://github.example.com/",
-        externalRepoAuth: "abc",
-    }), "https://x-access-token:abc@github.example.com/foo/bar");
-});
 //# sourceMappingURL=external-queries.test.js.map

lib/external-queries.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-queries.test.js","sourceRoot":"","sources":["../src/external-queries.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"external-queries.test.js","sourceRoot":"","sources":["../src/external-queries.test.ts"],"names":[],"mappings":"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"}

lib/init-action.js

@@ -7,6 +7,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
 const core = __importStar(require("@actions/core"));
 const actionsUtil = __importStar(require("./actions-util"));
 const init_1 = require("./init");
@@ -56,21 +57,32 @@ async function run() {
     let toolsVersion;
     const apiDetails = {
         auth: actionsUtil.getRequiredInput("token"),
-        externalRepoAuth: actionsUtil.getOptionalInput("external-repository-token"),
         url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
     };
     const gitHubVersion = await util_1.getGitHubVersion(apiDetails);
-    util_1.checkGitHubVersionInRange(gitHubVersion, "actions", logger);
+    if (gitHubVersion !== undefined) {
+        util_1.checkGitHubVersionInRange(gitHubVersion, "actions", logger);
+    }
     try {
         actionsUtil.prepareLocalRunEnvironment();
-        const workflowErrors = await actionsUtil.validateWorkflow();
+        const workflowErrors = await actionsUtil.getWorkflowErrors();
-        if (!(await actionsUtil.sendStatusReport(await actionsUtil.createStatusReportBase("init", "starting", startedAt, workflowErrors)))) {
+        // we do not want to worry users if linting is failing
+        // but we do want to send a status report containing this error code
+        // below
+        const userWorkflowErrors = workflowErrors.filter((o) => o.code !== "LintFailed");
+        if (userWorkflowErrors.length > 0) {
+            core.warning(actionsUtil.formatWorkflowErrors(userWorkflowErrors));
+        }
+        if (!(await actionsUtil.sendStatusReport(await actionsUtil.createStatusReportBase("init", "starting", startedAt, actionsUtil.formatWorkflowCause(workflowErrors))))) {
             return;
         }
-        const initCodeQLResult = await init_1.initCodeQL(actionsUtil.getOptionalInput("tools"), apiDetails, actionsUtil.getTemporaryDirectory(), "actions", gitHubVersion.type, logger);
+        const initCodeQLResult = await init_1.initCodeQL(actionsUtil.getOptionalInput("tools"), apiDetails, actionsUtil.getRequiredEnvParam("RUNNER_TEMP"), actionsUtil.getRequiredEnvParam("RUNNER_TOOL_CACHE"), "actions", logger);
         codeql = initCodeQLResult.codeql;
         toolsVersion = initCodeQLResult.toolsVersion;
-        config = await init_1.initConfig(actionsUtil.getOptionalInput("languages"), actionsUtil.getOptionalInput("queries"), actionsUtil.getOptionalInput("config-file"), repository_1.parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")), actionsUtil.getTemporaryDirectory(), actionsUtil.getRequiredEnvParam("RUNNER_TOOL_CACHE"), codeql, actionsUtil.getRequiredEnvParam("GITHUB_WORKSPACE"), gitHubVersion, apiDetails, logger);
+        config = await init_1.initConfig(actionsUtil.getOptionalInput("languages"), actionsUtil.getOptionalInput("queries"), actionsUtil.getOptionalInput("config-file"), repository_1.parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")), actionsUtil.getRequiredEnvParam("RUNNER_TEMP"), actionsUtil.getRequiredEnvParam("RUNNER_TOOL_CACHE"), codeql, actionsUtil.getRequiredEnvParam("GITHUB_WORKSPACE"), gitHubVersion, apiDetails, logger);
+        // Compile queries and (TODO: extract query cache hash)
+        // MG: Spell out what info we need from the config, and move to init.ts
+        await compileQueries(codeql, config, logger);
         if (config.languages.includes(languages_1.Language.python) &&
             actionsUtil.getRequiredInput("setup-python-dependencies") === "true") {
             try {
@@ -125,5 +137,43 @@ async function runWrapper() {
         console.log(error);
     }
 }
+async function compileQueries(codeql, config, logger) {
+    // MG: This method is based of `runQueries`.
+    //       Creating the query suite file could be refactored out of that method.
+    for (const language of config.languages) {
+        logger.startGroup(`Analyzing ${language}`);
+        const queries = config.queries[language];
+        if (queries.builtin.length === 0 && queries.custom.length === 0) {
+            throw new Error(`Unable to analyse ${language} as no queries were selected for this language`);
+        }
+        for (const type of ["custom"]) {
+            // MG: Only compile custom, but we would be ok doing also builtin
+            if (queries[type].length > 0) {
+                // Pass the queries to codeql using a file instead of using the command
+                // line to avoid command line length restrictions, particularly on windows.
+                const querySuitePath = `${language}-queries-${type}.qls`;
+                const querySuiteContents = queries[type]
+                    .map((q) => `- query: ${q}`)
+                    .join("\n");
+                fs.writeFileSync(querySuitePath, querySuiteContents);
+                logger.debug(`Query suite file for ${language}...\n${querySuiteContents}`);
+                await codeql.queryCompile(querySuitePath);
+                logger.debug(`Queries compiled`);
+                logger.endGroup();
+            }
+        }
+    }
+    // Compute hash
+    const globHash = require("glob-hash");
+    const finalHash = await globHash({
+        include: [
+            `${config.tempDir}/**/.cache/data/**`,
+            `${config.toolCacheDir}/**/.cache/data/**`,
+        ],
+        files: false,
+    });
+    logger.info(`FinalHash: ${finalHash}`);
+    return finalHash;
+}
 void runWrapper();
 //# sourceMappingURL=init-action.js.map

lib/init.js

@@ -16,9 +16,9 @@ const codeql_1 = require("./codeql");
 const configUtils = __importStar(require("./config-utils"));
 const tracer_config_1 = require("./tracer-config");
 const util = __importStar(require("./util"));
-async function initCodeQL(codeqlURL, apiDetails, tempDir, mode, variant, logger) {
+async function initCodeQL(codeqlURL, apiDetails, tempDir, toolsDir, mode, logger) {
     logger.startGroup("Setup CodeQL tools");
-    const { codeql, toolsVersion } = await codeql_1.setupCodeQL(codeqlURL, apiDetails, tempDir, mode, variant, logger);
+    const { codeql, toolsVersion } = await codeql_1.setupCodeQL(codeqlURL, apiDetails, tempDir, toolsDir, mode, logger);
     await codeql.printVersion();
     logger.endGroup();
     return { codeql, toolsVersion };
@@ -129,7 +129,7 @@ exports.injectWindowsTracer = injectWindowsTracer;
 async function installPythonDeps(codeql, logger) {
     logger.startGroup("Setup Python dependencies");
     const scriptsFolder = path.resolve(__dirname, "../python-setup");
-    // Setup tools on the GitHub hosted runners
+    // Setup tools on the Github hosted runners
     if (process.env["ImageOS"] !== undefined) {
         try {
             if (process.platform === "win32") {

lib/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}

lib/runner.js

@@ -82,8 +82,7 @@ program
     .description("Initializes CodeQL")
     .requiredOption("--repository <repository>", "Repository name. (Required)")
     .requiredOption("--github-url <url>", "URL of GitHub instance. (Required)")
-    .option("--github-auth <auth>", "GitHub Apps token or personal access token. This option is insecure and deprecated, please use `--github-auth-stdin` instead.")
+    .requiredOption("--github-auth <auth>", "GitHub Apps token or personal access token. (Required)")
-    .option("--github-auth-stdin", "Read GitHub Apps token or personal access token from stdin.")
     .option("--languages <languages>", "Comma-separated list of languages to analyze. Otherwise detects and analyzes all supported languages from the repo.")
     .option("--queries <queries>", "Comma-separated list of additional queries to run. This overrides the same setting in a configuration file.")
     .option("--config-file <file>", "Path to config file.")
@@ -92,32 +91,32 @@ program
     .option("--tools-dir <dir>", "Directory to use for CodeQL tools and other files to store between runs. Default is a subdirectory of the home directory.")
     .option("--checkout-path <path>", "Checkout path. Default is the current working directory.")
     .option("--debug", "Print more verbose output", false)
-    .option("--trace-process-name <string>", "(Advanced, windows-only) Inject a windows tracer of this process into a process with the given process name.")
+    // This prevents a message like: error: unknown option '--trace-process-level'
-    .option("--trace-process-level <number>", "(Advanced, windows-only) Inject a windows tracer of this process into a parent process <number> levels up.")
+    // Remove this if commander.js starts supporting hidden options.
+    .allowUnknownOption()
     .action(async (cmd) => {
     const logger = logging_1.getRunnerLogger(cmd.debug);
     try {
         const tempDir = getTempDir(cmd.tempDir);
         const toolsDir = getToolsDir(cmd.toolsDir);
-        util_1.setupActionsVars(tempDir, toolsDir);
         // Wipe the temp dir
         logger.info(`Cleaning temp directory ${tempDir}`);
         fs.rmdirSync(tempDir, { recursive: true });
         fs.mkdirSync(tempDir, { recursive: true });
-        const auth = await util_1.getGitHubAuth(logger, cmd.githubAuth, cmd.githubAuthStdin);
         const apiDetails = {
-            auth,
+            auth: cmd.githubAuth,
-            externalRepoAuth: auth,
+            url: util_1.parseGithubUrl(cmd.githubUrl),
-            url: util_1.parseGitHubUrl(cmd.githubUrl),
         };
         const gitHubVersion = await util_1.getGitHubVersion(apiDetails);
-        util_1.checkGitHubVersionInRange(gitHubVersion, "runner", logger);
+        if (gitHubVersion !== undefined) {
+            util_1.checkGitHubVersionInRange(gitHubVersion, "runner", logger);
+        }
         let codeql;
         if (cmd.codeqlPath !== undefined) {
             codeql = codeql_1.getCodeQL(cmd.codeqlPath);
         }
         else {
-            codeql = (await init_1.initCodeQL(undefined, apiDetails, tempDir, "runner", gitHubVersion.type, logger)).codeql;
+            codeql = (await init_1.initCodeQL(undefined, apiDetails, tempDir, toolsDir, "runner", logger)).codeql;
         }
         const config = await init_1.initConfig(cmd.languages, cmd.queries, cmd.configFile, repository_1.parseRepositoryNwo(cmd.repository), tempDir, toolsDir, codeql, cmd.checkoutPath || process.cwd(), gitHubVersion, apiDetails, logger);
         const tracerConfig = await init_1.runInit(codeql, config);
@@ -179,7 +178,6 @@ program
             throw new Error("Config file could not be found at expected location. " +
                 "Was the 'init' command run with the same '--temp-dir' argument as this command.");
         }
-        util_1.setupActionsVars(config.tempDir, config.toolCacheDir);
         importTracerEnvironment(config);
         let language = undefined;
         if (cmd.language !== undefined) {
@@ -209,8 +207,7 @@ program
     .requiredOption("--commit <commit>", "SHA of commit that was analyzed. (Required)")
     .requiredOption("--ref <ref>", "Name of ref that was analyzed. (Required)")
     .requiredOption("--github-url <url>", "URL of GitHub instance. (Required)")
-    .option("--github-auth <auth>", "GitHub Apps token or personal access token. This option is insecure and deprecated, please use `--github-auth-stdin` instead.")
+    .requiredOption("--github-auth <auth>", "GitHub Apps token or personal access token. (Required)")
-    .option("--github-auth-stdin", "Read GitHub Apps token or personal access token from stdin.")
     .option("--checkout-path <path>", "Checkout path. Default is the current working directory.")
     .option("--no-upload", "Do not upload results after analysis.")
     .option("--output-dir <dir>", "Directory to output SARIF files to. Default is in the temp directory.")
@@ -223,24 +220,18 @@ program
     .action(async (cmd) => {
     const logger = logging_1.getRunnerLogger(cmd.debug);
     try {
+        const tempDir = getTempDir(cmd.tempDir);
+        const outputDir = cmd.outputDir || path.join(tempDir, "codeql-sarif");
         const config = await config_utils_1.getConfig(getTempDir(cmd.tempDir), logger);
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. " +
                 "Was the 'init' command run with the same '--temp-dir' argument as this command.");
         }
-        util_1.setupActionsVars(config.tempDir, config.toolCacheDir);
-        const auth = await util_1.getGitHubAuth(logger, cmd.githubAuth, cmd.githubAuthStdin);
         const apiDetails = {
-            auth,
+            auth: cmd.githubAuth,
-            url: util_1.parseGitHubUrl(cmd.githubUrl),
+            url: util_1.parseGithubUrl(cmd.githubUrl),
         };
-        const outputDir = cmd.outputDir || path.join(config.tempDir, "codeql-sarif");
+        await analyze_1.runAnalyze(repository_1.parseRepositoryNwo(cmd.repository), cmd.commit, parseRef(cmd.ref), undefined, undefined, undefined, cmd.checkoutPath || process.cwd(), undefined, apiDetails, cmd.upload, "runner", outputDir, util_1.getMemoryFlag(cmd.ram), util_1.getAddSnippetsFlag(cmd.addSnippets), util_1.getThreadsFlag(cmd.threads, logger), config, logger);
-        await analyze_1.runAnalyze(outputDir, util_1.getMemoryFlag(cmd.ram), util_1.getAddSnippetsFlag(cmd.addSnippets), util_1.getThreadsFlag(cmd.threads, logger), config, logger);
-        if (!cmd.upload) {
-            logger.info("Not uploading results");
-            return;
-        }
-        await upload_lib.uploadFromRunner(outputDir, repository_1.parseRepositoryNwo(cmd.repository), cmd.commit, parseRef(cmd.ref), cmd.checkoutPath || process.cwd(), config.gitHubVersion, apiDetails, logger);
     }
     catch (e) {
         logger.error("Analyze failed");
@@ -256,20 +247,18 @@ program
     .requiredOption("--commit <commit>", "SHA of commit that was analyzed. (Required)")
     .requiredOption("--ref <ref>", "Name of ref that was analyzed. (Required)")
     .requiredOption("--github-url <url>", "URL of GitHub instance. (Required)")
-    .option("--github-auth <auth>", "GitHub Apps token or personal access token. This option is insecure and deprecated, please use `--github-auth-stdin` instead.")
+    .requiredOption("--github-auth <auth>", "GitHub Apps token or personal access token. (Required)")
-    .option("--github-auth-stdin", "Read GitHub Apps token or personal access token from stdin.")
     .option("--checkout-path <path>", "Checkout path. Default is the current working directory.")
     .option("--debug", "Print more verbose output", false)
     .action(async (cmd) => {
     const logger = logging_1.getRunnerLogger(cmd.debug);
-    const auth = await util_1.getGitHubAuth(logger, cmd.githubAuth, cmd.githubAuthStdin);
     const apiDetails = {
-        auth,
+        auth: cmd.githubAuth,
-        url: util_1.parseGitHubUrl(cmd.githubUrl),
+        url: util_1.parseGithubUrl(cmd.githubUrl),
     };
     try {
         const gitHubVersion = await util_1.getGitHubVersion(apiDetails);
-        await upload_lib.uploadFromRunner(cmd.sarifFile, repository_1.parseRepositoryNwo(cmd.repository), cmd.commit, parseRef(cmd.ref), cmd.checkoutPath || process.cwd(), gitHubVersion, apiDetails, logger);
+        await upload_lib.upload(cmd.sarifFile, repository_1.parseRepositoryNwo(cmd.repository), cmd.commit, parseRef(cmd.ref), undefined, undefined, undefined, cmd.checkoutPath || process.cwd(), undefined, gitHubVersion, apiDetails, "runner", logger);
     }
     catch (e) {
         logger.error("Upload failed");

lib/tracer-config.js

@@ -141,12 +141,6 @@ async function getCombinedTracerConfig(config, codeql) {
     else if (process.platform !== "win32") {
         mainTracerConfig.env["LD_PRELOAD"] = path.join(codeQLDir, "tools", "linux64", "${LIB}trace.so");
     }
-    // On macos it's necessary to prefix the build command with the runner executable
-    // on order to trace when System Integrity Protection is enabled.
-    // The executable also exists and works for other platforms so we output this env
-    // var with a path to the runner regardless so it's always available.
-    const runnerExeName = process.platform === "win32" ? "runner.exe" : "runner";
-    mainTracerConfig.env["CODEQL_RUNNER"] = path.join(mainTracerConfig.env["CODEQL_DIST"], "tools", mainTracerConfig.env["CODEQL_PLATFORM"], runnerExeName);
     return mainTracerConfig;
 }
 exports.getCombinedTracerConfig = getCombinedTracerConfig;

lib/tracer-config.test.js

@@ -29,7 +29,7 @@ function getTestConfig(tmpDir) {
         tempDir: tmpDir,
         toolCacheDir: tmpDir,
         codeQLCmd: "",
-        gitHubVersion: { type: util.GitHubVariant.DOTCOM },
+        gitHubVersion: { type: "dotcom" },
     };
 }
 // A very minimal setup
@@ -238,7 +238,6 @@ ava_1.default("getCombinedTracerConfig - return undefined when no languages are
             async getTracerEnv() {
                 return {
                     ODASA_TRACER_CONFIGURATION: "abc",
-                    CODEQL_DIST: "/",
                     foo: "bar",
                 };
             },
@@ -251,28 +250,17 @@ ava_1.default("getCombinedTracerConfig - valid spec file", async (t) => {
         const config = getTestConfig(tmpDir);
         const spec = path.join(tmpDir, "spec");
         fs.writeFileSync(spec, "foo.log\n2\nabc\ndef");
-        const bundlePath = path.join(tmpDir, "bundle");
-        const codeqlPlatform = process.platform === "win32"
-            ? "win64"
-            : process.platform === "darwin"
-                ? "osx64"
-                : "linux64";
         const codeQL = codeql_1.setCodeQL({
             async getTracerEnv() {
                 return {
                     ODASA_TRACER_CONFIGURATION: spec,
-                    CODEQL_DIST: bundlePath,
-                    CODEQL_PLATFORM: codeqlPlatform,
                     foo: "bar",
                 };
             },
         });
         const result = await tracer_config_1.getCombinedTracerConfig(config, codeQL);
-        t.notDeepEqual(result, undefined);
         const expectedEnv = {
             foo: "bar",
-            CODEQL_DIST: bundlePath,
-            CODEQL_PLATFORM: codeqlPlatform,
             ODASA_TRACER_CONFIGURATION: result.spec,
         };
         if (process.platform === "darwin") {
@@ -281,15 +269,6 @@ ava_1.default("getCombinedTracerConfig - valid spec file", async (t) => {
         else if (process.platform !== "win32") {
             expectedEnv["LD_PRELOAD"] = path.join(path.dirname(codeQL.getPath()), "tools", "linux64", "${LIB}trace.so");
         }
-        if (process.platform === "win32") {
-            expectedEnv["CODEQL_RUNNER"] = path.join(bundlePath, "tools/win64/runner.exe");
-        }
-        else if (process.platform === "darwin") {
-            expectedEnv["CODEQL_RUNNER"] = path.join(bundlePath, "tools/osx64/runner");
-        }
-        else {
-            expectedEnv["CODEQL_RUNNER"] = path.join(bundlePath, "tools/linux64/runner");
-        }
         t.deepEqual(result, {
             spec: path.join(tmpDir, "compound-spec"),
             env: expectedEnv,

lib/upload-lib.js

@@ -17,10 +17,8 @@ const core = __importStar(require("@actions/core"));
 const file_url_1 = __importDefault(require("file-url"));
 const jsonschema = __importStar(require("jsonschema"));
 const semver = __importStar(require("semver"));
-const actionsUtil = __importStar(require("./actions-util"));
 const api = __importStar(require("./api-client"));
 const fingerprints = __importStar(require("./fingerprints"));
-const repository_1 = require("./repository");
 const sharedEnv = __importStar(require("./shared-environment"));
 const util = __importStar(require("./util"));
 // Takes a list of paths to sarif files and combines them together,
@@ -44,31 +42,6 @@ function combineSarifFiles(sarifFiles) {
     return JSON.stringify(combinedSarif);
 }
 exports.combineSarifFiles = combineSarifFiles;
-// Populates the run.automationDetails.id field using the analysis_key and environment
-// and return an updated sarif file contents.
-function populateRunAutomationDetails(sarifContents, analysis_key, environment) {
-    if (analysis_key === undefined) {
-        return sarifContents;
-    }
-    let automationID = `${analysis_key}/`;
-    // the id has to be deterministic so we sort the fields
-    if (environment !== undefined && environment !== "null") {
-        const environmentObject = JSON.parse(environment);
-        for (const entry of Object.entries(environmentObject).sort()) {
-            automationID += `${entry[0]}:${entry[1]}/`;
-        }
-    }
-    const sarif = JSON.parse(sarifContents);
-    for (const run of sarif.runs || []) {
-        if (run.automationDetails === undefined) {
-            run.automationDetails = {
-                id: automationID,
-            };
-        }
-    }
-    return JSON.stringify(sarif);
-}
-exports.populateRunAutomationDetails = populateRunAutomationDetails;
 // Upload the given payload.
 // If the request fails then this will retry a small number of times.
 async function uploadPayload(payload, repositoryNwo, apiDetails, mode, logger) {
@@ -90,72 +63,36 @@ async function uploadPayload(payload, repositoryNwo, apiDetails, mode, logger) {
     logger.debug(`response status: ${response.status}`);
     logger.info("Successfully uploaded results");
 }
-// Recursively walks a directory and returns all SARIF files it finds.
+// Uploads a single sarif file or a directory of sarif files
-// Does not follow symlinks.
+// depending on what the path happens to refer to.
-function findSarifFilesInDir(sarifPath) {
+// Returns true iff the upload occurred and succeeded
+async function upload(sarifPath, repositoryNwo, commitOid, ref, analysisKey, analysisName, workflowRunID, checkoutPath, environment, gitHubVersion, apiDetails, mode, logger) {
     const sarifFiles = [];
-    const walkSarifFiles = (dir) => {
-        const entries = fs.readdirSync(dir, { withFileTypes: true });
-        for (const entry of entries) {
-            if (entry.isFile() && entry.name.endsWith(".sarif")) {
-                sarifFiles.push(path.resolve(dir, entry.name));
-            }
-            else if (entry.isDirectory()) {
-                walkSarifFiles(path.resolve(dir, entry.name));
-            }
-        }
-    };
-    walkSarifFiles(sarifPath);
-    return sarifFiles;
-}
-exports.findSarifFilesInDir = findSarifFilesInDir;
-// Uploads a single sarif file or a directory of sarif files
-// depending on what the path happens to refer to.
-// Returns true iff the upload occurred and succeeded
-async function uploadFromActions(sarifPath, gitHubVersion, apiDetails, logger) {
-    return await uploadFiles(getSarifFilePaths(sarifPath), repository_1.parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")), await actionsUtil.getCommitOid(), await actionsUtil.getRef(), await actionsUtil.getAnalysisKey(), actionsUtil.getRequiredEnvParam("GITHUB_WORKFLOW"), actionsUtil.getWorkflowRunID(), actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getRequiredInput("matrix"), gitHubVersion, apiDetails, "actions", logger);
-}
-exports.uploadFromActions = uploadFromActions;
-// Uploads a single sarif file or a directory of sarif files
-// depending on what the path happens to refer to.
-// Returns true iff the upload occurred and succeeded
-async function uploadFromRunner(sarifPath, repositoryNwo, commitOid, ref, checkoutPath, gitHubVersion, apiDetails, logger) {
-    return await uploadFiles(getSarifFilePaths(sarifPath), repositoryNwo, commitOid, ref, undefined, undefined, undefined, checkoutPath, undefined, gitHubVersion, apiDetails, "runner", logger);
-}
-exports.uploadFromRunner = uploadFromRunner;
-function getSarifFilePaths(sarifPath) {
     if (!fs.existsSync(sarifPath)) {
         throw new Error(`Path does not exist: ${sarifPath}`);
     }
-    let sarifFiles;
     if (fs.lstatSync(sarifPath).isDirectory()) {
-        sarifFiles = findSarifFilesInDir(sarifPath);
+        const paths = fs
+            .readdirSync(sarifPath)
+            .filter((f) => f.endsWith(".sarif"))
+            .map((f) => path.resolve(sarifPath, f));
+        for (const filepath of paths) {
+            sarifFiles.push(filepath);
+        }
         if (sarifFiles.length === 0) {
             throw new Error(`No SARIF files found to upload in "${sarifPath}".`);
         }
     }
     else {
-        sarifFiles = [sarifPath];
+        sarifFiles.push(sarifPath);
     }
-    return sarifFiles;
+    return await uploadFiles(sarifFiles, repositoryNwo, commitOid, ref, analysisKey, analysisName, workflowRunID, checkoutPath, environment, gitHubVersion, apiDetails, mode, logger);
 }
+exports.upload = upload;
 // Counts the number of results in the given SARIF file
 function countResultsInSarif(sarif) {
     let numResults = 0;
-    let parsedSarif;
+    for (const run of JSON.parse(sarif).runs) {
-    try {
-        parsedSarif = JSON.parse(sarif);
-    }
-    catch (e) {
-        throw new Error(`Invalid SARIF. JSON syntax error: ${e.message}`);
-    }
-    if (!Array.isArray(parsedSarif.runs)) {
-        throw new Error("Invalid SARIF. Missing 'runs' array.");
-    }
-    for (const run of parsedSarif.runs) {
-        if (!Array.isArray(run.results)) {
-            throw new Error("Invalid SARIF. Missing 'results' array in run.");
-        }
         numResults += run.results.length;
     }
     return numResults;
@@ -200,12 +137,12 @@ function buildPayload(commitOid, ref, analysisKey, analysisName, zippedSarif, wo
             base_sha: undefined,
         };
         // This behaviour can be made the default when support for GHES 3.0 is discontinued.
-        if (gitHubVersion.type !== util.GitHubVariant.GHES ||
+        if (gitHubVersion.type === "dotcom" ||
             semver.satisfies(gitHubVersion.version, `>=3.1`)) {
             if (process.env.GITHUB_EVENT_NAME === "pull_request" &&
                 process.env.GITHUB_EVENT_PATH) {
                 const githubEvent = JSON.parse(fs.readFileSync(process.env.GITHUB_EVENT_PATH, "utf8"));
-                payloadObj.base_ref = `refs/heads/${githubEvent.pull_request.base.ref}`;
+                payloadObj.base_ref = `refs/heads/$githubEvent.pull_request.base.ref`;
                 payloadObj.base_sha = githubEvent.pull_request.base.sha;
             }
         }
@@ -240,7 +177,6 @@ async function uploadFiles(sarifFiles, repositoryNwo, commitOid, ref, analysisKe
     }
     let sarifPayload = combineSarifFiles(sarifFiles);
     sarifPayload = fingerprints.addFingerprints(sarifPayload, checkoutPath, logger);
-    sarifPayload = populateRunAutomationDetails(sarifPayload, analysisKey, environment);
     const zippedSarif = zlib_1.default.gzipSync(sarifPayload).toString("base64");
     const checkoutURI = file_url_1.default(checkoutPath);
     const toolNames = util.getToolNames(sarifPayload);

lib/upload-lib.test.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -6,17 +9,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     result["default"] = mod;
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
 const ava_1 = __importDefault(require("ava"));
 const logging_1 = require("./logging");
 const testing_utils_1 = require("./testing-utils");
 const uploadLib = __importStar(require("./upload-lib"));
-const util_1 = require("./util");
 testing_utils_1.setupTests(ava_1.default);
 ava_1.default("validateSarifFileSchema - valid", (t) => {
     const inputFile = `${__dirname}/../src/testdata/valid-sarif.sarif`;
@@ -28,12 +25,12 @@ ava_1.default("validateSarifFileSchema - invalid", (t) => {
 });
 ava_1.default("validate correct payload used per version", async (t) => {
     const newVersions = [
-        { type: util_1.GitHubVariant.DOTCOM },
+        { type: "dotcom" },
-        { type: util_1.GitHubVariant.GHES, version: "3.1.0" },
+        { type: "ghes", version: "3.1.0" },
     ];
     const oldVersions = [
-        { type: util_1.GitHubVariant.GHES, version: "2.22.1" },
+        { type: "ghes", version: "2.22.1" },
-        { type: util_1.GitHubVariant.GHES, version: "3.0.0" },
+        { type: "ghes", version: "3.0.0" },
     ];
     const allVersions = newVersions.concat(oldVersions);
     process.env["GITHUB_EVENT_NAME"] = "push";
@@ -47,8 +44,8 @@ ava_1.default("validate correct payload used per version", async (t) => {
     process.env["GITHUB_EVENT_PATH"] = `${__dirname}/../src/testdata/pull_request.json`;
     for (const version of newVersions) {
         const payload = uploadLib.buildPayload("commit", "refs/pull/123/merge", "key", undefined, "", undefined, "/opt/src", undefined, ["CodeQL", "eslint"], version, "actions");
-        t.deepEqual(payload.base_ref, "refs/heads/master");
+        t.truthy(payload.base_ref);
-        t.deepEqual(payload.base_sha, "f95f852bd8fca8fcc58a9a2d6c842781e32a215e");
+        t.truthy(payload.base_sha);
     }
     for (const version of oldVersions) {
         const payload = uploadLib.buildPayload("commit", "refs/pull/123/merge", "key", undefined, "", undefined, "/opt/src", undefined, ["CodeQL", "eslint"], version, "actions");
@@ -57,49 +54,4 @@ ava_1.default("validate correct payload used per version", async (t) => {
         t.falsy(payload.base_sha);
     }
 });
-ava_1.default("finding SARIF files", async (t) => {
-    await util_1.withTmpDir(async (tmpDir) => {
-        // include a couple of sarif files
-        fs.writeFileSync(path.join(tmpDir, "a.sarif"), "");
-        fs.writeFileSync(path.join(tmpDir, "b.sarif"), "");
-        // other random files shouldn't be returned
-        fs.writeFileSync(path.join(tmpDir, "c.foo"), "");
-        // we should recursively look in subdirectories
-        fs.mkdirSync(path.join(tmpDir, "dir1"));
-        fs.writeFileSync(path.join(tmpDir, "dir1", "d.sarif"), "");
-        fs.mkdirSync(path.join(tmpDir, "dir1", "dir2"));
-        fs.writeFileSync(path.join(tmpDir, "dir1", "dir2", "e.sarif"), "");
-        // we should ignore symlinks
-        fs.mkdirSync(path.join(tmpDir, "dir3"));
-        fs.symlinkSync(tmpDir, path.join(tmpDir, "dir3", "symlink1"), "dir");
-        fs.symlinkSync(path.join(tmpDir, "a.sarif"), path.join(tmpDir, "dir3", "symlink2.sarif"), "file");
-        const sarifFiles = uploadLib.findSarifFilesInDir(tmpDir);
-        t.deepEqual(sarifFiles, [
-            path.join(tmpDir, "a.sarif"),
-            path.join(tmpDir, "b.sarif"),
-            path.join(tmpDir, "dir1", "d.sarif"),
-            path.join(tmpDir, "dir1", "dir2", "e.sarif"),
-        ]);
-    });
-});
-ava_1.default("populateRunAutomationDetails", (t) => {
-    let sarif = '{"runs": [{}]}';
-    const analysisKey = ".github/workflows/codeql-analysis.yml:analyze";
-    let expectedSarif = '{"runs":[{"automationDetails":{"id":".github/workflows/codeql-analysis.yml:analyze/language:javascript/os:linux/"}}]}';
-    let modifiedSarif = uploadLib.populateRunAutomationDetails(sarif, analysisKey, '{"language": "javascript", "os": "linux"}');
-    t.deepEqual(modifiedSarif, expectedSarif);
-    // check the environment sorting
-    modifiedSarif = uploadLib.populateRunAutomationDetails(sarif, analysisKey, '{"os": "linux", "language": "javascript"}');
-    t.deepEqual(modifiedSarif, expectedSarif);
-    // check that an empty environment produces the right results
-    expectedSarif =
-        '{"runs":[{"automationDetails":{"id":".github/workflows/codeql-analysis.yml:analyze/"}}]}';
-    modifiedSarif = uploadLib.populateRunAutomationDetails(sarif, analysisKey, "{}");
-    t.deepEqual(modifiedSarif, expectedSarif);
-    // check that an empty environment produces the right results
-    sarif = '{"runs":[{"automationDetails":{"id":"my_id"}}]}';
-    expectedSarif = '{"runs":[{"automationDetails":{"id":"my_id"}}]}';
-    modifiedSarif = uploadLib.populateRunAutomationDetails(sarif, analysisKey, '{"os": "linux", "language": "javascript"}');
-    t.deepEqual(modifiedSarif, expectedSarif);
-});
 //# sourceMappingURL=upload-lib.test.js.map

lib/upload-lib.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-lib.test.js","sourceRoot":"","sources":["../src/upload-lib.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload-lib.test.js","sourceRoot":"","sources":["../src/upload-lib.test.ts"],"names":[],"mappings":"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"}

lib/upload-sarif-action.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const actionsUtil = __importStar(require("./actions-util"));
 const logging_1 = require("./logging");
+const repository_1 = require("./repository");
 const upload_lib = __importStar(require("./upload-lib"));
 const util_1 = require("./util");
 async function sendSuccessStatusReport(startedAt, uploadStats) {
@@ -31,7 +32,7 @@ async function run() {
             url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
         };
         const gitHubVersion = await util_1.getGitHubVersion(apiDetails);
-        const uploadStats = await upload_lib.uploadFromActions(actionsUtil.getRequiredInput("sarif_file"), gitHubVersion, apiDetails, logging_1.getActionsLogger());
+        const uploadStats = await upload_lib.upload(actionsUtil.getRequiredInput("sarif_file"), repository_1.parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")), await actionsUtil.getCommitOid(), await actionsUtil.getRef(), await actionsUtil.getAnalysisKey(), actionsUtil.getRequiredEnvParam("GITHUB_WORKFLOW"), actionsUtil.getWorkflowRunID(), actionsUtil.getRequiredInput("checkout_path"), actionsUtil.getRequiredInput("matrix"), gitHubVersion, apiDetails, "actions", logging_1.getActionsLogger());
         await sendSuccessStatusReport(startedAt, uploadStats);
     }
     catch (error) {

lib/upload-sarif-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-sarif-action.js","sourceRoot":"","sources":["../src/upload-sarif-action.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAEtC,4DAA8C;AAC9C,uCAA6C;AAC7C,yDAA2C;AAC3C,iCAA0C;AAM1C,KAAK,UAAU,uBAAuB,CACpC,SAAe,EACf,WAA0C;IAE1C,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAC/D,cAAc,EACd,SAAS,EACT,SAAS,CACV,CAAC;IACF,MAAM,YAAY,GAA4B;QAC5C,GAAG,gBAAgB;QACnB,GAAG,WAAW;KACf,CAAC;IACF,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IACE,CAAC,CAAC,MAAM,WAAW,CAAC,gBAAgB,CAClC,MAAM,WAAW,CAAC,sBAAsB,CACtC,cAAc,EACd,UAAU,EACV,SAAS,CACV,CACF,CAAC,EACF;QACA,OAAO;KACR;IAED,IAAI;QACF,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC3C,GAAG,EAAE,WAAW,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;SAC1D,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,uBAAgB,CAAC,UAAU,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,iBAAiB,CACpD,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAC1C,aAAa,EACb,UAAU,EACV,0BAAgB,EAAE,CACnB,CAAC;QACF,MAAM,uBAAuB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;KACvD;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,WAAW,CAAC,gBAAgB,CAChC,MAAM,WAAW,CAAC,sBAAsB,CACtC,cAAc,EACd,SAAS,EACT,SAAS,EACT,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,KAAK,CACZ,CACF,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI;QACF,MAAM,GAAG,EAAE,CAAC;KACb;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,sCAAsC,KAAK,EAAE,CAAC,CAAC;QAC9D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}
+{"version":3,"file":"upload-sarif-action.js","sourceRoot":"","sources":["../src/upload-sarif-action.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAEtC,4DAA8C;AAC9C,uCAA6C;AAC7C,6CAAkD;AAClD,yDAA2C;AAC3C,iCAA0C;AAM1C,KAAK,UAAU,uBAAuB,CACpC,SAAe,EACf,WAA0C;IAE1C,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAC/D,cAAc,EACd,SAAS,EACT,SAAS,CACV,CAAC;IACF,MAAM,YAAY,GAA4B;QAC5C,GAAG,gBAAgB;QACnB,GAAG,WAAW;KACf,CAAC;IACF,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IACE,CAAC,CAAC,MAAM,WAAW,CAAC,gBAAgB,CAClC,MAAM,WAAW,CAAC,sBAAsB,CACtC,cAAc,EACd,UAAU,EACV,SAAS,CACV,CACF,CAAC,EACF;QACA,OAAO;KACR;IAED,IAAI;QACF,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC3C,GAAG,EAAE,WAAW,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;SAC1D,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,uBAAgB,CAAC,UAAU,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,MAAM,CACzC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAC1C,+BAAkB,CAAC,WAAW,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,EACxE,MAAM,WAAW,CAAC,YAAY,EAAE,EAChC,MAAM,WAAW,CAAC,MAAM,EAAE,EAC1B,MAAM,WAAW,CAAC,cAAc,EAAE,EAClC,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAClD,WAAW,CAAC,gBAAgB,EAAE,EAC9B,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,EAC7C,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EACtC,aAAa,EACb,UAAU,EACV,SAAS,EACT,0BAAgB,EAAE,CACnB,CAAC;QACF,MAAM,uBAAuB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;KACvD;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,WAAW,CAAC,gBAAgB,CAChC,MAAM,WAAW,CAAC,sBAAsB,CACtC,cAAc,EACd,SAAS,EACT,SAAS,EACT,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,KAAK,CACZ,CACF,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI;QACF,MAAM,GAAG,EAAE,CAAC;KACb;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,SAAS,CAAC,sCAAsC,KAAK,EAAE,CAAC,CAAC;QAC9D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAED,KAAK,UAAU,EAAE,CAAC"}

lib/util.js

@@ -72,21 +72,9 @@ async function withTmpDir(body) {
     return result;
 }
 exports.withTmpDir = withTmpDir;
-/**
- * Gets an OS-specific amount of memory (in MB) to reserve for OS processes
- * when the user doesn't explicitly specify a memory setting.
- * This is a heuristic to avoid OOM errors (exit code 137 / SIGKILL)
- * from committing too much of the available memory to CodeQL.
- * @returns number
- */
-function getSystemReservedMemoryMegaBytes() {
-    // Windows needs more memory for OS processes.
-    return 1024 * (process.platform === "win32" ? 1.5 : 1);
-}
 /**
  * Get the codeql `--ram` flag as configured by the `ram` input. If no value was
- * specified, the total available memory will be used minus a threshold
+ * specified, the total available memory will be used minus 256 MB.
- * reserved for the OS.
  *
  * @returns string
  */
@@ -101,8 +89,8 @@ function getMemoryFlag(userInput) {
     else {
         const totalMemoryBytes = os.totalmem();
         const totalMemoryMegaBytes = totalMemoryBytes / (1024 * 1024);
-        const reservedMemoryMegaBytes = getSystemReservedMemoryMegaBytes();
+        const systemReservedMemoryMegaBytes = 256;
-        memoryToUseMegaBytes = totalMemoryMegaBytes - reservedMemoryMegaBytes;
+        memoryToUseMegaBytes = totalMemoryMegaBytes - systemReservedMemoryMegaBytes;
     }
     return `--ram=${Math.floor(memoryToUseMegaBytes)}`;
 }
@@ -171,7 +159,7 @@ exports.getCodeQLDatabasePath = getCodeQLDatabasePath;
  * Parses user input of a github.com or GHES URL to a canonical form.
  * Removes any API prefix or suffix if one is present.
  */
-function parseGitHubUrl(inputUrl) {
+function parseGithubUrl(inputUrl) {
     const originalUrl = inputUrl;
     if (inputUrl.indexOf("://") === -1) {
         inputUrl = `https://${inputUrl}`;
@@ -205,20 +193,14 @@ function parseGitHubUrl(inputUrl) {
     }
     return url.toString();
 }
-exports.parseGitHubUrl = parseGitHubUrl;
+exports.parseGithubUrl = parseGithubUrl;
 const GITHUB_ENTERPRISE_VERSION_HEADER = "x-github-enterprise-version";
 const CODEQL_ACTION_WARNED_ABOUT_VERSION_ENV_VAR = "CODEQL_ACTION_WARNED_ABOUT_VERSION";
 let hasBeenWarnedAboutVersion = false;
-var GitHubVariant;
-(function (GitHubVariant) {
-    GitHubVariant[GitHubVariant["DOTCOM"] = 0] = "DOTCOM";
-    GitHubVariant[GitHubVariant["GHES"] = 1] = "GHES";
-    GitHubVariant[GitHubVariant["GHAE"] = 2] = "GHAE";
-})(GitHubVariant = exports.GitHubVariant || (exports.GitHubVariant = {}));
 async function getGitHubVersion(apiDetails) {
     // We can avoid making an API request in the standard dotcom case
-    if (parseGitHubUrl(apiDetails.url) === exports.GITHUB_DOTCOM_URL) {
+    if (parseGithubUrl(apiDetails.url) === exports.GITHUB_DOTCOM_URL) {
-        return { type: GitHubVariant.DOTCOM };
+        return { type: "dotcom" };
     }
     // Doesn't strictly have to be the meta endpoint as we're only
     // using the response headers which are available on every request.
@@ -227,26 +209,23 @@ async function getGitHubVersion(apiDetails) {
     // This happens on dotcom, although we expect to have already returned in that
     // case. This can also serve as a fallback in cases we haven't foreseen.
     if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === undefined) {
-        return { type: GitHubVariant.DOTCOM };
+        return { type: "dotcom" };
-    }
-    if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "GitHub AE") {
-        return { type: GitHubVariant.GHAE };
     }
     const version = response.headers[GITHUB_ENTERPRISE_VERSION_HEADER];
-    return { type: GitHubVariant.GHES, version };
+    return { type: "ghes", version };
 }
 exports.getGitHubVersion = getGitHubVersion;
 function checkGitHubVersionInRange(version, mode, logger) {
-    if (hasBeenWarnedAboutVersion || version.type !== GitHubVariant.GHES) {
+    if (hasBeenWarnedAboutVersion || version.type !== "ghes") {
         return;
     }
     const disallowedAPIVersionReason = apiVersionInRange(version.version, apiCompatibility.minimumVersion, apiCompatibility.maximumVersion);
     const toolName = mode === "actions" ? "Action" : "Runner";
     if (disallowedAPIVersionReason === DisallowedAPIVersionReason.ACTION_TOO_OLD) {
-        logger.warning(`The CodeQL ${toolName} version you are using is too old to be compatible with GitHub Enterprise ${version.version}. If you experience issues, please upgrade to a more recent version of the CodeQL ${toolName}.`);
+        logger.warning(`The CodeQL ${toolName} version you are using is too old to be compatible with GitHub Enterprise ${version}. If you experience issues, please upgrade to a more recent version of the CodeQL ${toolName}.`);
     }
     if (disallowedAPIVersionReason === DisallowedAPIVersionReason.ACTION_TOO_NEW) {
-        logger.warning(`GitHub Enterprise ${version.version} is too old to be compatible with this version of the CodeQL ${toolName}. If you experience issues, please upgrade to a more recent version of GitHub Enterprise or use an older version of the CodeQL ${toolName}.`);
+        logger.warning(`GitHub Enterprise ${version} is too old to be compatible with this version of the CodeQL ${toolName}. If you experience issues, please upgrade to a more recent version of GitHub Enterprise or use an older version of the CodeQL ${toolName}.`);
     }
     hasBeenWarnedAboutVersion = true;
     if (mode === "actions") {
@@ -269,71 +248,4 @@ function apiVersionInRange(version, minimumVersion, maximumVersion) {
     return undefined;
 }
 exports.apiVersionInRange = apiVersionInRange;
-/**
- * Retrieves the github auth token for use with the runner. There are
- * three possible locations for the token:
- *
- * 1. from the cli (considered insecure)
- * 2. from stdin
- * 3. from the GITHUB_TOKEN environment variable
- *
- * If both 1 & 2 are specified, then an error is thrown.
- * If 1 & 3 or 2 & 3 are specified, then the environment variable is ignored.
- *
- * @param githubAuth a github app token or PAT
- * @param fromStdIn read the github app token or PAT from stdin up to, but excluding the first whitespace
- * @param readable the readable stream to use for getting the token (defaults to stdin)
- *
- * @return a promise resolving to the auth token.
- */
-async function getGitHubAuth(logger, githubAuth, fromStdIn, readable = process.stdin) {
-    if (githubAuth && fromStdIn) {
-        throw new Error("Cannot specify both `--github-auth` and `--github-auth-stdin`. Please use `--github-auth-stdin`, which is more secure.");
-    }
-    if (githubAuth) {
-        logger.warning("Using `--github-auth` via the CLI is insecure. Use `--github-auth-stdin` instead.");
-        return githubAuth;
-    }
-    if (fromStdIn) {
-        return new Promise((resolve, reject) => {
-            let token = "";
-            readable.on("data", (data) => {
-                token += data.toString("utf8");
-            });
-            readable.on("end", () => {
-                token = token.split(/\s+/)[0].trim();
-                if (token) {
-                    resolve(token);
-                }
-                else {
-                    reject(new Error("Standard input is empty"));
-                }
-            });
-            readable.on("error", (err) => {
-                reject(err);
-            });
-        });
-    }
-    if (process.env.GITHUB_TOKEN) {
-        return process.env.GITHUB_TOKEN;
-    }
-    throw new Error("No GitHub authentication token was specified. Please provide a token via the GITHUB_TOKEN environment variable, or by adding the `--github-auth-stdin` flag and passing the token via standard input.");
-}
-exports.getGitHubAuth = getGitHubAuth;
-// Sets environment variables that make using some libraries designed for
-// use only on actions safe to use outside of actions.
-//
-// Obviously this is not a tremendously great thing we're doing and it
-// would be better to write our own implementation of libraries to use
-// outside of actions. For now this works well enough.
-//
-// Currently this list of libraries that is deemed to now be safe includes:
-// - @actions/tool-cache
-//
-// Also see "queries/unguarded-action-lib.ql".
-function setupActionsVars(tempDir, toolsDir) {
-    process.env["RUNNER_TEMP"] = tempDir;
-    process.env["RUNNER_TOOL_CACHE"] = toolsDir;
-}
-exports.setupActionsVars = setupActionsVars;
 //# sourceMappingURL=util.js.map

lib/util.test.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
-const stream = __importStar(require("stream"));
 const github = __importStar(require("@actions/github"));
 const ava_1 = __importDefault(require("ava"));
 const sinon_1 = __importDefault(require("sinon"));
@@ -28,10 +27,9 @@ ava_1.default("getToolNames", (t) => {
 });
 ava_1.default("getMemoryFlag() should return the correct --ram flag", (t) => {
     const totalMem = Math.floor(os.totalmem() / (1024 * 1024));
-    const expectedThreshold = process.platform === "win32" ? 1536 : 1024;
     const tests = [
-        [undefined, `--ram=${totalMem - expectedThreshold}`],
+        [undefined, `--ram=${totalMem - 256}`],
-        ["", `--ram=${totalMem - expectedThreshold}`],
+        ["", `--ram=${totalMem - 256}`],
         ["512", "--ram=512"],
     ];
     for (const [input, expectedFlag] of tests) {
@@ -102,27 +100,27 @@ ava_1.default("getExtraOptionsEnvParam() fails on invalid JSON", (t) => {
     t.throws(util.getExtraOptionsEnvParam);
     process.env.CODEQL_ACTION_EXTRA_OPTIONS = origExtraOptions;
 });
-ava_1.default("parseGitHubUrl", (t) => {
+ava_1.default("parseGithubUrl", (t) => {
-    t.deepEqual(util.parseGitHubUrl("github.com"), "https://github.com");
+    t.deepEqual(util.parseGithubUrl("github.com"), "https://github.com");
-    t.deepEqual(util.parseGitHubUrl("https://github.com"), "https://github.com");
+    t.deepEqual(util.parseGithubUrl("https://github.com"), "https://github.com");
-    t.deepEqual(util.parseGitHubUrl("https://api.github.com"), "https://github.com");
+    t.deepEqual(util.parseGithubUrl("https://api.github.com"), "https://github.com");
-    t.deepEqual(util.parseGitHubUrl("https://github.com/foo/bar"), "https://github.com");
+    t.deepEqual(util.parseGithubUrl("https://github.com/foo/bar"), "https://github.com");
-    t.deepEqual(util.parseGitHubUrl("github.example.com"), "https://github.example.com/");
+    t.deepEqual(util.parseGithubUrl("github.example.com"), "https://github.example.com/");
-    t.deepEqual(util.parseGitHubUrl("https://github.example.com"), "https://github.example.com/");
+    t.deepEqual(util.parseGithubUrl("https://github.example.com"), "https://github.example.com/");
-    t.deepEqual(util.parseGitHubUrl("https://api.github.example.com"), "https://github.example.com/");
+    t.deepEqual(util.parseGithubUrl("https://api.github.example.com"), "https://github.example.com/");
-    t.deepEqual(util.parseGitHubUrl("https://github.example.com/api/v3"), "https://github.example.com/");
+    t.deepEqual(util.parseGithubUrl("https://github.example.com/api/v3"), "https://github.example.com/");
-    t.deepEqual(util.parseGitHubUrl("https://github.example.com:1234"), "https://github.example.com:1234/");
+    t.deepEqual(util.parseGithubUrl("https://github.example.com:1234"), "https://github.example.com:1234/");
-    t.deepEqual(util.parseGitHubUrl("https://api.github.example.com:1234"), "https://github.example.com:1234/");
+    t.deepEqual(util.parseGithubUrl("https://api.github.example.com:1234"), "https://github.example.com:1234/");
-    t.deepEqual(util.parseGitHubUrl("https://github.example.com:1234/api/v3"), "https://github.example.com:1234/");
+    t.deepEqual(util.parseGithubUrl("https://github.example.com:1234/api/v3"), "https://github.example.com:1234/");
-    t.deepEqual(util.parseGitHubUrl("https://github.example.com/base/path"), "https://github.example.com/base/path/");
+    t.deepEqual(util.parseGithubUrl("https://github.example.com/base/path"), "https://github.example.com/base/path/");
-    t.deepEqual(util.parseGitHubUrl("https://github.example.com/base/path/api/v3"), "https://github.example.com/base/path/");
+    t.deepEqual(util.parseGithubUrl("https://github.example.com/base/path/api/v3"), "https://github.example.com/base/path/");
-    t.throws(() => util.parseGitHubUrl(""), {
+    t.throws(() => util.parseGithubUrl(""), {
         message: '"" is not a valid URL',
     });
-    t.throws(() => util.parseGitHubUrl("ssh://github.com"), {
+    t.throws(() => util.parseGithubUrl("ssh://github.com"), {
         message: '"ssh://github.com" is not a http or https URL',
     });
-    t.throws(() => util.parseGitHubUrl("http:///::::433"), {
+    t.throws(() => util.parseGithubUrl("http:///::::433"), {
         message: '"http:///::::433" is not a valid URL',
     });
 });
@@ -154,54 +152,18 @@ ava_1.default("getGitHubVersion", async (t) => {
         auth: "",
         url: "https://github.com",
     });
-    t.deepEqual(util.GitHubVariant.DOTCOM, v.type);
+    t.deepEqual("dotcom", v.type);
     mockGetMetaVersionHeader("2.0");
     const v2 = await util.getGitHubVersion({
         auth: "",
         url: "https://ghe.example.com",
     });
-    t.deepEqual({ type: util.GitHubVariant.GHES, version: "2.0" }, v2);
+    t.deepEqual({ type: "ghes", version: "2.0" }, v2);
-    mockGetMetaVersionHeader("GitHub AE");
-    const ghae = await util.getGitHubVersion({
-        auth: "",
-        url: "https://example.githubenterprise.com",
-    });
-    t.deepEqual({ type: util.GitHubVariant.GHAE }, ghae);
     mockGetMetaVersionHeader(undefined);
     const v3 = await util.getGitHubVersion({
         auth: "",
         url: "https://ghe.example.com",
     });
-    t.deepEqual({ type: util.GitHubVariant.DOTCOM }, v3);
+    t.deepEqual({ type: "dotcom" }, v3);
 });
-ava_1.default("getGitHubAuth", async (t) => {
-    const msgs = [];
-    const mockLogger = {
-        warning: (msg) => msgs.push(msg),
-    };
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    t.throwsAsync(async () => util.getGitHubAuth(mockLogger, "abc", true));
-    process.env.GITHUB_TOKEN = "123";
-    t.is("123", await util.getGitHubAuth(mockLogger, undefined, undefined));
-    t.is(msgs.length, 0);
-    t.is("abc", await util.getGitHubAuth(mockLogger, "abc", undefined));
-    t.is(msgs.length, 1); // warning expected
-    msgs.length = 0;
-    await mockStdInForAuth(t, mockLogger, "def", "def");
-    await mockStdInForAuth(t, mockLogger, "def", "", "def");
-    await mockStdInForAuth(t, mockLogger, "def", "def\n some extra garbage", "ghi");
-    await mockStdInForAuth(t, mockLogger, "defghi", "def", "ghi\n123");
-    await mockStdInForAuthExpectError(t, mockLogger, "");
-    await mockStdInForAuthExpectError(t, mockLogger, "", " ", "abc");
-    await mockStdInForAuthExpectError(t, mockLogger, "  def\n some extra garbage", "ghi");
-    t.is(msgs.length, 0);
-});
-async function mockStdInForAuth(t, mockLogger, expected, ...text) {
-    const stdin = stream.Readable.from(text);
-    t.is(expected, await util.getGitHubAuth(mockLogger, undefined, true, stdin));
-}
-async function mockStdInForAuthExpectError(t, mockLogger, ...text) {
-    const stdin = stream.Readable.from(text);
-    await t.throwsAsync(async () => util.getGitHubAuth(mockLogger, undefined, true, stdin));
-}
 //# sourceMappingURL=util.test.js.map

node_modules/.bin/glob-hash

@@ -0,0 +1 @@
+../glob-hash/bin/glob-hash

node_modules/@actions/core/package.json

@@ -1,16 +1,40 @@
 {
-  "name": "@actions/core",
+  "_args": [
-  "version": "1.2.6",
+    [
-  "description": "Actions core lib",
+      "@actions/core@1.2.6",
-  "keywords": [
+      "/home/marco/repos/github/codeql-action"
-    "github",
+    ]
-    "actions",
-    "core"
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/main/packages/core",
+  "_from": "@actions/core@1.2.6",
-  "license": "MIT",
+  "_id": "@actions/core@1.2.6",
-  "main": "lib/core.js",
+  "_inBundle": false,
-  "types": "lib/core.d.ts",
+  "_integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==",
+  "_location": "/@actions/core",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/core@1.2.6",
+    "name": "@actions/core",
+    "escapedName": "@actions%2fcore",
+    "scope": "@actions",
+    "rawSpec": "1.2.6",
+    "saveSpec": null,
+    "fetchSpec": "1.2.6"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+  "_spec": "1.2.6",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "description": "Actions core lib",
+  "devDependencies": {
+    "@types/node": "^12.0.2"
+  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -19,6 +43,15 @@
     "lib",
     "!.DS_Store"
   ],
+  "homepage": "https://github.com/actions/toolkit/tree/main/packages/core",
+  "keywords": [
+    "github",
+    "actions",
+    "core"
+  ],
+  "license": "MIT",
+  "main": "lib/core.js",
+  "name": "@actions/core",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +65,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "bugs": {
+  "types": "lib/core.d.ts",
-    "url": "https://github.com/actions/toolkit/issues"
+  "version": "1.2.6"
-  },
+}
-  "devDependencies": {
-    "@types/node": "^12.0.2"
-  }
-}

node_modules/@actions/exec/package.json

@@ -1,15 +1,41 @@
 {
-  "name": "@actions/exec",
+  "_args": [
-  "version": "1.0.1",
+    [
-  "description": "Actions exec lib",
+      "@actions/exec@1.0.1",
-  "keywords": [
+      "/home/marco/repos/github/codeql-action"
-    "github",
+    ]
-    "actions",
-    "exec"
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/master/packages/exec",
+  "_from": "@actions/exec@1.0.1",
-  "license": "MIT",
+  "_id": "@actions/exec@1.0.1",
-  "main": "lib/exec.js",
+  "_inBundle": false,
+  "_integrity": "sha512-nvFkxwiicvpzNiCBF4wFBDfnBvi7xp/as7LE1hBxBxKG2L29+gkIPBiLKMVORL+Hg3JNf07AKRfl0V5djoypjQ==",
+  "_location": "/@actions/exec",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/exec@1.0.1",
+    "name": "@actions/exec",
+    "escapedName": "@actions%2fexec",
+    "scope": "@actions",
+    "rawSpec": "1.0.1",
+    "saveSpec": null,
+    "fetchSpec": "1.0.1"
+  },
+  "_requiredBy": [
+    "/",
+    "/@actions/tool-cache"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.1.tgz",
+  "_spec": "1.0.1",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "description": "Actions exec lib",
+  "devDependencies": {
+    "@actions/io": "^1.0.1"
+  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -17,6 +43,16 @@
   "files": [
     "lib"
   ],
+  "gitHead": "a2ab4bcf78e4f7080f0d45856e6eeba16f0bbc52",
+  "homepage": "https://github.com/actions/toolkit/tree/master/packages/exec",
+  "keywords": [
+    "github",
+    "actions",
+    "exec"
+  ],
+  "license": "MIT",
+  "main": "lib/exec.js",
+  "name": "@actions/exec",
   "publishConfig": {
     "access": "public"
   },
@@ -28,11 +64,5 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "bugs": {
+  "version": "1.0.1"
-    "url": "https://github.com/actions/toolkit/issues"
+}
-  },
-  "devDependencies": {
-    "@actions/io": "^1.0.1"
-  },
-  "gitHead": "a2ab4bcf78e4f7080f0d45856e6eeba16f0bbc52"
-}

node_modules/@actions/github/package.json

@@ -1,15 +1,47 @@
 {
-  "name": "@actions/github",
+  "_args": [
-  "version": "4.0.0",
+    [
-  "description": "Actions github lib",
+      "@actions/github@4.0.0",
-  "keywords": [
+      "/home/marco/repos/github/codeql-action"
-    "github",
+    ]
-    "actions"
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/master/packages/github",
+  "_from": "@actions/github@4.0.0",
-  "license": "MIT",
+  "_id": "@actions/github@4.0.0",
-  "main": "lib/github.js",
+  "_inBundle": false,
-  "types": "lib/github.d.ts",
+  "_integrity": "sha512-Ej/Y2E+VV6sR9X7pWL5F3VgEWrABaT292DRqRU6R4hnQjPtC/zD3nagxVdXWiRQvYDh8kHXo7IDmG42eJ/dOMA==",
+  "_location": "/@actions/github",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/github@4.0.0",
+    "name": "@actions/github",
+    "escapedName": "@actions%2fgithub",
+    "scope": "@actions",
+    "rawSpec": "4.0.0",
+    "saveSpec": null,
+    "fetchSpec": "4.0.0"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/github/-/github-4.0.0.tgz",
+  "_spec": "4.0.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "dependencies": {
+    "@actions/http-client": "^1.0.8",
+    "@octokit/core": "^3.0.0",
+    "@octokit/plugin-paginate-rest": "^2.2.3",
+    "@octokit/plugin-rest-endpoint-methods": "^4.0.0"
+  },
+  "description": "Actions github lib",
+  "devDependencies": {
+    "jest": "^25.1.0",
+    "proxy": "^1.0.1"
+  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -18,6 +50,14 @@
     "lib",
     "!.DS_Store"
   ],
+  "homepage": "https://github.com/actions/toolkit/tree/master/packages/github",
+  "keywords": [
+    "github",
+    "actions"
+  ],
+  "license": "MIT",
+  "main": "lib/github.js",
+  "name": "@actions/github",
   "publishConfig": {
     "access": "public"
   },
@@ -28,23 +68,12 @@
   },
   "scripts": {
     "audit-moderate": "npm install && npm audit --audit-level=moderate",
-    "test": "jest",
     "build": "tsc",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
+    "test": "jest",
     "tsc": "tsc"
   },
-  "bugs": {
+  "types": "lib/github.d.ts",
-    "url": "https://github.com/actions/toolkit/issues"
+  "version": "4.0.0"
-  },
+}
-  "dependencies": {
-    "@actions/http-client": "^1.0.8",
-    "@octokit/core": "^3.0.0",
-    "@octokit/plugin-paginate-rest": "^2.2.3",
-    "@octokit/plugin-rest-endpoint-methods": "^4.0.0"
-  },
-  "devDependencies": {
-    "jest": "^25.1.0",
-    "proxy": "^1.0.1"
-  }
-}

node_modules/@actions/http-client/node_modules/tunnel/package.json

@@ -1,7 +1,51 @@
 {
-  "name": "tunnel",
+  "_args": [
-  "version": "0.0.6",
+    [
+      "tunnel@0.0.6",
+      "/home/marco/repos/github/codeql-action"
+    ]
+  ],
+  "_from": "tunnel@0.0.6",
+  "_id": "tunnel@0.0.6",
+  "_inBundle": false,
+  "_integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+  "_location": "/@actions/http-client/tunnel",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "tunnel@0.0.6",
+    "name": "tunnel",
+    "escapedName": "tunnel",
+    "rawSpec": "0.0.6",
+    "saveSpec": null,
+    "fetchSpec": "0.0.6"
+  },
+  "_requiredBy": [
+    "/@actions/http-client"
+  ],
+  "_resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+  "_spec": "0.0.6",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "Koichi Kobayashi",
+    "email": "koichik@improvement.jp"
+  },
+  "bugs": {
+    "url": "https://github.com/koichik/node-tunnel/issues"
+  },
   "description": "Node HTTP/HTTPS Agents for tunneling proxies",
+  "devDependencies": {
+    "mocha": "^5.2.0",
+    "should": "^13.2.3"
+  },
+  "directories": {
+    "lib": "./lib"
+  },
+  "engines": {
+    "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+  },
+  "homepage": "https://github.com/koichik/node-tunnel/",
   "keywords": [
     "http",
     "https",
@@ -9,26 +53,15 @@
     "proxy",
     "tunnel"
   ],
-  "homepage": "https://github.com/koichik/node-tunnel/",
-  "bugs": "https://github.com/koichik/node-tunnel/issues",
   "license": "MIT",
-  "author": "Koichi Kobayashi <koichik@improvement.jp>",
   "main": "./index.js",
-  "directories": {
+  "name": "tunnel",
-    "lib": "./lib"
-  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/koichik/node-tunnel.git"
+    "url": "git+https://github.com/koichik/node-tunnel.git"
   },
   "scripts": {
     "test": "mocha"
   },
-  "devDependencies": {
+  "version": "0.0.6"
-    "mocha": "^5.2.0",
+}
-    "should": "^13.2.3"
-  },
-  "engines": {
-    "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-  }
-}

node_modules/@actions/http-client/package.json

@@ -1,29 +1,45 @@
 {
-  "name": "@actions/http-client",
+  "_args": [
-  "version": "1.0.8",
+    [
-  "description": "Actions Http Client",
+      "@actions/http-client@1.0.8",
-  "main": "index.js",
+      "/home/marco/repos/github/codeql-action"
-  "scripts": {
+    ]
-    "build": "rm -Rf ./_out && tsc && cp package*.json ./_out && cp *.md ./_out && cp LICENSE ./_out && cp actions.png ./_out",
-    "test": "jest",
-    "format": "prettier --write *.ts && prettier --write **/*.ts",
-    "format-check": "prettier --check *.ts && prettier --check **/*.ts",
-    "audit-check": "npm audit --audit-level=moderate"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/actions/http-client.git"
-  },
-  "keywords": [
-    "Actions",
-    "Http"
   ],
-  "author": "GitHub, Inc.",
+  "_from": "@actions/http-client@1.0.8",
-  "license": "MIT",
+  "_id": "@actions/http-client@1.0.8",
+  "_inBundle": false,
+  "_integrity": "sha512-G4JjJ6f9Hb3Zvejj+ewLLKLf99ZC+9v+yCxoYf9vSyH+WkzPLB2LuUtRMGNkooMqdugGBFStIKXOuvH1W+EctA==",
+  "_location": "/@actions/http-client",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/http-client@1.0.8",
+    "name": "@actions/http-client",
+    "escapedName": "@actions%2fhttp-client",
+    "scope": "@actions",
+    "rawSpec": "1.0.8",
+    "saveSpec": null,
+    "fetchSpec": "1.0.8"
+  },
+  "_requiredBy": [
+    "/",
+    "/@actions/github",
+    "/@actions/tool-cache"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.8.tgz",
+  "_spec": "1.0.8",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "GitHub, Inc."
+  },
   "bugs": {
     "url": "https://github.com/actions/http-client/issues"
   },
-  "homepage": "https://github.com/actions/http-client#readme",
+  "dependencies": {
+    "tunnel": "0.0.6"
+  },
+  "description": "Actions Http Client",
   "devDependencies": {
     "@types/jest": "^25.1.4",
     "@types/node": "^12.12.31",
@@ -33,7 +49,24 @@
     "ts-jest": "^25.2.1",
     "typescript": "^3.8.3"
   },
-  "dependencies": {
+  "homepage": "https://github.com/actions/http-client#readme",
-    "tunnel": "0.0.6"
+  "keywords": [
-  }
+    "Actions",
-}
+    "Http"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "name": "@actions/http-client",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/actions/http-client.git"
+  },
+  "scripts": {
+    "audit-check": "npm audit --audit-level=moderate",
+    "build": "rm -Rf ./_out && tsc && cp package*.json ./_out && cp *.md ./_out && cp LICENSE ./_out && cp actions.png ./_out",
+    "format": "prettier --write *.ts && prettier --write **/*.ts",
+    "format-check": "prettier --check *.ts && prettier --check **/*.ts",
+    "test": "jest"
+  },
+  "version": "1.0.8"
+}

node_modules/@actions/io/package.json

@@ -1,15 +1,37 @@
 {
-  "name": "@actions/io",
+  "_args": [
-  "version": "1.0.1",
+    [
-  "description": "Actions io lib",
+      "@actions/io@1.0.1",
-  "keywords": [
+      "/home/marco/repos/github/codeql-action"
-    "github",
+    ]
-    "actions",
-    "io"
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/master/packages/io",
+  "_from": "@actions/io@1.0.1",
-  "license": "MIT",
+  "_id": "@actions/io@1.0.1",
-  "main": "lib/io.js",
+  "_inBundle": false,
+  "_integrity": "sha512-rhq+tfZukbtaus7xyUtwKfuiCRXd1hWSfmJNEpFgBQJ4woqPEpsBw04awicjwz9tyG2/MVhAEMfVn664Cri5zA==",
+  "_location": "/@actions/io",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/io@1.0.1",
+    "name": "@actions/io",
+    "escapedName": "@actions%2fio",
+    "scope": "@actions",
+    "rawSpec": "1.0.1",
+    "saveSpec": null,
+    "fetchSpec": "1.0.1"
+  },
+  "_requiredBy": [
+    "/@actions/tool-cache"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.1.tgz",
+  "_spec": "1.0.1",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "description": "Actions io lib",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -17,6 +39,16 @@
   "files": [
     "lib"
   ],
+  "gitHead": "a2ab4bcf78e4f7080f0d45856e6eeba16f0bbc52",
+  "homepage": "https://github.com/actions/toolkit/tree/master/packages/io",
+  "keywords": [
+    "github",
+    "actions",
+    "io"
+  ],
+  "license": "MIT",
+  "main": "lib/io.js",
+  "name": "@actions/io",
   "publishConfig": {
     "access": "public"
   },
@@ -28,8 +60,5 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "bugs": {
+  "version": "1.0.1"
-    "url": "https://github.com/actions/toolkit/issues"
+}
-  },
-  "gitHead": "a2ab4bcf78e4f7080f0d45856e6eeba16f0bbc52"
-}

node_modules/@actions/tool-cache/node_modules/@actions/core/package.json

@@ -1,16 +1,40 @@
 {
-  "name": "@actions/core",
+  "_args": [
-  "version": "1.2.4",
+    [
-  "description": "Actions core lib",
+      "@actions/core@1.2.4",
-  "keywords": [
+      "/home/marco/repos/github/codeql-action"
-    "github",
+    ]
-    "actions",
-    "core"
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/master/packages/core",
+  "_from": "@actions/core@1.2.4",
-  "license": "MIT",
+  "_id": "@actions/core@1.2.4",
-  "main": "lib/core.js",
+  "_inBundle": false,
-  "types": "lib/core.d.ts",
+  "_integrity": "sha512-YJCEq8BE3CdN8+7HPZ/4DxJjk/OkZV2FFIf+DlZTC/4iBlzYCD5yjRR6eiOS5llO11zbRltIRuKAjMKaWTE6cg==",
+  "_location": "/@actions/tool-cache/@actions/core",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/core@1.2.4",
+    "name": "@actions/core",
+    "escapedName": "@actions%2fcore",
+    "scope": "@actions",
+    "rawSpec": "1.2.4",
+    "saveSpec": null,
+    "fetchSpec": "1.2.4"
+  },
+  "_requiredBy": [
+    "/@actions/tool-cache"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.4.tgz",
+  "_spec": "1.2.4",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "description": "Actions core lib",
+  "devDependencies": {
+    "@types/node": "^12.0.2"
+  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -18,6 +42,15 @@
   "files": [
     "lib"
   ],
+  "homepage": "https://github.com/actions/toolkit/tree/master/packages/core",
+  "keywords": [
+    "github",
+    "actions",
+    "core"
+  ],
+  "license": "MIT",
+  "main": "lib/core.js",
+  "name": "@actions/core",
   "publishConfig": {
     "access": "public"
   },
@@ -31,10 +64,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "bugs": {
+  "types": "lib/core.d.ts",
-    "url": "https://github.com/actions/toolkit/issues"
+  "version": "1.2.4"
-  },
+}
-  "devDependencies": {
-    "@types/node": "^12.0.2"
-  }
-}

node_modules/@actions/tool-cache/node_modules/semver/package.json

@@ -1,28 +1,63 @@
 {
-  "name": "semver",
+  "_args": [
-  "version": "6.3.0",
+    [
-  "description": "The semantic version parser used by npm.",
+      "semver@6.3.0",
-  "main": "semver.js",
+      "/home/marco/repos/github/codeql-action"
-  "scripts": {
+    ]
-    "test": "tap",
+  ],
-    "preversion": "npm test",
+  "_from": "semver@6.3.0",
-    "postversion": "npm publish",
+  "_id": "semver@6.3.0",
-    "postpublish": "git push origin --follow-tags"
+  "_inBundle": false,
+  "_integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+  "_location": "/@actions/tool-cache/semver",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "semver@6.3.0",
+    "name": "semver",
+    "escapedName": "semver",
+    "rawSpec": "6.3.0",
+    "saveSpec": null,
+    "fetchSpec": "6.3.0"
   },
+  "_requiredBy": [
+    "/@actions/tool-cache"
+  ],
+  "_resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+  "_spec": "6.3.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bin": {
+    "semver": "bin/semver.js"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/node-semver/issues"
+  },
+  "description": "The semantic version parser used by npm.",
   "devDependencies": {
     "tap": "^14.3.1"
   },
-  "license": "ISC",
-  "repository": "https://github.com/npm/node-semver",
-  "bin": {
-    "semver": "./bin/semver.js"
-  },
   "files": [
     "bin",
     "range.bnf",
     "semver.js"
   ],
+  "homepage": "https://github.com/npm/node-semver#readme",
+  "license": "ISC",
+  "main": "semver.js",
+  "name": "semver",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/node-semver.git"
+  },
+  "scripts": {
+    "postpublish": "git push origin --follow-tags",
+    "postversion": "npm publish",
+    "preversion": "npm test",
+    "test": "tap"
+  },
   "tap": {
     "check-coverage": true
-  }
+  },
-}
+  "version": "6.3.0"
+}

node_modules/@actions/tool-cache/node_modules/uuid/package.json

@@ -1,21 +1,71 @@
 {
-  "name": "uuid",
+  "_args": [
-  "version": "3.4.0",
+    [
-  "description": "RFC4122 (v1, v4, and v5) UUIDs",
+      "uuid@3.4.0",
+      "/home/marco/repos/github/codeql-action"
+    ]
+  ],
+  "_from": "uuid@3.4.0",
+  "_id": "uuid@3.4.0",
+  "_inBundle": false,
+  "_integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+  "_location": "/@actions/tool-cache/uuid",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "uuid@3.4.0",
+    "name": "uuid",
+    "escapedName": "uuid",
+    "rawSpec": "3.4.0",
+    "saveSpec": null,
+    "fetchSpec": "3.4.0"
+  },
+  "_requiredBy": [
+    "/@actions/tool-cache"
+  ],
+  "_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+  "_spec": "3.4.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bin": {
+    "uuid": "bin/uuid"
+  },
+  "browser": {
+    "./lib/rng.js": "./lib/rng-browser.js",
+    "./lib/sha1.js": "./lib/sha1-browser.js",
+    "./lib/md5.js": "./lib/md5-browser.js"
+  },
+  "bugs": {
+    "url": "https://github.com/uuidjs/uuid/issues"
+  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
     ]
   },
-  "keywords": [
+  "contributors": [
-    "uuid",
+    {
-    "guid",
+      "name": "Robert Kieffer",
-    "rfc4122"
+      "email": "robert@broofa.com"
+    },
+    {
+      "name": "Christoph Tavan",
+      "email": "dev@tavan.de"
+    },
+    {
+      "name": "AJ ONeal",
+      "email": "coolaj86@gmail.com"
+    },
+    {
+      "name": "Vincent Voyer",
+      "email": "vincent@zeroload.net"
+    },
+    {
+      "name": "Roman Shtylman",
+      "email": "shtylman@gmail.com"
+    }
   ],
-  "license": "MIT",
+  "description": "RFC4122 (v1, v4, and v5) UUIDs",
-  "bin": {
-    "uuid": "./bin/uuid"
-  },
   "devDependencies": {
     "@commitlint/cli": "~8.2.0",
     "@commitlint/config-conventional": "~8.2.0",
@@ -25,25 +75,29 @@
     "runmd": "1.2.1",
     "standard-version": "7.0.0"
   },
-  "scripts": {
+  "homepage": "https://github.com/uuidjs/uuid#readme",
-    "lint": "eslint .",
-    "test": "npm run lint && mocha test/test.js",
-    "md": "runmd --watch --output=README.md README_js.md",
-    "release": "standard-version",
-    "prepare": "runmd --output=README.md README_js.md"
-  },
-  "browser": {
-    "./lib/rng.js": "./lib/rng-browser.js",
-    "./lib/sha1.js": "./lib/sha1-browser.js",
-    "./lib/md5.js": "./lib/md5-browser.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/uuidjs/uuid.git"
-  },
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
-  }
+  },
-}
+  "keywords": [
+    "uuid",
+    "guid",
+    "rfc4122"
+  ],
+  "license": "MIT",
+  "name": "uuid",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/uuidjs/uuid.git"
+  },
+  "scripts": {
+    "lint": "eslint .",
+    "md": "runmd --watch --output=README.md README_js.md",
+    "prepare": "runmd --output=README.md README_js.md",
+    "release": "standard-version",
+    "test": "npm run lint && mocha test/test.js"
+  },
+  "version": "3.4.0"
+}

node_modules/@actions/tool-cache/package.json

@@ -1,16 +1,51 @@
 {
-  "name": "@actions/tool-cache",
+  "_args": [
-  "version": "1.5.5",
+    [
-  "description": "Actions tool-cache lib",
+      "@actions/tool-cache@1.5.5",
-  "keywords": [
+      "/home/marco/repos/github/codeql-action"
-    "github",
+    ]
-    "actions",
-    "exec"
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/master/packages/tool-cache",
+  "_from": "@actions/tool-cache@1.5.5",
-  "license": "MIT",
+  "_id": "@actions/tool-cache@1.5.5",
-  "main": "lib/tool-cache.js",
+  "_inBundle": false,
-  "types": "lib/tool-cache.d.ts",
+  "_integrity": "sha512-y/YO37BOaXzOEHpvoGZDLCwvg6XZWQ7Ala4Np4xzrKD1r48mff+K/GAmzXMejnApU7kgqC6lL/aCKTZDCrhdmw==",
+  "_location": "/@actions/tool-cache",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/tool-cache@1.5.5",
+    "name": "@actions/tool-cache",
+    "escapedName": "@actions%2ftool-cache",
+    "scope": "@actions",
+    "rawSpec": "1.5.5",
+    "saveSpec": null,
+    "fetchSpec": "1.5.5"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.5.5.tgz",
+  "_spec": "1.5.5",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "dependencies": {
+    "@actions/core": "^1.2.3",
+    "@actions/exec": "^1.0.0",
+    "@actions/http-client": "^1.0.8",
+    "@actions/io": "^1.0.1",
+    "semver": "^6.1.0",
+    "uuid": "^3.3.2"
+  },
+  "description": "Actions tool-cache lib",
+  "devDependencies": {
+    "@types/nock": "^10.0.3",
+    "@types/semver": "^6.0.0",
+    "@types/uuid": "^3.4.4",
+    "nock": "^10.0.6"
+  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -19,6 +54,15 @@
     "lib",
     "scripts"
   ],
+  "homepage": "https://github.com/actions/toolkit/tree/master/packages/tool-cache",
+  "keywords": [
+    "github",
+    "actions",
+    "exec"
+  ],
+  "license": "MIT",
+  "main": "lib/tool-cache.js",
+  "name": "@actions/tool-cache",
   "publishConfig": {
     "access": "public"
   },
@@ -32,21 +76,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "bugs": {
+  "types": "lib/tool-cache.d.ts",
-    "url": "https://github.com/actions/toolkit/issues"
+  "version": "1.5.5"
-  },
+}
-  "dependencies": {
-    "@actions/core": "^1.2.3",
-    "@actions/exec": "^1.0.0",
-    "@actions/http-client": "^1.0.8",
-    "@actions/io": "^1.0.1",
-    "semver": "^6.1.0",
-    "uuid": "^3.3.2"
-  },
-  "devDependencies": {
-    "@types/nock": "^10.0.3",
-    "@types/semver": "^6.0.0",
-    "@types/uuid": "^3.4.4",
-    "nock": "^10.0.6"
-  }
-}

node_modules/@ava/typescript/node_modules/escape-string-regexp/package.json

@@ -1,28 +1,55 @@
 {
-  "name": "escape-string-regexp",
+  "_args": [
-  "version": "2.0.0",
+    [
-  "description": "Escape RegExp special characters",
+      "escape-string-regexp@2.0.0",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "repository": "sindresorhus/escape-string-regexp",
+    ]
+  ],
+  "_development": true,
+  "_from": "escape-string-regexp@2.0.0",
+  "_id": "escape-string-regexp@2.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+  "_location": "/@ava/typescript/escape-string-regexp",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "escape-string-regexp@2.0.0",
+    "name": "escape-string-regexp",
+    "escapedName": "escape-string-regexp",
+    "rawSpec": "2.0.0",
+    "saveSpec": null,
+    "fetchSpec": "2.0.0"
+  },
+  "_requiredBy": [
+    "/@ava/typescript"
+  ],
+  "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+  "_spec": "2.0.0",
+  "_where": "/home/marco/repos/github/codeql-action",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com"
   },
-  "maintainers": [
+  "bugs": {
-    "Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
+    "url": "https://github.com/sindresorhus/escape-string-regexp/issues"
-    "Joshua Boy Nicolai Appelman <joshua@jbna.nl> (jbna.nl)"
+  },
-  ],
+  "description": "Escape RegExp special characters",
+  "devDependencies": {
+    "ava": "^1.4.1",
+    "tsd": "^0.7.2",
+    "xo": "^0.24.0"
+  },
   "engines": {
     "node": ">=8"
   },
-  "scripts": {
-    "test": "xo && ava && tsd"
-  },
   "files": [
     "index.js",
     "index.d.ts"
   ],
+  "homepage": "https://github.com/sindresorhus/escape-string-regexp#readme",
   "keywords": [
     "escape",
     "regex",
@@ -35,9 +62,26 @@
     "special",
     "characters"
   ],
-  "devDependencies": {
+  "license": "MIT",
-    "ava": "^1.4.1",
+  "maintainers": [
-    "tsd": "^0.7.2",
+    {
-    "xo": "^0.24.0"
+      "name": "Sindre Sorhus",
-  }
+      "email": "sindresorhus@gmail.com",
-}
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Boy Nicolai Appelman",
+      "email": "joshua@jbna.nl",
+      "url": "jbna.nl"
+    }
+  ],
+  "name": "escape-string-regexp",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/escape-string-regexp.git"
+  },
+  "scripts": {
+    "test": "xo && ava && tsd"
+  },
+  "version": "2.0.0"
+}

node_modules/@ava/typescript/package.json

@@ -1,32 +1,64 @@
 {
-  "name": "@ava/typescript",
+  "_args": [
-  "version": "1.1.1",
+    [
-  "description": "TypeScript provider for AVA",
+      "@ava/typescript@1.1.1",
-  "engines": {
+      "/home/marco/repos/github/codeql-action"
-    "node": ">=10.18.0 <11 || >=12.14.0 <13 || >=13.5.0"
+    ]
+  ],
+  "_development": true,
+  "_from": "@ava/typescript@1.1.1",
+  "_id": "@ava/typescript@1.1.1",
+  "_inBundle": false,
+  "_integrity": "sha512-KbLUAe2cWXK63WLK6LnOJonjwEDU/8MNXCOA1ooX/YFZgKRmeAD1kZu+2K0ks5fnOCEcckNQAooyBNGdZUmMQA==",
+  "_location": "/@ava/typescript",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@ava/typescript@1.1.1",
+    "name": "@ava/typescript",
+    "escapedName": "@ava%2ftypescript",
+    "scope": "@ava",
+    "rawSpec": "1.1.1",
+    "saveSpec": null,
+    "fetchSpec": "1.1.1"
   },
-  "files": [
+  "_requiredBy": [
-    "index.js"
+    "#DEV:/"
   ],
-  "author": "Mark Wubben (https://novemberborn.net)",
+  "_resolved": "https://registry.npmjs.org/@ava/typescript/-/typescript-1.1.1.tgz",
-  "repository": "avajs/typescript",
+  "_spec": "1.1.1",
-  "license": "MIT",
+  "_where": "/home/marco/repos/github/codeql-action",
-  "keywords": [
+  "author": {
-    "ava",
+    "name": "Mark Wubben",
-    "typescript"
+    "url": "https://novemberborn.net"
-  ],
+  },
-  "scripts": {
+  "bugs": {
-    "test": "xo && nyc ava"
+    "url": "https://github.com/avajs/typescript/issues"
   },
   "dependencies": {
     "escape-string-regexp": "^2.0.0"
   },
+  "description": "TypeScript provider for AVA",
   "devDependencies": {
     "ava": "^3.0.0",
     "execa": "^4.0.0",
     "nyc": "^15.0.0",
     "xo": "^0.25.3"
   },
+  "engines": {
+    "node": ">=10.18.0 <11 || >=12.14.0 <13 || >=13.5.0"
+  },
+  "files": [
+    "index.js"
+  ],
+  "homepage": "https://github.com/avajs/typescript#readme",
+  "keywords": [
+    "ava",
+    "typescript"
+  ],
+  "license": "MIT",
+  "name": "@ava/typescript",
   "nyc": {
     "reporter": [
       "html",
@@ -34,9 +66,17 @@
       "text"
     ]
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/avajs/typescript.git"
+  },
+  "scripts": {
+    "test": "xo && nyc ava"
+  },
+  "version": "1.1.1",
   "xo": {
     "rules": {
       "import/order": "off"
     }
   }
-}
+}

node_modules/@babel/code-frame/package.json

@@ -1,21 +1,58 @@
 {
-  "name": "@babel/code-frame",
+  "_args": [
-  "version": "7.5.5",
+    [
-  "description": "Generate errors that contain a code frame that point to source locations.",
+      "@babel/code-frame@7.5.5",
-  "author": "Sebastian McKenzie <sebmck@gmail.com>",
+      "/home/marco/repos/github/codeql-action"
-  "homepage": "https://babeljs.io/",
+    ]
-  "license": "MIT",
+  ],
-  "publishConfig": {
+  "_development": true,
-    "access": "public"
+  "_from": "@babel/code-frame@7.5.5",
+  "_id": "@babel/code-frame@7.5.5",
+  "_inBundle": false,
+  "_integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+  "_location": "/@babel/code-frame",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@babel/code-frame@7.5.5",
+    "name": "@babel/code-frame",
+    "escapedName": "@babel%2fcode-frame",
+    "scope": "@babel",
+    "rawSpec": "7.5.5",
+    "saveSpec": null,
+    "fetchSpec": "7.5.5"
+  },
+  "_requiredBy": [
+    "/eslint",
+    "/read-pkg/parse-json"
+  ],
+  "_resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+  "_spec": "7.5.5",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "Sebastian McKenzie",
+    "email": "sebmck@gmail.com"
   },
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-code-frame",
-  "main": "lib/index.js",
   "dependencies": {
     "@babel/highlight": "^7.0.0"
   },
+  "description": "Generate errors that contain a code frame that point to source locations.",
   "devDependencies": {
     "chalk": "^2.0.0",
     "strip-ansi": "^4.0.0"
   },
-  "gitHead": "0407f034f09381b95e9cabefbf6b176c76485a43"
+  "gitHead": "0407f034f09381b95e9cabefbf6b176c76485a43",
-}
+  "homepage": "https://babeljs.io/",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "name": "@babel/code-frame",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/babel/babel/tree/master/packages/babel-code-frame"
+  },
+  "version": "7.5.5"
+}

node_modules/@babel/highlight/package.json

@@ -1,22 +1,58 @@
 {
-  "name": "@babel/highlight",
+  "_args": [
-  "version": "7.5.0",
+    [
-  "description": "Syntax highlight JavaScript strings for output in terminals.",
+      "@babel/highlight@7.5.0",
-  "author": "suchipi <me@suchipi.com>",
+      "/home/marco/repos/github/codeql-action"
-  "homepage": "https://babeljs.io/",
+    ]
-  "license": "MIT",
+  ],
-  "publishConfig": {
+  "_development": true,
-    "access": "public"
+  "_from": "@babel/highlight@7.5.0",
+  "_id": "@babel/highlight@7.5.0",
+  "_inBundle": false,
+  "_integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+  "_location": "/@babel/highlight",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@babel/highlight@7.5.0",
+    "name": "@babel/highlight",
+    "escapedName": "@babel%2fhighlight",
+    "scope": "@babel",
+    "rawSpec": "7.5.0",
+    "saveSpec": null,
+    "fetchSpec": "7.5.0"
+  },
+  "_requiredBy": [
+    "/@babel/code-frame"
+  ],
+  "_resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+  "_spec": "7.5.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "suchipi",
+    "email": "me@suchipi.com"
   },
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-highlight",
-  "main": "lib/index.js",
   "dependencies": {
     "chalk": "^2.0.0",
     "esutils": "^2.0.2",
     "js-tokens": "^4.0.0"
   },
+  "description": "Syntax highlight JavaScript strings for output in terminals.",
   "devDependencies": {
     "strip-ansi": "^4.0.0"
   },
-  "gitHead": "49da9a07c81156e997e60146eb001ea77b7044c4"
+  "gitHead": "49da9a07c81156e997e60146eb001ea77b7044c4",
-}
+  "homepage": "https://babeljs.io/",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "name": "@babel/highlight",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/babel/babel/tree/master/packages/babel-highlight"
+  },
+  "version": "7.5.0"
+}

node_modules/@chrisgavin/safe-which/package.json

@@ -1,32 +1,61 @@
 {
-  "name": "@chrisgavin/safe-which",
+  "_args": [
-  "version": "1.0.2",
+    [
-  "description": "A NodeJS library to guard against Windows binary planting attacks.",
+      "@chrisgavin/safe-which@1.0.2",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "homepage": "https://github.com/chrisgavin/safe-which/",
+    ]
-  "publishConfig": {
+  ],
-    "access": "public"
+  "_from": "@chrisgavin/safe-which@1.0.2",
-  },
+  "_id": "@chrisgavin/safe-which@1.0.2",
-  "main": "./build/index.js",
+  "_inBundle": false,
-  "types": "./build/index.d.ts",
+  "_integrity": "sha512-xImXYK6iJvLEDMevGCs5s05iKoFn3ARFShBswRFeWeHp6P1Z0jlYmKcK5+M2TtDoWuz45ay1unmNvV/8t66F2g==",
-  "scripts": {
+  "_location": "/@chrisgavin/safe-which",
-    "build": "tsc",
+  "_phantomChildren": {},
-    "pretest": "npm install && npm run build",
+  "_requested": {
-    "test": "ava --verbose --serial ./src/**",
+    "type": "version",
-    "prepublishOnly": "npm install && npm run build && npm version --allow-same-version=true --git-tag-version=false ${GITHUB_REF#refs/tags/}"
+    "registry": true,
-  },
+    "raw": "@chrisgavin/safe-which@1.0.2",
-  "dependencies": {},
+    "name": "@chrisgavin/safe-which",
-  "devDependencies": {
+    "escapedName": "@chrisgavin%2fsafe-which",
-    "@ava/typescript": "^1.1.1",
+    "scope": "@chrisgavin",
-    "@types/node": "^14.14.7",
+    "rawSpec": "1.0.2",
-    "ava": "^3.13.0",
+    "saveSpec": null,
-    "typescript": "^3.8.3"
+    "fetchSpec": "1.0.2"
   },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@chrisgavin/safe-which/-/safe-which-1.0.2.tgz",
+  "_spec": "1.0.2",
+  "_where": "/home/marco/repos/github/codeql-action",
   "ava": {
     "typescript": {
       "rewritePaths": {
         "./src/": "./build/"
       }
     }
-  }
+  },
-}
+  "dependencies": {},
+  "description": "A NodeJS library to guard against Windows binary planting attacks.",
+  "devDependencies": {
+    "@ava/typescript": "^1.1.1",
+    "@types/node": "^14.14.7",
+    "ava": "^3.13.0",
+    "typescript": "^3.8.3"
+  },
+  "homepage": "https://github.com/chrisgavin/safe-which/",
+  "license": "MIT",
+  "main": "./build/index.js",
+  "name": "@chrisgavin/safe-which",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm install && npm run build && npm version --allow-same-version=true --git-tag-version=false ${GITHUB_REF#refs/tags/}",
+    "pretest": "npm install && npm run build",
+    "test": "ava --verbose --serial ./src/**"
+  },
+  "types": "./build/index.d.ts",
+  "version": "1.0.2"
+}

node_modules/@concordance/react/node_modules/arrify/package.json

@@ -1,23 +1,53 @@
 {
-  "name": "arrify",
+  "_args": [
-  "version": "1.0.1",
+    [
-  "description": "Convert a value to an array",
+      "arrify@1.0.1",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "repository": "sindresorhus/arrify",
+    ]
+  ],
+  "_development": true,
+  "_from": "arrify@1.0.1",
+  "_id": "arrify@1.0.1",
+  "_inBundle": false,
+  "_integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+  "_location": "/@concordance/react/arrify",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "arrify@1.0.1",
+    "name": "arrify",
+    "escapedName": "arrify",
+    "rawSpec": "1.0.1",
+    "saveSpec": null,
+    "fetchSpec": "1.0.1"
+  },
+  "_requiredBy": [
+    "/@concordance/react"
+  ],
+  "_resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+  "_spec": "1.0.1",
+  "_where": "/home/marco/repos/github/codeql-action",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/arrify/issues"
+  },
+  "description": "Convert a value to an array",
+  "devDependencies": {
+    "ava": "*",
+    "xo": "*"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "xo && ava"
-  },
   "files": [
     "index.js"
   ],
+  "homepage": "https://github.com/sindresorhus/arrify#readme",
   "keywords": [
     "array",
     "arr",
@@ -26,8 +56,14 @@
     "convert",
     "value"
   ],
-  "devDependencies": {
+  "license": "MIT",
-    "ava": "*",
+  "name": "arrify",
-    "xo": "*"
+  "repository": {
-  }
+    "type": "git",
-}
+    "url": "git+https://github.com/sindresorhus/arrify.git"
+  },
+  "scripts": {
+    "test": "xo && ava"
+  },
+  "version": "1.0.1"
+}

node_modules/@concordance/react/package.json

@@ -1,39 +1,63 @@
 {
-  "name": "@concordance/react",
+  "_args": [
-  "version": "2.0.0",
+    [
-  "description": "Compare, format, diff and serialize React trees with Concordance",
+      "@concordance/react@2.0.0",
-  "main": "index.js",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "lib",
-    "index.js"
   ],
-  "engines": {
+  "_development": true,
-    "node": ">=6.12.3 <7 || >=8.9.4 <9 || >=10.0.0"
+  "_from": "@concordance/react@2.0.0",
+  "_id": "@concordance/react@2.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-huLSkUuM2/P+U0uy2WwlKuixMsTODD8p4JVQBI4VKeopkiN0C7M3N9XYVawb4M+4spN5RrO/eLhk7KoQX6nsfA==",
+  "_location": "/@concordance/react",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@concordance/react@2.0.0",
+    "name": "@concordance/react",
+    "escapedName": "@concordance%2freact",
+    "scope": "@concordance",
+    "rawSpec": "2.0.0",
+    "saveSpec": null,
+    "fetchSpec": "2.0.0"
   },
-  "scripts": {
+  "_requiredBy": [
-    "build:fixtures": "babel --presets=module:@babel/preset-react,module:ava/stage-4 --out-dir=test/fixtures/react --extensions=.jsx test/fixtures/react",
+    "/ava"
-    "lint": "as-i-preach",
+  ],
-    "pretest": "npm run -s build:fixtures",
+  "_resolved": "https://registry.npmjs.org/@concordance/react/-/react-2.0.0.tgz",
-    "test": "npm run -s lint && nyc ava"
+  "_spec": "2.0.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "as-i-preach": {
+    "allowDevDependencies": [
+      "test/**/*.js",
+      "test/**/*.jsx"
+    ],
+    "ignore": [
+      "test/fixtures/react/*.js"
+    ]
   },
-  "repository": {
+  "author": {
-    "type": "git",
+    "name": "Mark Wubben",
-    "url": "git+https://github.com/concordancejs/react.git"
+    "url": "https://novemberborn.net/"
+  },
+  "ava": {
+    "babel": {
+      "testOptions": {
+        "presets": [
+          "module:@babel/preset-react"
+        ]
+      }
+    }
   },
-  "author": "Mark Wubben (https://novemberborn.net/)",
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/concordancejs/react/issues"
   },
-  "homepage": "https://github.com/concordancejs/react#readme",
-  "keywords": [
-    "concordance-plugin",
-    "concordance",
-    "react"
-  ],
   "dependencies": {
     "arrify": "^1.0.1"
   },
+  "description": "Compare, format, diff and serialize React trees with Concordance",
   "devDependencies": {
     "@babel/cli": "^7.1.0",
     "@babel/core": "^7.1.0",
@@ -46,24 +70,22 @@
     "react": "^16.5.2",
     "react-test-renderer": "^16.5.2"
   },
-  "as-i-preach": {
+  "engines": {
-    "allowDevDependencies": [
+    "node": ">=6.12.3 <7 || >=8.9.4 <9 || >=10.0.0"
-      "test/**/*.js",
-      "test/**/*.jsx"
-    ],
-    "ignore": [
-      "test/fixtures/react/*.js"
-    ]
-  },
-  "ava": {
-    "babel": {
-      "testOptions": {
-        "presets": [
-          "module:@babel/preset-react"
-        ]
-      }
-    }
   },
+  "files": [
+    "lib",
+    "index.js"
+  ],
+  "homepage": "https://github.com/concordancejs/react#readme",
+  "keywords": [
+    "concordance-plugin",
+    "concordance",
+    "react"
+  ],
+  "license": "ISC",
+  "main": "index.js",
+  "name": "@concordance/react",
   "nyc": {
     "reporter": [
       "html",
@@ -71,5 +93,16 @@
       "text"
     ]
   },
-  "standard-engine": "@novemberborn/as-i-preach"
+  "repository": {
-}
+    "type": "git",
+    "url": "git+https://github.com/concordancejs/react.git"
+  },
+  "scripts": {
+    "build:fixtures": "babel --presets=module:@babel/preset-react,module:ava/stage-4 --out-dir=test/fixtures/react --extensions=.jsx test/fixtures/react",
+    "lint": "as-i-preach",
+    "pretest": "npm run -s build:fixtures",
+    "test": "npm run -s lint && nyc ava"
+  },
+  "standard-engine": "@novemberborn/as-i-preach",
+  "version": "2.0.0"
+}

node_modules/@eslint/eslintrc/node_modules/ignore/package.json

@@ -1,48 +1,40 @@
 {
-  "name": "ignore",
+  "_args": [
-  "version": "4.0.6",
+    [
-  "description": "Ignore is a manager and filter for .gitignore rules.",
+      "ignore@4.0.6",
-  "files": [
+      "/home/marco/repos/github/codeql-action"
-    "legacy.js",
+    ]
-    "index.js",
-    "index.d.ts",
-    "LICENSE-MIT"
   ],
-  "scripts": {
+  "_development": true,
-    "prepublish": "npm run build",
+  "_from": "ignore@4.0.6",
-    "build": "babel -o legacy.js index.js",
+  "_id": "ignore@4.0.6",
-    "test:lint": "eslint .",
+  "_inBundle": false,
-    "test:tsc": "tsc ./test/ts/simple.ts",
+  "_integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-    "test:git": "tap test/git-check-ignore.js",
+  "_location": "/@eslint/eslintrc/ignore",
-    "test:ignore": "tap test/ignore.js --coverage",
+  "_phantomChildren": {},
-    "test-no-cov": "npm run test:lint && npm run test:tsc && tap test/*.js --coverage",
+  "_requested": {
-    "test": "npm run test-no-cov",
+    "type": "version",
-    "posttest": "tap --coverage-report=html && codecov"
+    "registry": true,
+    "raw": "ignore@4.0.6",
+    "name": "ignore",
+    "escapedName": "ignore",
+    "rawSpec": "4.0.6",
+    "saveSpec": null,
+    "fetchSpec": "4.0.6"
   },
-  "repository": {
+  "_requiredBy": [
-    "type": "git",
+    "/@eslint/eslintrc"
-    "url": "git@github.com:kaelzhang/node-ignore.git"
-  },
-  "keywords": [
-    "ignore",
-    ".gitignore",
-    "gitignore",
-    "npmignore",
-    "rules",
-    "manager",
-    "filter",
-    "regexp",
-    "regex",
-    "fnmatch",
-    "glob",
-    "asterisks",
-    "regular-expression"
   ],
-  "author": "kael",
+  "_resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-  "license": "MIT",
+  "_spec": "4.0.6",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "kael"
+  },
   "bugs": {
     "url": "https://github.com/kaelzhang/node-ignore/issues"
   },
+  "description": "Ignore is a manager and filter for .gitignore rules.",
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-preset-env": "^1.7.0",
@@ -60,5 +52,45 @@
   },
   "engines": {
     "node": ">= 4"
-  }
+  },
-}
+  "files": [
+    "legacy.js",
+    "index.js",
+    "index.d.ts",
+    "LICENSE-MIT"
+  ],
+  "homepage": "https://github.com/kaelzhang/node-ignore#readme",
+  "keywords": [
+    "ignore",
+    ".gitignore",
+    "gitignore",
+    "npmignore",
+    "rules",
+    "manager",
+    "filter",
+    "regexp",
+    "regex",
+    "fnmatch",
+    "glob",
+    "asterisks",
+    "regular-expression"
+  ],
+  "license": "MIT",
+  "name": "ignore",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/kaelzhang/node-ignore.git"
+  },
+  "scripts": {
+    "build": "babel -o legacy.js index.js",
+    "posttest": "tap --coverage-report=html && codecov",
+    "prepublish": "npm run build",
+    "test": "npm run test-no-cov",
+    "test-no-cov": "npm run test:lint && npm run test:tsc && tap test/*.js --coverage",
+    "test:git": "tap test/git-check-ignore.js",
+    "test:ignore": "tap test/ignore.js --coverage",
+    "test:lint": "eslint .",
+    "test:tsc": "tsc ./test/ts/simple.ts"
+  },
+  "version": "4.0.6"
+}

node_modules/@eslint/eslintrc/node_modules/strip-json-comments/package.json

@@ -1,26 +1,57 @@
 {
-  "name": "strip-json-comments",
+  "_args": [
-  "version": "3.1.1",
+    [
-  "description": "Strip comments from JSON. Lets you use comments in your JSON files!",
+      "strip-json-comments@3.1.1",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "repository": "sindresorhus/strip-json-comments",
+    ]
-  "funding": "https://github.com/sponsors/sindresorhus",
+  ],
+  "_development": true,
+  "_from": "strip-json-comments@3.1.1",
+  "_id": "strip-json-comments@3.1.1",
+  "_inBundle": false,
+  "_integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+  "_location": "/@eslint/eslintrc/strip-json-comments",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "strip-json-comments@3.1.1",
+    "name": "strip-json-comments",
+    "escapedName": "strip-json-comments",
+    "rawSpec": "3.1.1",
+    "saveSpec": null,
+    "fetchSpec": "3.1.1"
+  },
+  "_requiredBy": [
+    "/@eslint/eslintrc"
+  ],
+  "_resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+  "_spec": "3.1.1",
+  "_where": "/home/marco/repos/github/codeql-action",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "https://sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/strip-json-comments/issues"
+  },
+  "description": "Strip comments from JSON. Lets you use comments in your JSON files!",
+  "devDependencies": {
+    "ava": "^1.4.1",
+    "matcha": "^0.7.0",
+    "tsd": "^0.7.2",
+    "xo": "^0.24.0"
+  },
   "engines": {
     "node": ">=8"
   },
-  "scripts": {
-    "test": "xo && ava && tsd",
-    "bench": "matcha benchmark.js"
-  },
   "files": [
     "index.js",
     "index.d.ts"
   ],
+  "funding": "https://github.com/sponsors/sindresorhus",
+  "homepage": "https://github.com/sindresorhus/strip-json-comments#readme",
   "keywords": [
     "json",
     "strip",
@@ -38,10 +69,15 @@
     "environment",
     "jsonc"
   ],
-  "devDependencies": {
+  "license": "MIT",
-    "ava": "^1.4.1",
+  "name": "strip-json-comments",
-    "matcha": "^0.7.0",
+  "repository": {
-    "tsd": "^0.7.2",
+    "type": "git",
-    "xo": "^0.24.0"
+    "url": "git+https://github.com/sindresorhus/strip-json-comments.git"
-  }
+  },
-}
+  "scripts": {
+    "bench": "matcha benchmark.js",
+    "test": "xo && ava && tsd"
+  },
+  "version": "3.1.1"
+}

node_modules/@eslint/eslintrc/package.json

@@ -1,46 +1,40 @@
 {
-  "name": "@eslint/eslintrc",
+  "_args": [
-  "version": "0.1.3",
+    [
-  "description": "The legacy ESLintRC config file format for ESLint",
+      "@eslint/eslintrc@0.1.3",
-  "main": "lib/index.js",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "lib",
-    "conf",
-    "LICENSE"
   ],
-  "publishConfig": {
+  "_development": true,
-    "access": "public"
+  "_from": "@eslint/eslintrc@0.1.3",
+  "_id": "@eslint/eslintrc@0.1.3",
+  "_inBundle": false,
+  "_integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==",
+  "_location": "/@eslint/eslintrc",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@eslint/eslintrc@0.1.3",
+    "name": "@eslint/eslintrc",
+    "escapedName": "@eslint%2feslintrc",
+    "scope": "@eslint",
+    "rawSpec": "0.1.3",
+    "saveSpec": null,
+    "fetchSpec": "0.1.3"
   },
-  "scripts": {
+  "_requiredBy": [
-    "lint": "eslint .",
+    "/eslint"
-    "test": "mocha tests/lib/shared",
-    "generate-release": "eslint-generate-release",
-    "generate-alpharelease": "eslint-generate-prerelease alpha",
-    "generate-betarelease": "eslint-generate-prerelease beta",
-    "generate-rcrelease": "eslint-generate-prerelease rc",
-    "publish-release": "eslint-publish-release"
-  },
-  "repository": "eslint/eslintrc",
-  "keywords": [
-    "ESLint",
-    "ESLintRC",
-    "Configuration"
   ],
-  "author": "Nicholas C. Zakas",
+  "_resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz",
-  "license": "MIT",
+  "_spec": "0.1.3",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "Nicholas C. Zakas"
+  },
   "bugs": {
     "url": "https://github.com/eslint/eslintrc/issues"
   },
-  "homepage": "https://github.com/eslint/eslintrc#readme",
-  "devDependencies": {
-    "chai": "^4.2.0",
-    "eslint": "^7.7.0",
-    "eslint-config-eslint": "^6.0.0",
-    "eslint-plugin-jsdoc": "^22.1.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-release": "^3.1.2",
-    "mocha": "^8.1.1"
-  },
   "dependencies": {
     "ajv": "^6.12.4",
     "debug": "^4.1.1",
@@ -53,7 +47,48 @@
     "minimatch": "^3.0.4",
     "strip-json-comments": "^3.1.1"
   },
+  "description": "The legacy ESLintRC config file format for ESLint",
+  "devDependencies": {
+    "chai": "^4.2.0",
+    "eslint": "^7.7.0",
+    "eslint-config-eslint": "^6.0.0",
+    "eslint-plugin-jsdoc": "^22.1.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-release": "^3.1.2",
+    "mocha": "^8.1.1"
+  },
   "engines": {
     "node": "^10.12.0 || >=12.0.0"
-  }
+  },
-}
+  "files": [
+    "lib",
+    "conf",
+    "LICENSE"
+  ],
+  "homepage": "https://github.com/eslint/eslintrc#readme",
+  "keywords": [
+    "ESLint",
+    "ESLintRC",
+    "Configuration"
+  ],
+  "license": "MIT",
+  "main": "lib/index.js",
+  "name": "@eslint/eslintrc",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/eslint/eslintrc.git"
+  },
+  "scripts": {
+    "generate-alpharelease": "eslint-generate-prerelease alpha",
+    "generate-betarelease": "eslint-generate-prerelease beta",
+    "generate-rcrelease": "eslint-generate-prerelease rc",
+    "generate-release": "eslint-generate-release",
+    "lint": "eslint .",
+    "publish-release": "eslint-publish-release",
+    "test": "mocha tests/lib/shared"
+  },
+  "version": "0.1.3"
+}

node_modules/@nodelib/fs.scandir/package.json

@@ -1,9 +1,43 @@
 {
-  "name": "@nodelib/fs.scandir",
+  "_args": [
-  "version": "2.1.3",
+    [
+      "@nodelib/fs.scandir@2.1.3",
+      "/home/marco/repos/github/codeql-action"
+    ]
+  ],
+  "_development": true,
+  "_from": "@nodelib/fs.scandir@2.1.3",
+  "_id": "@nodelib/fs.scandir@2.1.3",
+  "_inBundle": false,
+  "_integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+  "_location": "/@nodelib/fs.scandir",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@nodelib/fs.scandir@2.1.3",
+    "name": "@nodelib/fs.scandir",
+    "escapedName": "@nodelib%2ffs.scandir",
+    "scope": "@nodelib",
+    "rawSpec": "2.1.3",
+    "saveSpec": null,
+    "fetchSpec": "2.1.3"
+  },
+  "_requiredBy": [
+    "/@nodelib/fs.walk"
+  ],
+  "_resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+  "_spec": "2.1.3",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "dependencies": {
+    "@nodelib/fs.stat": "2.0.3",
+    "run-parallel": "^1.1.9"
+  },
   "description": "List files and directories inside the specified directory",
-  "license": "MIT",
+  "engines": {
-  "repository": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir",
+    "node": ">= 8"
+  },
+  "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf",
   "keywords": [
     "NodeLib",
     "fs",
@@ -13,23 +47,22 @@
     "readdir",
     "dirent"
   ],
-  "engines": {
+  "license": "MIT",
-    "node": ">= 8"
-  },
   "main": "out/index.js",
-  "typings": "out/index.d.ts",
+  "name": "@nodelib/fs.scandir",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir"
+  },
   "scripts": {
+    "build": "npm run clean && npm run compile && npm run lint && npm test",
     "clean": "rimraf {tsconfig.tsbuildinfo,out}",
-    "lint": "eslint \"src/**/*.ts\" --cache",
     "compile": "tsc -b .",
     "compile:watch": "tsc -p . --watch --sourceMap",
+    "lint": "eslint \"src/**/*.ts\" --cache",
     "test": "mocha \"out/**/*.spec.js\" -s 0",
-    "build": "npm run clean && npm run compile && npm run lint && npm test",
     "watch": "npm run clean && npm run compile:watch"
   },
-  "dependencies": {
+  "typings": "out/index.d.ts",
-    "@nodelib/fs.stat": "2.0.3",
+  "version": "2.1.3"
-    "run-parallel": "^1.1.9"
+}
-  },
-  "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf"
-}

node_modules/@nodelib/fs.stat/package.json

@@ -1,9 +1,40 @@
 {
-  "name": "@nodelib/fs.stat",
+  "_args": [
-  "version": "2.0.3",
+    [
+      "@nodelib/fs.stat@2.0.3",
+      "/home/marco/repos/github/codeql-action"
+    ]
+  ],
+  "_development": true,
+  "_from": "@nodelib/fs.stat@2.0.3",
+  "_id": "@nodelib/fs.stat@2.0.3",
+  "_inBundle": false,
+  "_integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+  "_location": "/@nodelib/fs.stat",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@nodelib/fs.stat@2.0.3",
+    "name": "@nodelib/fs.stat",
+    "escapedName": "@nodelib%2ffs.stat",
+    "scope": "@nodelib",
+    "rawSpec": "2.0.3",
+    "saveSpec": null,
+    "fetchSpec": "2.0.3"
+  },
+  "_requiredBy": [
+    "/@nodelib/fs.scandir",
+    "/fast-glob"
+  ],
+  "_resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+  "_spec": "2.0.3",
+  "_where": "/home/marco/repos/github/codeql-action",
   "description": "Get the status of a file with some features",
-  "license": "MIT",
+  "engines": {
-  "repository": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat",
+    "node": ">= 8"
+  },
+  "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf",
   "keywords": [
     "NodeLib",
     "fs",
@@ -11,19 +42,22 @@
     "file system",
     "stat"
   ],
-  "engines": {
+  "license": "MIT",
-    "node": ">= 8"
-  },
   "main": "out/index.js",
-  "typings": "out/index.d.ts",
+  "name": "@nodelib/fs.stat",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat"
+  },
   "scripts": {
+    "build": "npm run clean && npm run compile && npm run lint && npm test",
     "clean": "rimraf {tsconfig.tsbuildinfo,out}",
-    "lint": "eslint \"src/**/*.ts\" --cache",
     "compile": "tsc -b .",
     "compile:watch": "tsc -p . --watch --sourceMap",
+    "lint": "eslint \"src/**/*.ts\" --cache",
     "test": "mocha \"out/**/*.spec.js\" -s 0",
-    "build": "npm run clean && npm run compile && npm run lint && npm test",
     "watch": "npm run clean && npm run compile:watch"
   },
-  "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf"
+  "typings": "out/index.d.ts",
-}
+  "version": "2.0.3"
+}

node_modules/@nodelib/fs.walk/package.json

@@ -1,9 +1,43 @@
 {
-  "name": "@nodelib/fs.walk",
+  "_args": [
-  "version": "1.2.4",
+    [
+      "@nodelib/fs.walk@1.2.4",
+      "/home/marco/repos/github/codeql-action"
+    ]
+  ],
+  "_development": true,
+  "_from": "@nodelib/fs.walk@1.2.4",
+  "_id": "@nodelib/fs.walk@1.2.4",
+  "_inBundle": false,
+  "_integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+  "_location": "/@nodelib/fs.walk",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@nodelib/fs.walk@1.2.4",
+    "name": "@nodelib/fs.walk",
+    "escapedName": "@nodelib%2ffs.walk",
+    "scope": "@nodelib",
+    "rawSpec": "1.2.4",
+    "saveSpec": null,
+    "fetchSpec": "1.2.4"
+  },
+  "_requiredBy": [
+    "/fast-glob"
+  ],
+  "_resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+  "_spec": "1.2.4",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "dependencies": {
+    "@nodelib/fs.scandir": "2.1.3",
+    "fastq": "^1.6.0"
+  },
   "description": "A library for efficiently walking a directory recursively",
-  "license": "MIT",
+  "engines": {
-  "repository": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk",
+    "node": ">= 8"
+  },
+  "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf",
   "keywords": [
     "NodeLib",
     "fs",
@@ -13,23 +47,22 @@
     "scanner",
     "crawler"
   ],
-  "engines": {
+  "license": "MIT",
-    "node": ">= 8"
-  },
   "main": "out/index.js",
-  "typings": "out/index.d.ts",
+  "name": "@nodelib/fs.walk",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk"
+  },
   "scripts": {
+    "build": "npm run clean && npm run compile && npm run lint && npm test",
     "clean": "rimraf {tsconfig.tsbuildinfo,out}",
-    "lint": "eslint \"src/**/*.ts\" --cache",
     "compile": "tsc -b .",
     "compile:watch": "tsc -p . --watch --sourceMap",
+    "lint": "eslint \"src/**/*.ts\" --cache",
     "test": "mocha \"out/**/*.spec.js\" -s 0",
-    "build": "npm run clean && npm run compile && npm run lint && npm test",
     "watch": "npm run clean && npm run compile:watch"
   },
-  "dependencies": {
+  "typings": "out/index.d.ts",
-    "@nodelib/fs.scandir": "2.1.3",
+  "version": "1.2.4"
-    "fastq": "^1.6.0"
+}
-  },
-  "gitHead": "3b1ef7554ad7c061b3580858101d483fba847abf"
-}

node_modules/@octokit/auth-token/package.json

@@ -1,28 +1,40 @@
 {
-  "name": "@octokit/auth-token",
+  "_args": [
-  "description": "GitHub API token authentication for browsers and Node.js",
+    [
-  "version": "2.4.2",
+      "@octokit/auth-token@2.4.2",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/auth-token@2.4.2",
-  "sideEffects": false,
+  "_id": "@octokit/auth-token@2.4.2",
-  "keywords": [
+  "_inBundle": false,
-    "github",
+  "_integrity": "sha512-jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==",
-    "octokit",
+  "_location": "/@octokit/auth-token",
-    "authentication",
+  "_phantomChildren": {},
-    "api"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/auth-token@2.4.2",
+    "name": "@octokit/auth-token",
+    "escapedName": "@octokit%2fauth-token",
+    "scope": "@octokit",
+    "rawSpec": "2.4.2",
+    "saveSpec": null,
+    "fetchSpec": "2.4.2"
+  },
+  "_requiredBy": [
+    "/@octokit/core"
   ],
-  "homepage": "https://github.com/octokit/auth-token.js#readme",
+  "_resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz",
+  "_spec": "2.4.2",
+  "_where": "/home/marco/repos/github/codeql-action",
   "bugs": {
     "url": "https://github.com/octokit/auth-token.js/issues"
   },
-  "repository": "https://github.com/octokit/auth-token.js",
   "dependencies": {
     "@octokit/types": "^5.0.0"
   },
+  "description": "GitHub API token authentication for browsers and Node.js",
   "devDependencies": {
     "@octokit/core": "^2.2.0",
     "@octokit/request": "^5.3.0",
@@ -38,11 +50,31 @@
     "ts-jest": "^25.1.0",
     "typescript": "^3.7.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/auth-token.js#readme",
+  "keywords": [
+    "github",
+    "octokit",
+    "authentication",
+    "api"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/auth-token",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/auth-token.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "2.4.2"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/core/package.json

@@ -1,22 +1,36 @@
 {
-  "name": "@octokit/core",
+  "_args": [
-  "description": "Extendable client for GitHub's REST & GraphQL APIs",
+    [
-  "version": "3.1.2",
+      "@octokit/core@3.1.2",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/core@3.1.2",
-  "sideEffects": false,
+  "_id": "@octokit/core@3.1.2",
-  "keywords": [
+  "_inBundle": false,
-    "octokit",
+  "_integrity": "sha512-AInOFULmwOa7+NFi9F8DlDkm5qtZVmDQayi7TUgChE3yeIGPq0Y+6cAEXPexQ3Ea+uZy66hKEazR7DJyU+4wfw==",
-    "github",
+  "_location": "/@octokit/core",
-    "api",
+  "_phantomChildren": {},
-    "sdk",
+  "_requested": {
-    "toolkit"
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/core@3.1.2",
+    "name": "@octokit/core",
+    "escapedName": "@octokit%2fcore",
+    "scope": "@octokit",
+    "rawSpec": "3.1.2",
+    "saveSpec": null,
+    "fetchSpec": "3.1.2"
+  },
+  "_requiredBy": [
+    "/@actions/github"
   ],
-  "repository": "https://github.com/octokit/core.js",
+  "_resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.1.2.tgz",
+  "_spec": "3.1.2",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/octokit/core.js/issues"
+  },
   "dependencies": {
     "@octokit/auth-token": "^2.4.0",
     "@octokit/graphql": "^4.3.1",
@@ -25,6 +39,7 @@
     "before-after-hook": "^2.1.0",
     "universal-user-agent": "^6.0.0"
   },
+  "description": "Extendable client for GitHub's REST & GraphQL APIs",
   "devDependencies": {
     "@octokit/auth": "^2.0.0",
     "@pika/pack": "^0.5.0",
@@ -47,11 +62,32 @@
     "ts-jest": "^26.1.3",
     "typescript": "^3.5.3"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/core.js#readme",
+  "keywords": [
+    "octokit",
+    "github",
+    "api",
+    "sdk",
+    "toolkit"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/core",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/core.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "3.1.2"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/endpoint/node_modules/is-plain-object/package.json

@@ -1,45 +1,61 @@
 {
-  "name": "is-plain-object",
+  "_args": [
-  "description": "Returns true if an object was created by the `Object` constructor, or Object.create(null).",
+    [
-  "version": "5.0.0",
+      "is-plain-object@5.0.0",
-  "homepage": "https://github.com/jonschlinkert/is-plain-object",
+      "/home/marco/repos/github/codeql-action"
-  "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
+    ]
-  "contributors": [
-    "Jon Schlinkert (http://twitter.com/jonschlinkert)",
-    "Osman Nuri Okumuş (http://onokumus.com)",
-    "Steven Vachon (https://svachon.com)",
-    "(https://github.com/wtgtybhertgeghgtwtg)",
-    "Bogdan Chadkin (https://github.com/TrySound)"
   ],
-  "repository": "jonschlinkert/is-plain-object",
+  "_from": "is-plain-object@5.0.0",
+  "_id": "is-plain-object@5.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+  "_location": "/@octokit/endpoint/is-plain-object",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "is-plain-object@5.0.0",
+    "name": "is-plain-object",
+    "escapedName": "is-plain-object",
+    "rawSpec": "5.0.0",
+    "saveSpec": null,
+    "fetchSpec": "5.0.0"
+  },
+  "_requiredBy": [
+    "/@octokit/endpoint"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+  "_spec": "5.0.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "Jon Schlinkert",
+    "url": "https://github.com/jonschlinkert"
+  },
   "bugs": {
     "url": "https://github.com/jonschlinkert/is-plain-object/issues"
   },
-  "license": "MIT",
+  "contributors": [
-  "main": "dist/is-plain-object.js",
+    {
-  "module": "dist/is-plain-object.mjs",
+      "name": "Jon Schlinkert",
-  "types": "is-plain-object.d.ts",
+      "url": "http://twitter.com/jonschlinkert"
-  "files": [
-    "is-plain-object.d.ts",
-    "dist"
-  ],
-  "exports": {
-    ".": {
-      "import": "./dist/is-plain-object.mjs",
-      "require": "./dist/is-plain-object.js"
     },
-    "./package.json": "./package.json"
+    {
-  },
+      "name": "Osman Nuri Okumuş",
-  "engines": {
+      "url": "http://onokumus.com"
-    "node": ">=0.10.0"
+    },
-  },
+    {
-  "scripts": {
+      "name": "Steven Vachon",
-    "build": "rollup -c",
+      "url": "https://svachon.com"
-    "test_browser": "mocha-headless-chrome --args=disable-web-security -f test/browser.html",
+    },
-    "test_node": "mocha -r esm",
+    {
-    "test": "npm run test_node && npm run build && npm run test_browser",
+      "url": "https://github.com/wtgtybhertgeghgtwtg"
-    "prepare": "rollup -c"
+    },
-  },
+    {
+      "name": "Bogdan Chadkin",
+      "url": "https://github.com/TrySound"
+    }
+  ],
+  "description": "Returns true if an object was created by the `Object` constructor, or Object.create(null).",
   "devDependencies": {
     "chai": "^4.2.0",
     "esm": "^3.2.22",
@@ -48,6 +64,21 @@
     "mocha-headless-chrome": "^3.1.0",
     "rollup": "^2.22.1"
   },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/is-plain-object.mjs",
+      "require": "./dist/is-plain-object.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "is-plain-object.d.ts",
+    "dist"
+  ],
+  "homepage": "https://github.com/jonschlinkert/is-plain-object",
   "keywords": [
     "check",
     "is",
@@ -62,6 +93,22 @@
     "typeof",
     "value"
   ],
+  "license": "MIT",
+  "main": "dist/is-plain-object.js",
+  "module": "dist/is-plain-object.mjs",
+  "name": "is-plain-object",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jonschlinkert/is-plain-object.git"
+  },
+  "scripts": {
+    "build": "rollup -c",
+    "prepare": "rollup -c",
+    "test": "npm run test_node && npm run build && npm run test_browser",
+    "test_browser": "mocha-headless-chrome --args=disable-web-security -f test/browser.html",
+    "test_node": "mocha -r esm"
+  },
+  "types": "is-plain-object.d.ts",
   "verb": {
     "toc": false,
     "layout": "default",
@@ -81,5 +128,6 @@
     "lint": {
       "reflinks": true
     }
-  }
+  },
-}
+  "version": "5.0.0"
+}

node_modules/@octokit/endpoint/package.json

@@ -1,33 +1,42 @@
 {
-  "name": "@octokit/endpoint",
+  "_args": [
-  "description": "Turns REST API endpoints into generic request options",
+    [
-  "version": "6.0.6",
+      "@octokit/endpoint@6.0.6",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/endpoint@6.0.6",
-  "sideEffects": false,
+  "_id": "@octokit/endpoint@6.0.6",
-  "keywords": [
+  "_inBundle": false,
-    "octokit",
+  "_integrity": "sha512-7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ==",
-    "github",
+  "_location": "/@octokit/endpoint",
-    "api",
+  "_phantomChildren": {},
-    "rest"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/endpoint@6.0.6",
+    "name": "@octokit/endpoint",
+    "escapedName": "@octokit%2fendpoint",
+    "scope": "@octokit",
+    "rawSpec": "6.0.6",
+    "saveSpec": null,
+    "fetchSpec": "6.0.6"
+  },
+  "_requiredBy": [
+    "/@octokit/request"
   ],
-  "homepage": "https://github.com/octokit/endpoint.js#readme",
+  "_resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.6.tgz",
+  "_spec": "6.0.6",
+  "_where": "/home/marco/repos/github/codeql-action",
   "bugs": {
     "url": "https://github.com/octokit/endpoint.js/issues"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/octokit/endpoint.js.git"
-  },
   "dependencies": {
     "@octokit/types": "^5.0.0",
     "is-plain-object": "^5.0.0",
     "universal-user-agent": "^6.0.0"
   },
+  "description": "Turns REST API endpoints into generic request options",
   "devDependencies": {
     "@pika/pack": "^0.5.0",
     "@pika/plugin-build-node": "^0.9.0",
@@ -41,11 +50,31 @@
     "ts-jest": "^26.0.0",
     "typescript": "^4.0.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/endpoint.js#readme",
+  "keywords": [
+    "octokit",
+    "github",
+    "api",
+    "rest"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/endpoint",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/endpoint.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "6.0.6"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/graphql/package.json

@@ -1,33 +1,42 @@
 {
-  "name": "@octokit/graphql",
+  "_args": [
-  "description": "GitHub GraphQL API client for browsers and Node",
+    [
-  "version": "4.5.6",
+      "@octokit/graphql@4.5.6",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/graphql@4.5.6",
-  "sideEffects": false,
+  "_id": "@octokit/graphql@4.5.6",
-  "keywords": [
+  "_inBundle": false,
-    "octokit",
+  "_integrity": "sha512-Rry+unqKTa3svswT2ZAuqenpLrzJd+JTv89LTeVa5UM/5OX8o4KTkPL7/1ABq4f/ZkELb0XEK/2IEoYwykcLXg==",
-    "github",
+  "_location": "/@octokit/graphql",
-    "api",
+  "_phantomChildren": {},
-    "graphql"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/graphql@4.5.6",
+    "name": "@octokit/graphql",
+    "escapedName": "@octokit%2fgraphql",
+    "scope": "@octokit",
+    "rawSpec": "4.5.6",
+    "saveSpec": null,
+    "fetchSpec": "4.5.6"
+  },
+  "_requiredBy": [
+    "/@octokit/core"
   ],
-  "homepage": "https://github.com/octokit/graphql.js#readme",
+  "_resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.6.tgz",
+  "_spec": "4.5.6",
+  "_where": "/home/marco/repos/github/codeql-action",
   "bugs": {
     "url": "https://github.com/octokit/graphql.js/issues"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/octokit/graphql.js.git"
-  },
   "dependencies": {
     "@octokit/request": "^5.3.0",
     "@octokit/types": "^5.0.0",
     "universal-user-agent": "^6.0.0"
   },
+  "description": "GitHub GraphQL API client for browsers and Node",
   "devDependencies": {
     "@pika/pack": "^0.5.0",
     "@pika/plugin-build-node": "^0.9.0",
@@ -44,11 +53,31 @@
     "ts-jest": "^25.1.0",
     "typescript": "^3.4.5"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/graphql.js#readme",
+  "keywords": [
+    "octokit",
+    "github",
+    "api",
+    "graphql"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/graphql",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/graphql.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "4.5.6"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/plugin-paginate-rest/package.json

@@ -1,27 +1,40 @@
 {
-  "name": "@octokit/plugin-paginate-rest",
+  "_args": [
-  "description": "Octokit plugin to paginate REST API endpoint responses",
+    [
-  "version": "2.4.0",
+      "@octokit/plugin-paginate-rest@2.4.0",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/plugin-paginate-rest@2.4.0",
-  "sideEffects": false,
+  "_id": "@octokit/plugin-paginate-rest@2.4.0",
-  "keywords": [
+  "_inBundle": false,
-    "github",
+  "_integrity": "sha512-YT6Klz3LLH6/nNgi0pheJnUmTFW4kVnxGft+v8Itc41IIcjl7y1C8TatmKQBbCSuTSNFXO5pCENnqg6sjwpJhg==",
-    "api",
+  "_location": "/@octokit/plugin-paginate-rest",
-    "sdk",
+  "_phantomChildren": {},
-    "toolkit"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/plugin-paginate-rest@2.4.0",
+    "name": "@octokit/plugin-paginate-rest",
+    "escapedName": "@octokit%2fplugin-paginate-rest",
+    "scope": "@octokit",
+    "rawSpec": "2.4.0",
+    "saveSpec": null,
+    "fetchSpec": "2.4.0"
+  },
+  "_requiredBy": [
+    "/@actions/github"
   ],
-  "repository": "https://github.com/octokit/plugin-paginate-rest.js",
+  "_resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.4.0.tgz",
+  "_spec": "2.4.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/octokit/plugin-paginate-rest.js/issues"
+  },
   "dependencies": {
     "@octokit/types": "^5.5.0"
   },
-  "peerDependencies": {
+  "description": "Octokit plugin to paginate REST API endpoint responses",
-    "@octokit/core": ">=2"
-  },
   "devDependencies": {
     "@octokit/core": "^3.0.0",
     "@octokit/plugin-rest-endpoint-methods": "^4.0.0",
@@ -41,11 +54,34 @@
     "ts-jest": "^26.0.0",
     "typescript": "^4.0.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/plugin-paginate-rest.js#readme",
+  "keywords": [
+    "github",
+    "api",
+    "sdk",
+    "toolkit"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/plugin-paginate-rest",
+  "peerDependencies": {
+    "@octokit/core": ">=2"
+  },
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/plugin-paginate-rest.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "2.4.0"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/plugin-rest-endpoint-methods/package.json

@@ -1,25 +1,41 @@
 {
-  "name": "@octokit/plugin-rest-endpoint-methods",
+  "_args": [
-  "description": "Octokit plugin adding one method for all of api.github.com REST API endpoints",
+    [
-  "version": "4.2.0",
+      "@octokit/plugin-rest-endpoint-methods@4.2.0",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/plugin-rest-endpoint-methods@4.2.0",
-  "sideEffects": false,
+  "_id": "@octokit/plugin-rest-endpoint-methods@4.2.0",
-  "keywords": [
+  "_inBundle": false,
-    "github",
+  "_integrity": "sha512-1/qn1q1C1hGz6W/iEDm9DoyNoG/xdFDt78E3eZ5hHeUfJTLJgyAMdj9chL/cNBHjcjd+FH5aO1x0VCqR2RE0mw==",
-    "api",
+  "_location": "/@octokit/plugin-rest-endpoint-methods",
-    "sdk",
+  "_phantomChildren": {},
-    "toolkit"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/plugin-rest-endpoint-methods@4.2.0",
+    "name": "@octokit/plugin-rest-endpoint-methods",
+    "escapedName": "@octokit%2fplugin-rest-endpoint-methods",
+    "scope": "@octokit",
+    "rawSpec": "4.2.0",
+    "saveSpec": null,
+    "fetchSpec": "4.2.0"
+  },
+  "_requiredBy": [
+    "/@actions/github"
   ],
-  "repository": "https://github.com/octokit/plugin-rest-endpoint-methods.js",
+  "_resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.0.tgz",
+  "_spec": "4.2.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/octokit/plugin-rest-endpoint-methods.js/issues"
+  },
   "dependencies": {
     "@octokit/types": "^5.5.0",
     "deprecation": "^2.3.1"
   },
+  "description": "Octokit plugin adding one method for all of api.github.com REST API endpoints",
   "devDependencies": {
     "@gimenete/type-writer": "^0.1.5",
     "@octokit/core": "^3.0.0",
@@ -47,11 +63,31 @@
     "ts-jest": "^26.1.3",
     "typescript": "^4.0.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/plugin-rest-endpoint-methods.js#readme",
+  "keywords": [
+    "github",
+    "api",
+    "sdk",
+    "toolkit"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/plugin-rest-endpoint-methods",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/plugin-rest-endpoint-methods.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "4.2.0"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/plugin-retry/package.json

@@ -1,26 +1,41 @@
 {
-  "name": "@octokit/plugin-retry",
+  "_args": [
-  "description": "Automatic retry plugin for octokit",
+    [
-  "version": "3.0.3",
+      "@octokit/plugin-retry@3.0.3",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/plugin-retry@3.0.3",
-  "sideEffects": false,
+  "_id": "@octokit/plugin-retry@3.0.3",
-  "homepage": "https://github.com/octokit/plugin-retry.js#readme",
+  "_inBundle": false,
+  "_integrity": "sha512-RFvcBg4JGyfWTWE35EIF7jf/eglIk5MuvfygzdIMLIVK3/4Ywz3X1x9Ri75nlyAmk53EpVWB4DwM/xEB1NXxXA==",
+  "_location": "/@octokit/plugin-retry",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/plugin-retry@3.0.3",
+    "name": "@octokit/plugin-retry",
+    "escapedName": "@octokit%2fplugin-retry",
+    "scope": "@octokit",
+    "rawSpec": "3.0.3",
+    "saveSpec": null,
+    "fetchSpec": "3.0.3"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-3.0.3.tgz",
+  "_spec": "3.0.3",
+  "_where": "/home/marco/repos/github/codeql-action",
   "bugs": {
     "url": "https://github.com/octokit/plugin-retry.js/issues"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/octokit/plugin-retry.js.git"
-  },
   "dependencies": {
     "@octokit/types": "^5.0.0",
     "bottleneck": "^2.15.3"
   },
+  "description": "Automatic retry plugin for octokit",
   "devDependencies": {
     "@octokit/core": "^2.0.0",
     "@octokit/request-error": "^2.0.0",
@@ -39,11 +54,25 @@
     "ts-jest": "^26.0.0",
     "typescript": "^3.7.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/plugin-retry.js#readme",
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/plugin-retry",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/plugin-retry.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "3.0.3"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/request-error/package.json

@@ -1,33 +1,42 @@
 {
-  "name": "@octokit/request-error",
+  "_args": [
-  "description": "Error class for Octokit request errors",
+    [
-  "version": "2.0.2",
+      "@octokit/request-error@2.0.2",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/request-error@2.0.2",
-  "sideEffects": false,
+  "_id": "@octokit/request-error@2.0.2",
-  "keywords": [
+  "_inBundle": false,
-    "octokit",
+  "_integrity": "sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==",
-    "github",
+  "_location": "/@octokit/request-error",
-    "api",
+  "_phantomChildren": {},
-    "error"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/request-error@2.0.2",
+    "name": "@octokit/request-error",
+    "escapedName": "@octokit%2frequest-error",
+    "scope": "@octokit",
+    "rawSpec": "2.0.2",
+    "saveSpec": null,
+    "fetchSpec": "2.0.2"
+  },
+  "_requiredBy": [
+    "/@octokit/request"
   ],
-  "homepage": "https://github.com/octokit/request-error.js#readme",
+  "_resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz",
+  "_spec": "2.0.2",
+  "_where": "/home/marco/repos/github/codeql-action",
   "bugs": {
     "url": "https://github.com/octokit/request-error.js/issues"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/octokit/request-error.js.git"
-  },
   "dependencies": {
     "@octokit/types": "^5.0.1",
     "deprecation": "^2.0.0",
     "once": "^1.4.0"
   },
+  "description": "Error class for Octokit request errors",
   "devDependencies": {
     "@pika/pack": "^0.5.0",
     "@pika/plugin-build-node": "^0.9.0",
@@ -44,11 +53,31 @@
     "ts-jest": "^25.1.0",
     "typescript": "^3.4.5"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/request-error.js#readme",
+  "keywords": [
+    "octokit",
+    "github",
+    "api",
+    "error"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/request-error",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/request-error.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "2.0.2"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/request/node_modules/is-plain-object/package.json

@@ -1,45 +1,61 @@
 {
-  "name": "is-plain-object",
+  "_args": [
-  "description": "Returns true if an object was created by the `Object` constructor, or Object.create(null).",
+    [
-  "version": "5.0.0",
+      "is-plain-object@5.0.0",
-  "homepage": "https://github.com/jonschlinkert/is-plain-object",
+      "/home/marco/repos/github/codeql-action"
-  "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
+    ]
-  "contributors": [
-    "Jon Schlinkert (http://twitter.com/jonschlinkert)",
-    "Osman Nuri Okumuş (http://onokumus.com)",
-    "Steven Vachon (https://svachon.com)",
-    "(https://github.com/wtgtybhertgeghgtwtg)",
-    "Bogdan Chadkin (https://github.com/TrySound)"
   ],
-  "repository": "jonschlinkert/is-plain-object",
+  "_from": "is-plain-object@5.0.0",
+  "_id": "is-plain-object@5.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+  "_location": "/@octokit/request/is-plain-object",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "is-plain-object@5.0.0",
+    "name": "is-plain-object",
+    "escapedName": "is-plain-object",
+    "rawSpec": "5.0.0",
+    "saveSpec": null,
+    "fetchSpec": "5.0.0"
+  },
+  "_requiredBy": [
+    "/@octokit/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+  "_spec": "5.0.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "author": {
+    "name": "Jon Schlinkert",
+    "url": "https://github.com/jonschlinkert"
+  },
   "bugs": {
     "url": "https://github.com/jonschlinkert/is-plain-object/issues"
   },
-  "license": "MIT",
+  "contributors": [
-  "main": "dist/is-plain-object.js",
+    {
-  "module": "dist/is-plain-object.mjs",
+      "name": "Jon Schlinkert",
-  "types": "is-plain-object.d.ts",
+      "url": "http://twitter.com/jonschlinkert"
-  "files": [
-    "is-plain-object.d.ts",
-    "dist"
-  ],
-  "exports": {
-    ".": {
-      "import": "./dist/is-plain-object.mjs",
-      "require": "./dist/is-plain-object.js"
     },
-    "./package.json": "./package.json"
+    {
-  },
+      "name": "Osman Nuri Okumuş",
-  "engines": {
+      "url": "http://onokumus.com"
-    "node": ">=0.10.0"
+    },
-  },
+    {
-  "scripts": {
+      "name": "Steven Vachon",
-    "build": "rollup -c",
+      "url": "https://svachon.com"
-    "test_browser": "mocha-headless-chrome --args=disable-web-security -f test/browser.html",
+    },
-    "test_node": "mocha -r esm",
+    {
-    "test": "npm run test_node && npm run build && npm run test_browser",
+      "url": "https://github.com/wtgtybhertgeghgtwtg"
-    "prepare": "rollup -c"
+    },
-  },
+    {
+      "name": "Bogdan Chadkin",
+      "url": "https://github.com/TrySound"
+    }
+  ],
+  "description": "Returns true if an object was created by the `Object` constructor, or Object.create(null).",
   "devDependencies": {
     "chai": "^4.2.0",
     "esm": "^3.2.22",
@@ -48,6 +64,21 @@
     "mocha-headless-chrome": "^3.1.0",
     "rollup": "^2.22.1"
   },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/is-plain-object.mjs",
+      "require": "./dist/is-plain-object.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "is-plain-object.d.ts",
+    "dist"
+  ],
+  "homepage": "https://github.com/jonschlinkert/is-plain-object",
   "keywords": [
     "check",
     "is",
@@ -62,6 +93,22 @@
     "typeof",
     "value"
   ],
+  "license": "MIT",
+  "main": "dist/is-plain-object.js",
+  "module": "dist/is-plain-object.mjs",
+  "name": "is-plain-object",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jonschlinkert/is-plain-object.git"
+  },
+  "scripts": {
+    "build": "rollup -c",
+    "prepare": "rollup -c",
+    "test": "npm run test_node && npm run build && npm run test_browser",
+    "test_browser": "mocha-headless-chrome --args=disable-web-security -f test/browser.html",
+    "test_node": "mocha -r esm"
+  },
+  "types": "is-plain-object.d.ts",
   "verb": {
     "toc": false,
     "layout": "default",
@@ -81,5 +128,6 @@
     "lint": {
       "reflinks": true
     }
-  }
+  },
-}
+  "version": "5.0.0"
+}

node_modules/@octokit/request/package.json

@@ -1,28 +1,37 @@
 {
-  "name": "@octokit/request",
+  "_args": [
-  "description": "Send parameterized requests to GitHub’s APIs with sensible defaults in browsers and Node",
+    [
-  "version": "5.4.9",
+      "@octokit/request@5.4.9",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/request@5.4.9",
-  "sideEffects": false,
+  "_id": "@octokit/request@5.4.9",
-  "keywords": [
+  "_inBundle": false,
-    "octokit",
+  "_integrity": "sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==",
-    "github",
+  "_location": "/@octokit/request",
-    "api",
+  "_phantomChildren": {},
-    "request"
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/request@5.4.9",
+    "name": "@octokit/request",
+    "escapedName": "@octokit%2frequest",
+    "scope": "@octokit",
+    "rawSpec": "5.4.9",
+    "saveSpec": null,
+    "fetchSpec": "5.4.9"
+  },
+  "_requiredBy": [
+    "/@octokit/core",
+    "/@octokit/graphql"
   ],
-  "homepage": "https://github.com/octokit/request.js#readme",
+  "_resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.9.tgz",
+  "_spec": "5.4.9",
+  "_where": "/home/marco/repos/github/codeql-action",
   "bugs": {
     "url": "https://github.com/octokit/request.js/issues"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/octokit/request.js.git"
-  },
   "dependencies": {
     "@octokit/endpoint": "^6.0.1",
     "@octokit/request-error": "^2.0.0",
@@ -33,6 +42,7 @@
     "once": "^1.4.0",
     "universal-user-agent": "^6.0.0"
   },
+  "description": "Send parameterized requests to GitHub’s APIs with sensible defaults in browsers and Node",
   "devDependencies": {
     "@octokit/auth-app": "^2.1.2",
     "@pika/pack": "^0.5.0",
@@ -54,11 +64,31 @@
     "ts-jest": "^26.1.0",
     "typescript": "^4.0.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/request.js#readme",
+  "keywords": [
+    "octokit",
+    "github",
+    "api",
+    "request"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/request",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/request.js.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "5.4.9"
-  "module": "dist-web/index.js"
+}
-}

node_modules/@octokit/types/package.json

@@ -1,25 +1,49 @@
 {
-  "name": "@octokit/types",
+  "_args": [
-  "description": "Shared TypeScript definitions for Octokit projects",
+    [
-  "version": "5.5.0",
+      "@octokit/types@5.5.0",
-  "license": "MIT",
+      "/home/marco/repos/github/codeql-action"
-  "files": [
+    ]
-    "dist-*/",
-    "bin/"
   ],
-  "pika": true,
+  "_from": "@octokit/types@5.5.0",
-  "sideEffects": false,
+  "_id": "@octokit/types@5.5.0",
-  "keywords": [
+  "_inBundle": false,
-    "github",
+  "_integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
-    "api",
+  "_location": "/@octokit/types",
-    "sdk",
+  "_phantomChildren": {},
-    "toolkit",
+  "_requested": {
-    "typescript"
+    "type": "version",
+    "registry": true,
+    "raw": "@octokit/types@5.5.0",
+    "name": "@octokit/types",
+    "escapedName": "@octokit%2ftypes",
+    "scope": "@octokit",
+    "rawSpec": "5.5.0",
+    "saveSpec": null,
+    "fetchSpec": "5.5.0"
+  },
+  "_requiredBy": [
+    "/",
+    "/@octokit/auth-token",
+    "/@octokit/core",
+    "/@octokit/endpoint",
+    "/@octokit/graphql",
+    "/@octokit/plugin-paginate-rest",
+    "/@octokit/plugin-rest-endpoint-methods",
+    "/@octokit/plugin-retry",
+    "/@octokit/request",
+    "/@octokit/request-error"
   ],
-  "repository": "https://github.com/octokit/types.ts",
+  "_resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
+  "_spec": "5.5.0",
+  "_where": "/home/marco/repos/github/codeql-action",
+  "bugs": {
+    "url": "https://github.com/octokit/types.ts/issues"
+  },
   "dependencies": {
     "@types/node": ">= 8"
   },
+  "description": "Shared TypeScript definitions for Octokit projects",
   "devDependencies": {
     "@octokit/graphql": "^4.2.2",
     "@pika/pack": "^0.5.0",
@@ -39,11 +63,32 @@
     "typedoc": "^0.19.0",
     "typescript": "^4.0.2"
   },
+  "files": [
+    "dist-*/",
+    "bin/"
+  ],
+  "homepage": "https://github.com/octokit/types.ts#readme",
+  "keywords": [
+    "github",
+    "api",
+    "sdk",
+    "toolkit",
+    "typescript"
+  ],
+  "license": "MIT",
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
+  "name": "@octokit/types",
+  "pika": true,
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/octokit/types.ts.git"
+  },
+  "sideEffects": false,
   "source": "dist-src/index.js",
   "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
+  "version": "5.5.0"
-  "module": "dist-web/index.js"
+}
-}