From e566fb9c5a01bb678bf25825562aebc740952aed Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Mon, 16 Aug 2021 17:28:14 -0700 Subject: [PATCH] Packaging: Update suite-helpers qlpack Uses new style naming scheme. --- .codeqlmanifest.json | 1 + cpp/ql/src/codeql-suites/cpp-code-scanning.qls | 2 +- cpp/ql/src/codeql-suites/cpp-lgtm-full.qls | 4 ++-- cpp/ql/src/codeql-suites/cpp-lgtm.qls | 2 +- cpp/ql/src/codeql-suites/cpp-security-and-quality.qls | 2 +- cpp/ql/src/codeql-suites/cpp-security-extended.qls | 2 +- csharp/ql/src/codeql-suites/csharp-code-scanning.qls | 2 +- csharp/ql/src/codeql-suites/csharp-lgtm-full.qls | 2 +- csharp/ql/src/codeql-suites/csharp-lgtm.qls | 2 +- csharp/ql/src/codeql-suites/csharp-security-and-quality.qls | 2 +- csharp/ql/src/codeql-suites/csharp-security-extended.qls | 2 +- java/ql/src/codeql-suites/java-code-scanning.qls | 2 +- java/ql/src/codeql-suites/java-lgtm-full.qls | 2 +- java/ql/src/codeql-suites/java-lgtm.qls | 2 +- java/ql/src/codeql-suites/java-security-and-quality.qls | 2 +- java/ql/src/codeql-suites/java-security-extended.qls | 2 +- javascript/ql/src/codeql-suites/javascript-code-scanning.qls | 2 +- javascript/ql/src/codeql-suites/javascript-lgtm-full.qls | 2 +- javascript/ql/src/codeql-suites/javascript-lgtm.qls | 2 +- .../ql/src/codeql-suites/javascript-security-and-quality.qls | 2 +- .../ql/src/codeql-suites/javascript-security-extended.qls | 2 +- misc/suite-helpers/qlpack.lock.yml | 4 ++++ misc/suite-helpers/qlpack.yml | 5 +++-- python/ql/src/codeql-suites/python-code-scanning.qls | 2 +- python/ql/src/codeql-suites/python-lgtm-full.qls | 2 +- python/ql/src/codeql-suites/python-lgtm.qls | 2 +- python/ql/src/codeql-suites/python-security-and-quality.qls | 2 +- python/ql/src/codeql-suites/python-security-extended.qls | 2 +- 28 files changed, 34 insertions(+), 28 deletions(-) create mode 100644 misc/suite-helpers/qlpack.lock.yml diff --git a/.codeqlmanifest.json b/.codeqlmanifest.json index 81d370e793d..4efe12f6d2b 100644 --- a/.codeqlmanifest.json +++ b/.codeqlmanifest.json @@ -1,4 +1,5 @@ { "provide": [ "*/ql/src/qlpack.yml", + "*/ql/lib/qlpack.yml", "*/ql/test/qlpack.yml", "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml", "*/ql/examples/qlpack.yml", diff --git a/cpp/ql/src/codeql-suites/cpp-code-scanning.qls b/cpp/ql/src/codeql-suites/cpp-code-scanning.qls index f811010a26a..4a8a85cae42 100644 --- a/cpp/ql/src/codeql-suites/cpp-code-scanning.qls +++ b/cpp/ql/src/codeql-suites/cpp-code-scanning.qls @@ -1,6 +1,6 @@ - description: Standard Code Scanning queries for C and C++ - qlpack: codeql-cpp - apply: code-scanning-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml from: codeql-cpp diff --git a/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls b/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls index b6775597c30..11416fccb7c 100644 --- a/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls +++ b/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls @@ -1,9 +1,9 @@ - description: Standard LGTM queries for C/C++, including ones not displayed by default - qlpack: codeql-cpp - apply: lgtm-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml - from: codeql-cpp + from: codeql-cpp # These are only for IDE use. - exclude: tags contain: diff --git a/cpp/ql/src/codeql-suites/cpp-lgtm.qls b/cpp/ql/src/codeql-suites/cpp-lgtm.qls index fe06e19b7fa..fe88b035276 100644 --- a/cpp/ql/src/codeql-suites/cpp-lgtm.qls +++ b/cpp/ql/src/codeql-suites/cpp-lgtm.qls @@ -1,4 +1,4 @@ - description: Standard LGTM queries for C/C++ - apply: codeql-suites/cpp-lgtm-full.qls - apply: lgtm-displayed-only.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls index 297f46bc752..f212afedba6 100644 --- a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls +++ b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls @@ -1,6 +1,6 @@ - description: Security-and-quality queries for C and C++ - qlpack: codeql-cpp - apply: security-and-quality-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml from: codeql-cpp diff --git a/cpp/ql/src/codeql-suites/cpp-security-extended.qls b/cpp/ql/src/codeql-suites/cpp-security-extended.qls index fa69559add0..26063f088d2 100644 --- a/cpp/ql/src/codeql-suites/cpp-security-extended.qls +++ b/cpp/ql/src/codeql-suites/cpp-security-extended.qls @@ -1,6 +1,6 @@ - description: Security-extended queries for C and C++ - qlpack: codeql-cpp - apply: security-extended-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml from: codeql-cpp diff --git a/csharp/ql/src/codeql-suites/csharp-code-scanning.qls b/csharp/ql/src/codeql-suites/csharp-code-scanning.qls index 3646204da7d..36495d0562e 100644 --- a/csharp/ql/src/codeql-suites/csharp-code-scanning.qls +++ b/csharp/ql/src/codeql-suites/csharp-code-scanning.qls @@ -1,4 +1,4 @@ - description: Standard Code Scanning queries for C# - qlpack: codeql-csharp - apply: code-scanning-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/csharp/ql/src/codeql-suites/csharp-lgtm-full.qls b/csharp/ql/src/codeql-suites/csharp-lgtm-full.qls index 8ba077663d0..14bf575bd70 100644 --- a/csharp/ql/src/codeql-suites/csharp-lgtm-full.qls +++ b/csharp/ql/src/codeql-suites/csharp-lgtm-full.qls @@ -1,7 +1,7 @@ - description: Standard LGTM queries for C#, including ones not displayed by default - qlpack: codeql-csharp - apply: lgtm-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers # These are only for IDE use. - exclude: tags contain: diff --git a/csharp/ql/src/codeql-suites/csharp-lgtm.qls b/csharp/ql/src/codeql-suites/csharp-lgtm.qls index 1e8a9a2fb7c..d6f9a355b69 100644 --- a/csharp/ql/src/codeql-suites/csharp-lgtm.qls +++ b/csharp/ql/src/codeql-suites/csharp-lgtm.qls @@ -1,4 +1,4 @@ - description: Standard LGTM queries for C# - apply: codeql-suites/csharp-lgtm-full.qls - apply: lgtm-displayed-only.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls b/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls index 20ead656db0..f4da662da2b 100644 --- a/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls +++ b/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls @@ -1,4 +1,4 @@ - description: Security-and-quality queries for C# - qlpack: codeql-csharp - apply: security-and-quality-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/csharp/ql/src/codeql-suites/csharp-security-extended.qls b/csharp/ql/src/codeql-suites/csharp-security-extended.qls index b74ffa9c2e0..a8cc8906307 100644 --- a/csharp/ql/src/codeql-suites/csharp-security-extended.qls +++ b/csharp/ql/src/codeql-suites/csharp-security-extended.qls @@ -1,4 +1,4 @@ - description: Security-extended queries for C# - qlpack: codeql-csharp - apply: security-extended-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/java/ql/src/codeql-suites/java-code-scanning.qls b/java/ql/src/codeql-suites/java-code-scanning.qls index 7dc29ab8049..e63526f5626 100644 --- a/java/ql/src/codeql-suites/java-code-scanning.qls +++ b/java/ql/src/codeql-suites/java-code-scanning.qls @@ -1,4 +1,4 @@ - description: Standard Code Scanning queries for Java - qlpack: codeql-java - apply: code-scanning-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/java/ql/src/codeql-suites/java-lgtm-full.qls b/java/ql/src/codeql-suites/java-lgtm-full.qls index 542174d9101..3fc3a23e05e 100644 --- a/java/ql/src/codeql-suites/java-lgtm-full.qls +++ b/java/ql/src/codeql-suites/java-lgtm-full.qls @@ -1,7 +1,7 @@ - description: Standard LGTM queries for Java, including ones not displayed by default - qlpack: codeql-java - apply: lgtm-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers # These are only for IDE use. - exclude: tags contain: diff --git a/java/ql/src/codeql-suites/java-lgtm.qls b/java/ql/src/codeql-suites/java-lgtm.qls index d0733ee7408..8b8f8d973c7 100644 --- a/java/ql/src/codeql-suites/java-lgtm.qls +++ b/java/ql/src/codeql-suites/java-lgtm.qls @@ -1,4 +1,4 @@ - description: Standard LGTM queries for Java - apply: codeql-suites/java-lgtm-full.qls - apply: lgtm-displayed-only.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/java/ql/src/codeql-suites/java-security-and-quality.qls b/java/ql/src/codeql-suites/java-security-and-quality.qls index 1709789eb75..356e1259830 100644 --- a/java/ql/src/codeql-suites/java-security-and-quality.qls +++ b/java/ql/src/codeql-suites/java-security-and-quality.qls @@ -1,4 +1,4 @@ - description: Security-and-quality queries for Java - qlpack: codeql-java - apply: security-and-quality-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/java/ql/src/codeql-suites/java-security-extended.qls b/java/ql/src/codeql-suites/java-security-extended.qls index df10997bb38..af306a9e06e 100644 --- a/java/ql/src/codeql-suites/java-security-extended.qls +++ b/java/ql/src/codeql-suites/java-security-extended.qls @@ -1,4 +1,4 @@ - description: Security-extended queries for Java - qlpack: codeql-java - apply: security-extended-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/javascript/ql/src/codeql-suites/javascript-code-scanning.qls b/javascript/ql/src/codeql-suites/javascript-code-scanning.qls index f87a55157a2..8ec0309619d 100644 --- a/javascript/ql/src/codeql-suites/javascript-code-scanning.qls +++ b/javascript/ql/src/codeql-suites/javascript-code-scanning.qls @@ -1,4 +1,4 @@ - description: Standard Code Scanning queries for JavaScript - qlpack: codeql-javascript - apply: code-scanning-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/javascript/ql/src/codeql-suites/javascript-lgtm-full.qls b/javascript/ql/src/codeql-suites/javascript-lgtm-full.qls index 98de43e41a9..b4336c666ae 100644 --- a/javascript/ql/src/codeql-suites/javascript-lgtm-full.qls +++ b/javascript/ql/src/codeql-suites/javascript-lgtm-full.qls @@ -1,7 +1,7 @@ - description: Standard LGTM queries for JavaScript, including ones not displayed by default - qlpack: codeql-javascript - apply: lgtm-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers # These are only for IDE use. - exclude: tags contain: diff --git a/javascript/ql/src/codeql-suites/javascript-lgtm.qls b/javascript/ql/src/codeql-suites/javascript-lgtm.qls index 3ff42dfa9ac..4443beb1988 100644 --- a/javascript/ql/src/codeql-suites/javascript-lgtm.qls +++ b/javascript/ql/src/codeql-suites/javascript-lgtm.qls @@ -1,4 +1,4 @@ - description: Standard LGTM queries for JavaScript - apply: codeql-suites/javascript-lgtm-full.qls - apply: lgtm-displayed-only.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/javascript/ql/src/codeql-suites/javascript-security-and-quality.qls b/javascript/ql/src/codeql-suites/javascript-security-and-quality.qls index d20b67f9699..4d64a6e7a52 100644 --- a/javascript/ql/src/codeql-suites/javascript-security-and-quality.qls +++ b/javascript/ql/src/codeql-suites/javascript-security-and-quality.qls @@ -1,4 +1,4 @@ - description: Security-and-quality queries for JavaScript - qlpack: codeql-javascript - apply: security-and-quality-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/javascript/ql/src/codeql-suites/javascript-security-extended.qls b/javascript/ql/src/codeql-suites/javascript-security-extended.qls index 734a6335916..ea78d5a0f05 100644 --- a/javascript/ql/src/codeql-suites/javascript-security-extended.qls +++ b/javascript/ql/src/codeql-suites/javascript-security-extended.qls @@ -1,4 +1,4 @@ - description: Security-extended queries for JavaScript - qlpack: codeql-javascript - apply: security-extended-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/misc/suite-helpers/qlpack.lock.yml b/misc/suite-helpers/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/misc/suite-helpers/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml index fd6c1fdf290..ca0a6732f5a 100644 --- a/misc/suite-helpers/qlpack.yml +++ b/misc/suite-helpers/qlpack.yml @@ -1,2 +1,3 @@ -name: codeql-suite-helpers -version: 0.0.0 +name: codeql/suite-helpers +version: 0.0.2 +library: true diff --git a/python/ql/src/codeql-suites/python-code-scanning.qls b/python/ql/src/codeql-suites/python-code-scanning.qls index f9f9a5425b6..e356f34c26e 100644 --- a/python/ql/src/codeql-suites/python-code-scanning.qls +++ b/python/ql/src/codeql-suites/python-code-scanning.qls @@ -1,4 +1,4 @@ - description: Standard Code Scanning queries for Python - qlpack: codeql-python - apply: code-scanning-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/python/ql/src/codeql-suites/python-lgtm-full.qls b/python/ql/src/codeql-suites/python-lgtm-full.qls index f13d4607b66..42a9b332211 100644 --- a/python/ql/src/codeql-suites/python-lgtm-full.qls +++ b/python/ql/src/codeql-suites/python-lgtm-full.qls @@ -1,7 +1,7 @@ - description: Standard LGTM queries for Python, including ones not displayed by default - qlpack: codeql-python - apply: lgtm-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers # These are only for IDE use. - exclude: tags contain: diff --git a/python/ql/src/codeql-suites/python-lgtm.qls b/python/ql/src/codeql-suites/python-lgtm.qls index 61ba43df811..65add0f4d5d 100644 --- a/python/ql/src/codeql-suites/python-lgtm.qls +++ b/python/ql/src/codeql-suites/python-lgtm.qls @@ -1,4 +1,4 @@ - description: Standard LGTM queries for Python - apply: codeql-suites/python-lgtm-full.qls - apply: lgtm-displayed-only.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/python/ql/src/codeql-suites/python-security-and-quality.qls b/python/ql/src/codeql-suites/python-security-and-quality.qls index c4e5d4fc8c0..4971989fd5c 100644 --- a/python/ql/src/codeql-suites/python-security-and-quality.qls +++ b/python/ql/src/codeql-suites/python-security-and-quality.qls @@ -1,4 +1,4 @@ - description: Security-and-quality queries for Python - qlpack: codeql-python - apply: security-and-quality-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers diff --git a/python/ql/src/codeql-suites/python-security-extended.qls b/python/ql/src/codeql-suites/python-security-extended.qls index e0e99533b8c..068ada84fcd 100644 --- a/python/ql/src/codeql-suites/python-security-extended.qls +++ b/python/ql/src/codeql-suites/python-security-extended.qls @@ -1,4 +1,4 @@ - description: Security-extended queries for Python - qlpack: codeql-python - apply: security-extended-selectors.yml - from: codeql-suite-helpers + from: codeql/suite-helpers