codeql-go merge prep: integrate go/ into codeql

.codeqlmanifest.json

@@ -6,6 +6,8 @@
         "*/ql/examples/qlpack.yml",
         "*/ql/consistency-queries/qlpack.yml",
         "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml",
+        "go/ql/config/legacy-support/qlpack.yml",
+        "go/build/codeql-extractor-go/codeql-extractor.yml",
         "javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml",
         "javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/qlpack.yml",
         "javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml",

.gitattributes

@@ -39,6 +39,7 @@
 *.py text
 *.lua text
 *.expected text
+*.go text
 
 # Explicitly set a bunch of known extensions to binary, because Git < 2.10 will treat
 # `* text=auto eol=lf` as `* text eol=lf`
@@ -52,6 +53,14 @@
 java/ql/test/stubs/**/*.java linguist-generated=true
 java/ql/test/experimental/stubs/**/*.java linguist-generated=true
 
+# Force git not to modify line endings for go or html files under the go/ql directory
+go/ql/**/*.go -text
+go/ql/**/*.html -text
+# Force git not to modify line endings for go dbschemes
+go/*.dbscheme -text
+# Preserve unusual line ending from codeql-go merge
+go/extractor/opencsv/CSVReader.java -text
+
 # For some languages, upgrade script testing references really old dbscheme
 # files from legacy upgrades that have CRLF line endings. Since upgrade
 # resolution relies on object hashes, we must suppress line ending conversion

.github/workflows/go-tests.yml

@@ -1,4 +1,4 @@
-name: CodeQL tests
+name: "Go: Run Tests"
 on: [pull_request]
 jobs:
 
@@ -38,22 +38,30 @@ jobs:
       run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
 
     - name: Build
-      run: env PATH=$PATH:$HOME/codeql make
+      run: |
+        cd go
+        env PATH=$PATH:$HOME/codeql make
 
     - name: Check that all QL and Go code is autoformatted
-      run: env PATH=$PATH:$HOME/codeql make check-formatting
+      run: |
+        cd go
+        env PATH=$PATH:$HOME/codeql make check-formatting
 
     - name: Compile qhelp files to markdown
-      run: env PATH=$PATH:$HOME/codeql QHELP_OUT_DIR=qhelp-out make qhelp-to-markdown
+      run: |
+        cd go
+        env PATH=$PATH:$HOME/codeql QHELP_OUT_DIR=qhelp-out make qhelp-to-markdown
 
     - name: Upload qhelp markdown
       uses: actions/upload-artifact@v2
       with:
         name: qhelp-markdown
-        path: qhelp-out/**/*.md
+        path: go/qhelp-out/**/*.md
 
     - name: Test
-      run: env PATH=$PATH:$HOME/codeql make test
+      run: |
+        cd go
+        env PATH=$PATH:$HOME/codeql make test
 
   test-mac:
     name: Test MacOS
@@ -90,10 +98,14 @@ jobs:
       run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
 
     - name: Build
-      run: env PATH=$PATH:$HOME/codeql make
+      run: |
+        cd go
+        env PATH=$PATH:$HOME/codeql make
 
     - name: Test
-      run: env PATH=$PATH:$HOME/codeql make test
+      run: |
+        cd go
+        env PATH=$PATH:$HOME/codeql make test
 
   test-win:
     name: Test Windows
@@ -135,9 +147,11 @@ jobs:
     - name: Build
       run: |
         $Env:Path += ";$HOME\codeql"
+        cd go
         make
 
     - name: Test
       run: |
         $Env:Path += ";$HOME\codeql"
+        cd go
         make test

.github/workflows/ql-for-ql-build.yml

@@ -140,7 +140,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        folder: [cpp, csharp, java, javascript, python, ql, ruby, swift]
+        folder: [cpp, csharp, java, javascript, python, ql, ruby, swift, go]
 
     needs:
       - package

.gitignore

@@ -9,6 +9,7 @@
 # qltest projects and artifacts
 */ql/test/**/*.testproj
 */ql/test/**/*.actual
