Merge pull request #385 from microsoft/iac-file-cleanup

Iac file cleanup

Author: chanel-y

iac/.codeqlmanifest.json

@@ -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"
 ```

iac/docs/workflows.md

@@ -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

iac/ql/lib/codeql-pack.lock.yml

@@ -1,11 +1,23 @@
 @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 ^
     --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%"