From af2756e47ad825c7375d98dfd2b660f4e6ae5766 Mon Sep 17 00:00:00 2001
From: chanelyoung <chanelyoung@microsoft.com>
Date: Thu, 30 Jul 2026 15:54:16 -0700
Subject: [PATCH] Fix local IaC test setup

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 iac/.codeqlmanifest.json        | 12 ------------
 iac/docs/workflows.md           |  6 +++---
 iac/ql/lib/codeql-pack.lock.yml |  6 +-----
 iac/ql/src/codeql-pack.lock.yml |  6 +-----
 iac/ql/test/qlpack.yml          |  8 +++-----
 iac/tools/qltest.cmd            | 17 +++++++++++++++--
 6 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 iac/.codeqlmanifest.json

diff --git a/iac/.codeqlmanifest.json b/iac/.codeqlmanifest.json
deleted file mode 100644
index 8941685b2f8c..000000000000
--- a/iac/.codeqlmanifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "provide": [
-      "ql/*/qlpack.yml"
-    ],
-    "versionPolicies": {
-      "default": {
-        "requireChangeNotes": true,
-        "committedPrereleaseSuffix": "dev",
-        "committedVersion": "nextPatchRelease"
-      }
-    }
-  }
\ No newline at end of file
diff --git a/iac/docs/workflows.md b/iac/docs/workflows.md
index 2bfa2ce76168..e14a45bb8dea 100644
--- a/iac/docs/workflows.md
+++ b/iac/docs/workflows.md
@@ -70,10 +70,10 @@ The CodeQL CLI can be used to analyze IaC files using the CodeQL Extractor, Libr
 3. Check the extractor is installed correctly by running:
    - `codeql resolve languages` and checking if `iac` is listed
 4. Install the IaC queries pack by running:
-   - `codeql pack install advanced-security/iac-queries`
+   - `codeql pack install microsoft/iac-queries`
 5. Run the CodeQL database commands to create and analyze the IaC files
    - `codeql database create <database-name> --language=iac --source-root=<path-to-iac-files>`
-   - `codeql database analyze <database-name> --format=sarif-latest --output=<output-file-name> advanced-security/iac-queries`
+   - `codeql database analyze <database-name> --format=sarif-latest --output=<output-file-name> microsoft/iac-queries`
 
 ### CLI Example
 
@@ -108,5 +108,5 @@ codeql database analyze \
   --format="sarif-latest" \
   --output="./codeql-iac.sarif" \
   "$CODEQL_DATABASE" \
-  "advanced-security/iac-queries"
+  "microsoft/iac-queries"
 ```
diff --git a/iac/ql/lib/codeql-pack.lock.yml b/iac/ql/lib/codeql-pack.lock.yml
index 69ce09bcb67b..53004274575d 100644
--- a/iac/ql/lib/codeql-pack.lock.yml
+++ b/iac/ql/lib/codeql-pack.lock.yml
@@ -1,8 +1,4 @@
 ---
 lockVersion: 1.0.0
-dependencies:
-  codeql/util:
-    version: 1.0.12
-  codeql/yaml:
-    version: 1.0.25
+dependencies: {}
 compiled: false
diff --git a/iac/ql/src/codeql-pack.lock.yml b/iac/ql/src/codeql-pack.lock.yml
index 69ce09bcb67b..53004274575d 100644
--- a/iac/ql/src/codeql-pack.lock.yml
+++ b/iac/ql/src/codeql-pack.lock.yml
@@ -1,8 +1,4 @@
 ---
 lockVersion: 1.0.0
-dependencies:
-  codeql/util:
-    version: 1.0.12
-  codeql/yaml:
-    version: 1.0.25
+dependencies: {}
 compiled: false
diff --git a/iac/ql/test/qlpack.yml b/iac/ql/test/qlpack.yml
index 293ada09563e..abec62425bd9 100644
--- a/iac/ql/test/qlpack.yml
+++ b/iac/ql/test/qlpack.yml
@@ -1,10 +1,8 @@
-name: advanced-security/iac-tests
+name: microsoft/iac-tests
 groups: [iac, test]
 dependencies:
-dependencies:
-  advanced-security/iac-all: ${workspace}
-  advanced-security/iac-queries: ${workspace}
-extractor: iac
+  microsoft/iac-all: ${workspace}
+  microsoft/iac-queries: ${workspace}
 extractor: iac
 tests: .
 warnOnImplicitThis: true
diff --git a/iac/tools/qltest.cmd b/iac/tools/qltest.cmd
index c960b58a298b..88c344be81e3 100644
--- a/iac/tools/qltest.cmd
+++ b/iac/tools/qltest.cmd
@@ -1,11 +1,24 @@
 @echo off
 
-type NUL && "%CODEQL_DIST%\codeql.exe" database index-files ^
+"%CODEQL_DIST%\codeql.exe" database index-files ^
     --prune=**/*.testproj ^
     --include-extension=.hcl ^
     --include-extension=.tf ^
+    --include-extension=.tfvars ^
+    --include-extension=.bicep ^
     --size-limit=5m ^
-    --language=hcl ^
+    --language=iac ^
+    --working-dir=. ^
+    "%CODEQL_EXTRACTOR_IAC_WIP_DATABASE%"
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+"%CODEQL_DIST%\codeql.exe" database index-files ^
+    --prune=**/*.testproj ^
+    --include-extension=.yml ^
+    --include-extension=.yaml ^
+    --include-extension=.json ^
+    --size-limit=5m ^
+    --language=yaml ^
     --working-dir=. ^
     "%CODEQL_EXTRACTOR_IAC_WIP_DATABASE%"