From 40274dcd69b02ca58310cb1c81a37084cc2af173 Mon Sep 17 00:00:00 2001 From: Tamas Vajk Date: Wed, 18 Jun 2025 08:45:12 +0200 Subject: [PATCH] Add code-quality-extended query suites --- actions/ql/integration-tests/query-suite/test.py | 2 +- .../codeql-suites/actions-code-quality-extended.qls | 3 +++ cpp/ql/integration-tests/query-suite/test.py | 2 +- .../src/codeql-suites/cpp-code-quality-extended.qls | 3 +++ csharp/ql/integration-tests/posix/query-suite/test.py | 2 +- .../codeql-suites/csharp-code-quality-extended.qls | 3 +++ go/ql/integration-tests/query-suite/test.py | 2 +- go/ql/src/codeql-suites/go-code-quality-extended.qls | 3 +++ java/ql/integration-tests/java/query-suite/test.py | 2 +- .../src/codeql-suites/java-code-quality-extended.qls | 3 +++ javascript/ql/integration-tests/query-suite/test.py | 2 +- .../javascript-code-quality-extended.qls | 3 +++ .../suite-helpers/code-quality-extended-selectors.yml | 11 +++++++++++ python/ql/integration-tests/query-suite/test.py | 2 +- .../codeql-suites/python-code-quality-extended.qls | 3 +++ ruby/ql/integration-tests/query-suite/test.py | 2 +- .../src/codeql-suites/ruby-code-quality-extended.qls | 3 +++ rust/ql/integration-tests/query-suite/test.py | 2 +- .../src/codeql-suites/rust-code-quality-extended.qls | 3 +++ swift/ql/integration-tests/posix/query-suite/test.py | 2 +- .../src/codeql-suites/swift-code-quality-extended.qls | 3 +++ 21 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 actions/ql/src/codeql-suites/actions-code-quality-extended.qls create mode 100644 cpp/ql/src/codeql-suites/cpp-code-quality-extended.qls create mode 100644 csharp/ql/src/codeql-suites/csharp-code-quality-extended.qls create mode 100644 go/ql/src/codeql-suites/go-code-quality-extended.qls create mode 100644 java/ql/src/codeql-suites/java-code-quality-extended.qls create mode 100644 javascript/ql/src/codeql-suites/javascript-code-quality-extended.qls create mode 100644 misc/suite-helpers/code-quality-extended-selectors.yml create mode 100644 python/ql/src/codeql-suites/python-code-quality-extended.qls create mode 100644 ruby/ql/src/codeql-suites/ruby-code-quality-extended.qls create mode 100644 rust/ql/src/codeql-suites/rust-code-quality-extended.qls create mode 100644 swift/ql/src/codeql-suites/swift-code-quality-extended.qls diff --git a/actions/ql/integration-tests/query-suite/test.py b/actions/ql/integration-tests/query-suite/test.py index 6eb57c090b9..b01e9166168 100644 --- a/actions/ql/integration-tests/query-suite/test.py +++ b/actions/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['actions-code-quality.qls', 'actions-security-and-quality.qls', 'actions-security-extended.qls', 'actions-code-scanning.qls'] +well_known_query_suites = ['actions-code-quality.qls', 'actions-code-quality-extended.qls', 'actions-security-and-quality.qls', 'actions-security-extended.qls', 'actions-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/actions/ql/src/codeql-suites/actions-code-quality-extended.qls b/actions/ql/src/codeql-suites/actions-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/actions/ql/src/codeql-suites/actions-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/cpp/ql/integration-tests/query-suite/test.py b/cpp/ql/integration-tests/query-suite/test.py index 232630c4d2a..ac0d818cdd8 100644 --- a/cpp/ql/integration-tests/query-suite/test.py +++ b/cpp/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['cpp-code-quality.qls', 'cpp-security-and-quality.qls', 'cpp-security-extended.qls', 'cpp-code-scanning.qls'] +well_known_query_suites = ['cpp-code-quality.qls', 'cpp-code-quality-extended.qls', 'cpp-security-and-quality.qls', 'cpp-security-extended.qls', 'cpp-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/cpp/ql/src/codeql-suites/cpp-code-quality-extended.qls b/cpp/ql/src/codeql-suites/cpp-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/cpp/ql/src/codeql-suites/cpp-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/csharp/ql/integration-tests/posix/query-suite/test.py b/csharp/ql/integration-tests/posix/query-suite/test.py index 38f0643dfbb..0bc7182bc08 100644 --- a/csharp/ql/integration-tests/posix/query-suite/test.py +++ b/csharp/ql/integration-tests/posix/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['csharp-code-quality.qls', 'csharp-security-and-quality.qls', 'csharp-security-extended.qls', 'csharp-code-scanning.qls'] +well_known_query_suites = ['csharp-code-quality.qls', 'csharp-code-quality-extended.qls', 'csharp-security-and-quality.qls', 'csharp-security-extended.qls', 'csharp-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/csharp/ql/src/codeql-suites/csharp-code-quality-extended.qls b/csharp/ql/src/codeql-suites/csharp-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/csharp/ql/src/codeql-suites/csharp-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/go/ql/integration-tests/query-suite/test.py b/go/ql/integration-tests/query-suite/test.py index d4c6f9f3709..fa48acf32b5 100644 --- a/go/ql/integration-tests/query-suite/test.py +++ b/go/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['go-code-quality.qls', 'go-security-and-quality.qls', 'go-security-extended.qls', 'go-code-scanning.qls'] +well_known_query_suites = ['go-code-quality.qls', 'go-code-quality-extended.qls', 'go-security-and-quality.qls', 'go-security-extended.qls', 'go-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/go/ql/src/codeql-suites/go-code-quality-extended.qls b/go/ql/src/codeql-suites/go-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/go/ql/src/codeql-suites/go-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/java/ql/integration-tests/java/query-suite/test.py b/java/ql/integration-tests/java/query-suite/test.py index 307a66c1431..6c606e17dc7 100644 --- a/java/ql/integration-tests/java/query-suite/test.py +++ b/java/ql/integration-tests/java/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['java-code-quality.qls', 'java-security-and-quality.qls', 'java-security-extended.qls', 'java-code-scanning.qls'] +well_known_query_suites = ['java-code-quality.qls', 'java-code-quality-extended.qls', 'java-security-and-quality.qls', 'java-security-extended.qls', 'java-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/java/ql/src/codeql-suites/java-code-quality-extended.qls b/java/ql/src/codeql-suites/java-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/java/ql/src/codeql-suites/java-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/javascript/ql/integration-tests/query-suite/test.py b/javascript/ql/integration-tests/query-suite/test.py index 54b6f94043f..859df35f369 100644 --- a/javascript/ql/integration-tests/query-suite/test.py +++ b/javascript/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['javascript-code-quality.qls', 'javascript-security-and-quality.qls', 'javascript-security-extended.qls', 'javascript-code-scanning.qls'] +well_known_query_suites = ['javascript-code-quality.qls', 'javascript-code-quality-extended.qls', 'javascript-security-and-quality.qls', 'javascript-security-extended.qls', 'javascript-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/javascript/ql/src/codeql-suites/javascript-code-quality-extended.qls b/javascript/ql/src/codeql-suites/javascript-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/javascript/ql/src/codeql-suites/javascript-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/misc/suite-helpers/code-quality-extended-selectors.yml b/misc/suite-helpers/code-quality-extended-selectors.yml new file mode 100644 index 00000000000..57b9b2cf8a8 --- /dev/null +++ b/misc/suite-helpers/code-quality-extended-selectors.yml @@ -0,0 +1,11 @@ +- description: Selectors for selecting the extended code-quality queries for a language +- include: + kind: + - problem + - path-problem + precision: + - high + - very-high + - medium + tags contain: + - quality diff --git a/python/ql/integration-tests/query-suite/test.py b/python/ql/integration-tests/query-suite/test.py index 940d79bc361..745a3b5e200 100644 --- a/python/ql/integration-tests/query-suite/test.py +++ b/python/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['python-code-quality.qls', 'python-security-and-quality.qls', 'python-security-extended.qls', 'python-code-scanning.qls'] +well_known_query_suites = ['python-code-quality.qls', 'python-code-quality-extended.qls', 'python-security-and-quality.qls', 'python-security-extended.qls', 'python-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/python/ql/src/codeql-suites/python-code-quality-extended.qls b/python/ql/src/codeql-suites/python-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/python/ql/src/codeql-suites/python-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/ruby/ql/integration-tests/query-suite/test.py b/ruby/ql/integration-tests/query-suite/test.py index 7ebb9d9c9b5..3202f0c13fd 100644 --- a/ruby/ql/integration-tests/query-suite/test.py +++ b/ruby/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['ruby-code-quality.qls', 'ruby-security-and-quality.qls', 'ruby-security-extended.qls', 'ruby-code-scanning.qls'] +well_known_query_suites = ['ruby-code-quality.qls', 'ruby-code-quality-extended.qls', 'ruby-security-and-quality.qls', 'ruby-security-extended.qls', 'ruby-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/ruby/ql/src/codeql-suites/ruby-code-quality-extended.qls b/ruby/ql/src/codeql-suites/ruby-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/ruby/ql/src/codeql-suites/ruby-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/rust/ql/integration-tests/query-suite/test.py b/rust/ql/integration-tests/query-suite/test.py index 5f48fb42853..8880d35b1c9 100644 --- a/rust/ql/integration-tests/query-suite/test.py +++ b/rust/ql/integration-tests/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['rust-code-quality.qls', 'rust-security-and-quality.qls', 'rust-security-extended.qls', 'rust-code-scanning.qls'] +well_known_query_suites = ['rust-code-quality.qls', 'rust-code-quality-extended.qls', 'rust-security-and-quality.qls', 'rust-security-extended.qls', 'rust-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/rust/ql/src/codeql-suites/rust-code-quality-extended.qls b/rust/ql/src/codeql-suites/rust-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/rust/ql/src/codeql-suites/rust-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers diff --git a/swift/ql/integration-tests/posix/query-suite/test.py b/swift/ql/integration-tests/posix/query-suite/test.py index 43babae0125..b72b87f2938 100644 --- a/swift/ql/integration-tests/posix/query-suite/test.py +++ b/swift/ql/integration-tests/posix/query-suite/test.py @@ -2,7 +2,7 @@ import runs_on import pytest from query_suites import * -well_known_query_suites = ['swift-code-quality.qls', 'swift-security-and-quality.qls', 'swift-security-extended.qls', 'swift-code-scanning.qls'] +well_known_query_suites = ['swift-code-quality.qls', 'swift-code-quality-extended.qls', 'swift-security-and-quality.qls', 'swift-security-extended.qls', 'swift-code-scanning.qls'] @runs_on.posix @pytest.mark.parametrize("query_suite", well_known_query_suites) diff --git a/swift/ql/src/codeql-suites/swift-code-quality-extended.qls b/swift/ql/src/codeql-suites/swift-code-quality-extended.qls new file mode 100644 index 00000000000..1ee85cae856 --- /dev/null +++ b/swift/ql/src/codeql-suites/swift-code-quality-extended.qls @@ -0,0 +1,3 @@ +- queries: . +- apply: code-quality-extended-selectors.yml + from: codeql/suite-helpers