From 84dc4defd77d295cdc799d7fe5a0bf2e0347bda3 Mon Sep 17 00:00:00 2001
From: Mathew Payne <2772944+GeekMasher@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:13:23 +0000
Subject: [PATCH] feat: Update Dev Container and CodeQL workspace

---
 .devcontainer/bootstrap.sh      |  8 +++++++-
 .devcontainer/devcontainer.json | 15 ++++++++++++++-
 .devcontainer/scripts/codeql    | 11 -----------
 codeql-workspace.yml            | 16 +++++++++-------
 4 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100755 .devcontainer/scripts/codeql

diff --git a/.devcontainer/bootstrap.sh b/.devcontainer/bootstrap.sh
index 668da2d8..46ff0c99 100755
--- a/.devcontainer/bootstrap.sh
+++ b/.devcontainer/bootstrap.sh
@@ -2,10 +2,16 @@
 set -e
 
 echo "Installing GH Extensions..."
+
+gh extensions install github/gh-codeql
 gh extensions install GitHubSecurityLab/gh-mrva
 gh extensions install advanced-security/gh-codeql-scan
 
-echo "Installing stubs..."
+echo "Installing CodeQL + stub..."
+
+gh codeql set-version latest
+gh codeql install-stub
+
 chmod +x .devcontainer/scripts/* && cp -r .devcontainer/scripts/* /usr/local/bin/
 
 # Clone an instance of the CodeQL repository
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 389a1f43..936d1834 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,13 +31,26 @@
             "repositories": {
                 "github/gh-codeql": {
                     "permissions": {
-                        "contents": "read"
+                        "contents": "read",
+                        "packages": "read"
                     }
                 },
                 "github/codeql": {
                     "permissions": {
                         "contents": "read"
                     }
+                },
+                "github/codeql-cli-binaries": {
+                    "permissions": {
+                        "contents": "read",
+                        "packages": "read"
+                    }
+                },
+                "dsp-testing/codeql-cli-nightlies": {
+                    "permissions": {
+                        "contents": "read",
+                        "packages": "read"
+                    }
                 }
             }
         }
diff --git a/.devcontainer/scripts/codeql b/.devcontainer/scripts/codeql
deleted file mode 100755
index eba8dcc7..00000000
--- a/.devcontainer/scripts/codeql
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-CODEQL_PATH=/home/root/.vscode-remote/data/User/globalStorage/github.vscode-codeql/distribution1/codeql/codeql
-
-if [ ! -f $CODEQL_PATH ]; then
-    echo "CodeQL not found. Please install the CodeQL extension in VSCode and try again."
-    exit 1
-fi
-
-$CODEQL_PATH $@
diff --git a/codeql-workspace.yml b/codeql-workspace.yml
index 96d59cf1..36a0571f 100644
--- a/codeql-workspace.yml
+++ b/codeql-workspace.yml
@@ -1,9 +1,11 @@
 provide:
-- cpp/**/qlpack.yml
-- csharp/**/qlpack.yml
-- go/**/qlpack.yml
-- java/**/qlpack.yml
-- javascript/**/qlpack.yml
-- python/**/qlpack.yml
-- ruby/**/qlpack.yml
+  - codeql/**/ql/lib/qlpack.yml
+  - codeql/**/ql/src/qlpack.yml
 
+  - cpp/**/qlpack.yml
+  - csharp/**/qlpack.yml
+  - go/**/qlpack.yml
+  - java/**/qlpack.yml
+  - javascript/**/qlpack.yml
+  - python/**/qlpack.yml
+  - ruby/**/qlpack.yml