From 3b87fb18a678aafc7b1228d71e7c1e91aec5eb8c Mon Sep 17 00:00:00 2001 From: Remco Vermeulen Date: Thu, 6 Feb 2025 14:10:27 -0800 Subject: [PATCH] Add CCR suite to query list --- misc/scripts/generate-code-scanning-query-list.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/misc/scripts/generate-code-scanning-query-list.py b/misc/scripts/generate-code-scanning-query-list.py index 6fc83a00cdae..7cfad6ae2003 100755 --- a/misc/scripts/generate-code-scanning-query-list.py +++ b/misc/scripts/generate-code-scanning-query-list.py @@ -31,7 +31,7 @@ # Define which languages and query packs to consider languages = [ "actions", "cpp", "csharp", "go", "java", "javascript", "python", "ruby", "swift" ] -packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental" ] +packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "ccr"] class CodeQL: def __init__(self): @@ -169,7 +169,7 @@ def subprocess_run(cmd): for pack in packs: # Get absolute paths to queries in this pack by using 'codeql resolve queries' try: - queries_subp = codeql.command(["resolve","queries","--search-path", codeql_search_path, "%s-%s.qls" % (lang, pack)]) + queries_subp = codeql.command(["resolve","queries","--search-path", codeql_search_path, "%s-%s.qls" % (lang, pack)]).strip() except Exception as e: # Resolving queries might go wrong if the github/codeql repository is not # on the search path. @@ -183,8 +183,13 @@ def subprocess_run(cmd): else: sys.exit("You can use '--ignore-missing-query-packs' to ignore this error") + # Exception for the CCR suites, which might be empty, but must be resolvable. + if pack == 'ccr' and queries_subp == '': + print(f'Warning: skipping empty suite ccr', file=sys.stderr) + continue + # Investigate metadata for every query by using 'codeql resolve metadata' - for queryfile in queries_subp.strip().split("\n"): + for queryfile in queries_subp.split("\n"): query_metadata_json = codeql.command(["resolve","metadata",queryfile]).strip() # Turn an absolute path to a query file into an nwo-prefixed path (e.g. github/codeql/java/ql/src/....)