feat: update codeql

GeekMasher · Jul 26, 2023 · f230354 · f230354
1 parent 11f9dd2
commit f230354
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -77,7 +77,7 @@ jobs:
         export PYTHONPATH=$PWD/src
 
         for f in examples/*.py; do
-            echo "Running :: $f"
+            echo "[+] Running :: $f"
             pipenv run python $f
         done
 
diff --git a/examples/codeql.py b/examples/codeql.py
@@ -1,9 +1,7 @@
-
-import json
+"""CodeQL Example."""
 import os
-from ghastoolkit.codeql import databases
-from ghastoolkit.codeql.cli import CodeQL 
-from ghastoolkit.codeql.databases import CodeQLDatabases
+import json
+from ghastoolkit import CodeQL, CodeQLDatabases
 
 codeql = CodeQL()
 print(codeql)
@@ -18,5 +16,3 @@
 
 for result in results:
     print(f"- {result}")
-
-
diff --git a/src/ghastoolkit/codeql/cli.py b/src/ghastoolkit/codeql/cli.py
@@ -1,4 +1,5 @@
 """This is the CodeQL CLI Module."""
+from glob import glob
 import os
 import json
 import logging
@@ -15,14 +16,22 @@
 
 def findCodeQLBinary() -> Optional[List[str]]:
     """Find CodeQL Binary on current system."""
-    locations = [["codeql"], ["gh", "codeql"], ["/usr/bin/codeql/codeql"]]
+    locations = [
+        # generic
+        ["codeql"],
+        # local bin
+        ["/usr/bin/codeql/codeql"],
+        # gh cli
+        ["gh", "codeql"],
+        # Actions
+        glob("/opt/hostedtoolcache/CodeQL/*/x64/codeql/codeql"),
+    ]
 
     for location in locations:
         try:
             cmd = location + ["version"]
             with open(os.devnull, "w") as null:
                 subprocess.check_call(cmd, stdout=null, stderr=null)
-
             return location
         except Exception as err:
             logger.debug(f"Failed to find codeql :: {err}")
@@ -64,7 +73,7 @@ def runCommand(self, *argvs, display: bool = False) -> Optional[str]:
     @property
     def version(self) -> str:
         """Get CodeQL Version from the CLI binary."""
-        version = self.runCommand("version", "--format", "terse", display=True)
+        version = self.runCommand("version", "--format", "terse")
         if not version:
             raise Exception("CodeQL version not found")
         return version