+*/ql/test/**/go.sum
 
 # Visual studio temporaries, except a file used by QL4VS
 .vs/*
@@ -42,3 +43,15 @@ csharp/extractor/Semmle.Extraction.CSharp.Driver/Properties/launchSettings.json
 
 # CLion project files
 /.clwb
+
+# Go build artifacts
+go/build/*
+
+# Go binaries
+go/tools/bin
+go/tools/linux64
+go/tools/osx64
+go/tools/win64
+go/tools/tokenizer.jar
+go/main
+

.lgtm.yml

@@ -6,6 +6,7 @@ path_classifiers:
   test:
   - csharp/ql/src
   - csharp/ql/test
+  - go/ql/test
   - javascript/extractor/parser-tests
   - javascript/extractor/tests
   - javascript/ql/src
@@ -13,6 +14,9 @@ path_classifiers:
   - python/ql/src
   - python/ql/test
 
+  example:
+  - go/ql/src
+
 queries:
   - include: "*"
 

CODEOWNERS

@@ -1,5 +1,6 @@
 /cpp/ @github/codeql-c-analysis
 /csharp/ @github/codeql-csharp
+/go/ @github/codeql-go
 /java/ @github/codeql-java
 /javascript/ @github/codeql-javascript
 /python/ @github/codeql-python

go/.codeqlmanifest.json

@@ -1,20 +0,0 @@
-{
-  "provide": [
-    "ql/src/qlpack.yml",
-    "ql/lib/qlpack.yml",
-    "ql/examples/qlpack.yml",
-    "ql/test/qlpack.yml",
-    "ql/config/legacy-support/qlpack.yml",
-    "build/codeql-extractor-go/codeql-extractor.yml"
-  ],
-  "ignore": [
-    "the-extractor-which-needs-to-be-built"
-  ],
-  "versionPolicies": {
-    "default": {
-      "requireChangeNotes": true,
-      "committedPrereleaseSuffix": "dev",
-      "committedVersion": "nextPatchRelease"
-    }
-  }
-}

go/.devcontainer/devcontainer.json

@@ -1,10 +0,0 @@
-{
-    "extensions": [
-        "github.vscode-codeql",
-        "slevesque.vscode-zipexplorer"
-    ],
-    "settings": {
-        "codeQL.runningQueries.memory": 2048,
-        "codeQL.runningQueries.debug": true
-    }
-}

go/.gitattributes

@@ -1,6 +0,0 @@
-# Force git not to modify line endings for go or html files under the ql directory
-ql/**/*.go -text
-ql/**/*.html -text
-
-# Force git not to modify line endings for dbschemes
-*.dbscheme -text

go/.github/codeql/codeql-config.yml

@@ -1,4 +0,0 @@
-name: "CodeQL config"
-
-queries:
-  - uses: security-and-quality

go/.github/workflows/check-change-note.yml

@@ -1,33 +0,0 @@
-on:
-  pull_request_target:
-    types: [labeled, unlabeled, opened, synchronize, reopened, ready_for_review]
-    paths:
-      - "ql/src/**/*.ql"
-      - "ql/src/**/*.qll"
-      - "!**/experimental/**"
-
-jobs:
-  check-change-note:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check if change note file is present
-        uses: dorny/paths-filter@7c0f15b688b020e95e00f15c61299b022f08ca95 # v2.8.0
-        id: paths_filter
-        with:
-          filters: |
-            change_note:
-              - '**/change-notes/*.md'
-      - name: Get PR labels
-        id: pr-labels
-        uses: joerick/pr-labels-action@0a4cc4ee0ab557ec0b1ae1157fa6fa7f9f4c494b # v1.0.6
-      - name: Fail if change note is missing
-        uses: actions/github-script@v3
-        if: |
-          github.event.pull_request.draft == false &&
-          steps.paths_filter.outputs.change_note == 'false' &&
-          !contains(steps.pr-labels.outputs.labels, ' no-change-note-required ')
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            core.setFailed('No change note found.' +
-            ' Either add one, or add the `no-change-note-required` label.')

go/.gitignore

@@ -1,28 +0,0 @@
-# editor and OS artifacts
-*~
-.DS_STORE
-
-# query compilation caches
-.cache
-
-# build artifacts
-build/*
-
-# qltest projects and artifacts
-ql/test/**/*.testproj
-ql/test/**/*.actual
-ql/test/**/go.sum
-
-# Java class files
-**/*.class
-
-# binaries
-tools/bin
-tools/linux64
-tools/osx64
-tools/win64
-tools/tokenizer.jar
-main
-
-# QL pack output directories
-.codeql

go/.lgtm.yml

@@ -1,5 +0,0 @@
-path_classifiers:
-  test:
-    - ql/test
-  example:
-    - ql/src

go/CODEOWNERS

@@ -1 +0,0 @@
-* @github/codeql-go