From 6a47fcaf1ff431ad33e6f51204c7a10b8ca6ca86 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 3 Sep 2021 11:53:28 -0700 Subject: [PATCH] Packaging: Normalize all qlpack.yml files for all languages This commit ensures consistency among all of our qlpacks. Here are the changes: 1. Ensure only modern references are used (codeql-{lang} is converted to codeql/{lang}-all or codeql/{lang}-queries where appropriate). 2. Use consistent version numbers. All languages are at 0.0.2 except javascript, which is 0.0.3. 3. Convert all `libraryPathDependencies` to `dependencies` with version constraints 4. Dependencies from query packs to other packs are always `"*"` since these dependencies are always from source and we should get the latest. 5. Dependencies from codeql/{lang}-lib to codeql/{lang}-upgrades must be strict since there is a tight connection between the libary and its relevant upgrades. --- cpp/ql/examples/qlpack.lock.yml | 4 ++++ cpp/ql/examples/qlpack.yml | 7 ++++--- cpp/ql/lib/qlpack.yml | 2 ++ cpp/ql/src/codeql-suites/cpp-code-scanning.qls | 2 +- cpp/ql/src/codeql-suites/cpp-lgtm-full.qls | 2 +- cpp/ql/src/codeql-suites/cpp-security-and-quality.qls | 2 +- cpp/ql/src/codeql-suites/cpp-security-extended.qls | 2 +- cpp/ql/src/qlpack.yml | 4 ++-- cpp/ql/test/qlpack.lock.yml | 4 ++++ cpp/ql/test/qlpack.yml | 4 ++-- .../Security/CWE/CWE-190/semmle/tainted/qlpack.yml | 4 ++-- cpp/upgrades/qlpack.lock.yml | 4 ++++ cpp/upgrades/qlpack.yml | 3 ++- csharp/ql/examples/qlpack.lock.yml | 4 ++++ csharp/ql/examples/qlpack.yml | 4 ++-- csharp/ql/lib/qlpack.lock.yml | 4 ++++ csharp/ql/lib/qlpack.yml | 2 ++ csharp/ql/src/qlpack.lock.yml | 4 ++++ csharp/ql/src/qlpack.yml | 4 ++-- csharp/ql/test/qlpack.lock.yml | 4 ++++ csharp/ql/test/qlpack.yml | 6 +++--- csharp/upgrades/qlpack.yml | 3 ++- java/ql/examples/qlpack.lock.yml | 4 ++++ java/ql/examples/qlpack.yml | 5 +++-- java/ql/src/qlpack.yml | 4 ++-- java/ql/test/qlpack.yml | 6 +++--- javascript/ql/examples/qlpack.yml | 5 +++-- javascript/ql/src/qlpack.yml | 6 +++--- javascript/ql/test/qlpack.yml | 2 +- python/ql/examples/qlpack.yml | 5 +++-- python/ql/lib/qlpack.yml | 2 +- python/ql/src/qlpack.yml | 4 ++-- python/ql/test/qlpack.yml | 6 +++--- 33 files changed, 85 insertions(+), 43 deletions(-) create mode 100644 cpp/ql/examples/qlpack.lock.yml create mode 100644 cpp/ql/test/qlpack.lock.yml create mode 100644 cpp/upgrades/qlpack.lock.yml create mode 100644 csharp/ql/examples/qlpack.lock.yml create mode 100644 csharp/ql/lib/qlpack.lock.yml create mode 100644 csharp/ql/src/qlpack.lock.yml create mode 100644 csharp/ql/test/qlpack.lock.yml create mode 100644 java/ql/examples/qlpack.lock.yml diff --git a/cpp/ql/examples/qlpack.lock.yml b/cpp/ql/examples/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/cpp/ql/examples/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/cpp/ql/examples/qlpack.yml b/cpp/ql/examples/qlpack.yml index 98c48a70e22..e7b5d02295d 100644 --- a/cpp/ql/examples/qlpack.yml +++ b/cpp/ql/examples/qlpack.yml @@ -1,3 +1,4 @@ -name: codeql-cpp-examples -version: 0.0.0 -libraryPathDependencies: codeql/cpp-all +name: codeql/cpp-examples +version: 0.0.2 +dependencies: + codeql/cpp-all: "*" diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml index 5e2ccea683e..d386b0ba2ce 100644 --- a/cpp/ql/lib/qlpack.yml +++ b/cpp/ql/lib/qlpack.yml @@ -3,3 +3,5 @@ version: 0.0.2 dbscheme: semmlecode.cpp.dbscheme extractor: cpp library: true +dependencies: + codeql/cpp-upgrades: 0.0.2 diff --git a/cpp/ql/src/codeql-suites/cpp-code-scanning.qls b/cpp/ql/src/codeql-suites/cpp-code-scanning.qls index 219ee5d9534..d14d1004b2a 100644 --- a/cpp/ql/src/codeql-suites/cpp-code-scanning.qls +++ b/cpp/ql/src/codeql-suites/cpp-code-scanning.qls @@ -3,4 +3,4 @@ - apply: code-scanning-selectors.yml from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml - from: codeql-cpp + from: codeql/cpp-queries diff --git a/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls b/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls index 53207e8e5e5..7bc269050bf 100644 --- a/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls +++ b/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls @@ -3,7 +3,7 @@ - apply: lgtm-selectors.yml from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml - from: codeql-cpp + from: codeql/cpp-queries # These are only for IDE use. - exclude: tags contain: 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 351cee3c772..968883e26ea 100644 --- a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls +++ b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls @@ -3,4 +3,4 @@ - apply: security-and-quality-selectors.yml from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml - from: codeql-cpp + from: codeql/cpp-queries diff --git a/cpp/ql/src/codeql-suites/cpp-security-extended.qls b/cpp/ql/src/codeql-suites/cpp-security-extended.qls index 63e23300d26..bf81c30e473 100644 --- a/cpp/ql/src/codeql-suites/cpp-security-extended.qls +++ b/cpp/ql/src/codeql-suites/cpp-security-extended.qls @@ -3,4 +3,4 @@ - apply: security-extended-selectors.yml from: codeql/suite-helpers - apply: codeql-suites/exclude-slow-queries.yml - from: codeql-cpp + from: codeql/cpp-queries diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml index 02df2db69a6..8010b3fe73f 100644 --- a/cpp/ql/src/qlpack.yml +++ b/cpp/ql/src/qlpack.yml @@ -1,8 +1,8 @@ name: codeql/cpp-queries version: 0.0.2 dependencies: - codeql/cpp-all: ^0.0.2 - codeql/suite-helpers: ^0.0.2 + codeql/cpp-all: "*" + codeql/suite-helpers: "*" suites: codeql-suites extractor: cpp defaultSuiteFile: codeql-suites/cpp-code-scanning.qls diff --git a/cpp/ql/test/qlpack.lock.yml b/cpp/ql/test/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/cpp/ql/test/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/cpp/ql/test/qlpack.yml b/cpp/ql/test/qlpack.yml index a2858d0c3fe..5ffadebf8f4 100644 --- a/cpp/ql/test/qlpack.yml +++ b/cpp/ql/test/qlpack.yml @@ -1,5 +1,5 @@ -name: codeql-cpp-tests -version: 0.0.0 +name: codeql/cpp-tests +version: 0.0.2 dependencies: codeql/cpp-all: "*" codeql/cpp-queries: "*" diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml index 6bbb2bc9062..4f55b63b00d 100644 --- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml +++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml @@ -1,6 +1,6 @@ # This directory has its own qlpack for reasons detailed in commit 2550788598010fa2117274607c9d58f64f997f34 -name: codeql-cpp-tests-cwe-190-tainted -version: 0.0.0 +name: codeql/cpp-tests-cwe-190-tainted +version: 0.0.2 dependencies: codeql/cpp-all: "*" codeql/cpp-queries: "*" diff --git a/cpp/upgrades/qlpack.lock.yml b/cpp/upgrades/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/cpp/upgrades/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/cpp/upgrades/qlpack.yml b/cpp/upgrades/qlpack.yml index eaf90d6cf90..acc305bb6a2 100644 --- a/cpp/upgrades/qlpack.yml +++ b/cpp/upgrades/qlpack.yml @@ -1,2 +1,3 @@ -name: codeql-cpp-upgrades +name: codeql/cpp-upgrades upgrades: . +version: 0.0.2 diff --git a/csharp/ql/examples/qlpack.lock.yml b/csharp/ql/examples/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/csharp/ql/examples/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/csharp/ql/examples/qlpack.yml b/csharp/ql/examples/qlpack.yml index 02fc9379389..573e7a673d0 100644 --- a/csharp/ql/examples/qlpack.yml +++ b/csharp/ql/examples/qlpack.yml @@ -1,4 +1,4 @@ name: codeql-csharp-examples -version: 0.0.0 +version: 0.0.2 dependencies: - codeql/csharp-all: ^0.0.1 + codeql/csharp-all: "*" diff --git a/csharp/ql/lib/qlpack.lock.yml b/csharp/ql/lib/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/csharp/ql/lib/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml index 7240eba8833..b760898bf7c 100644 --- a/csharp/ql/lib/qlpack.yml +++ b/csharp/ql/lib/qlpack.yml @@ -4,3 +4,5 @@ dbscheme: semmlecode.csharp.dbscheme suites: codeql-suites extractor: csharp library: true +dependencies: + codeql/csharp-upgrades: 0.0.2 diff --git a/csharp/ql/src/qlpack.lock.yml b/csharp/ql/src/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/csharp/ql/src/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml index 8dac78c9b45..fc9ac2f6895 100644 --- a/csharp/ql/src/qlpack.yml +++ b/csharp/ql/src/qlpack.yml @@ -3,5 +3,5 @@ version: 0.0.2 suites: codeql-suites extractor: csharp dependencies: - codeql/csharp-all: ^0.0.2 - codeql/suite-helpers: ^0.0.2 + codeql/csharp-all: "*" + codeql/suite-helpers: "*" diff --git a/csharp/ql/test/qlpack.lock.yml b/csharp/ql/test/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/csharp/ql/test/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/csharp/ql/test/qlpack.yml b/csharp/ql/test/qlpack.yml index 4d1507c0c1a..ce042f80fce 100644 --- a/csharp/ql/test/qlpack.yml +++ b/csharp/ql/test/qlpack.yml @@ -1,7 +1,7 @@ name: codeql-csharp-tests -version: 0.0.0 +version: 0.0.2 dependencies: - codeql/csharp-all: ^0.0.2 - codeql/csharp-queries: ^0.0.2 + codeql/csharp-all: "*" + codeql/csharp-queries: "*" extractor: csharp tests: . diff --git a/csharp/upgrades/qlpack.yml b/csharp/upgrades/qlpack.yml index 8ad3718778d..9c3e8f6520a 100644 --- a/csharp/upgrades/qlpack.yml +++ b/csharp/upgrades/qlpack.yml @@ -1,2 +1,3 @@ -name: codeql-csharp-upgrades +name: codeql/csharp-upgrades upgrades: . +version: 0.0.2 diff --git a/java/ql/examples/qlpack.lock.yml b/java/ql/examples/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/java/ql/examples/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/java/ql/examples/qlpack.yml b/java/ql/examples/qlpack.yml index 98265c98bc1..37542a63150 100644 --- a/java/ql/examples/qlpack.yml +++ b/java/ql/examples/qlpack.yml @@ -1,3 +1,4 @@ name: codeql-java-examples -version: 0.0.0 -libraryPathDependencies: codeql/java-all +version: 0.0.2 +dependencies: + codeql/java-all: "*" diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml index 23f00c438be..8632ff9df4e 100644 --- a/java/ql/src/qlpack.yml +++ b/java/ql/src/qlpack.yml @@ -3,5 +3,5 @@ version: 0.0.2 suites: codeql-suites extractor: java dependencies: - codeql/java-all: ^0.0.2 - codeql/suite-helpers: ^0.0.2 + codeql/java-all: "*" + codeql/suite-helpers: "*" diff --git a/java/ql/test/qlpack.yml b/java/ql/test/qlpack.yml index b3b242c8d50..55953ab4b78 100644 --- a/java/ql/test/qlpack.yml +++ b/java/ql/test/qlpack.yml @@ -1,7 +1,7 @@ name: codeql/java-tests -version: 0.0.0 +version: 0.0.2 dependencies: - codeql/java-all: ^0.0.1 - codeql/java-queries: ^0.0.1 + codeql/java-all: "*" + codeql/java-queries: "*" extractor: java tests: . diff --git a/javascript/ql/examples/qlpack.yml b/javascript/ql/examples/qlpack.yml index cf0a9dc3e4c..039f203982c 100644 --- a/javascript/ql/examples/qlpack.yml +++ b/javascript/ql/examples/qlpack.yml @@ -1,3 +1,4 @@ name: codeql-javascript-examples -version: 0.0.0 -libraryPathDependencies: codeql/javascript-all +version: 0.0.3 +dependencies: + codeql/javascript-all: "*" diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml index 2f4c7b5802f..51ae6649bb3 100644 --- a/javascript/ql/src/qlpack.yml +++ b/javascript/ql/src/qlpack.yml @@ -1,7 +1,7 @@ name: codeql/javascript-queries -version: 0.0.2 +version: 0.0.3 suites: codeql-suites extractor: javascript dependencies: - codeql/javascript-all: ^0.0.2 - codeql/suite-helpers: ^0.0.2 + codeql/javascript-all: "*" + codeql/suite-helpers: "*" diff --git a/javascript/ql/test/qlpack.yml b/javascript/ql/test/qlpack.yml index d9d8aecb80d..44484993cf9 100644 --- a/javascript/ql/test/qlpack.yml +++ b/javascript/ql/test/qlpack.yml @@ -1,5 +1,5 @@ name: codeql/javascript-tests -version: 0.0.0 +version: 0.0.3 dependencies: codeql/javascript-all: "*" codeql/javascript-queries: "*" diff --git a/python/ql/examples/qlpack.yml b/python/ql/examples/qlpack.yml index 6c95eee6189..b22acfb4fe8 100644 --- a/python/ql/examples/qlpack.yml +++ b/python/ql/examples/qlpack.yml @@ -1,3 +1,4 @@ name: codeql/python-examples -version: 0.0.0 -libraryPathDependencies: codeql/python-all +version: 0.0.2 +dependencies: + codeql/python-all: "*" diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml index f4b13be48f5..21dc79d4e9d 100644 --- a/python/ql/lib/qlpack.yml +++ b/python/ql/lib/qlpack.yml @@ -4,4 +4,4 @@ dbscheme: semmlecode.python.dbscheme extractor: python library: true dependencies: - codeql/python-upgrades: ~0.0.2 + codeql/python-upgrades: 0.0.2 diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml index 26f051faa54..33c56cd0400 100644 --- a/python/ql/src/qlpack.yml +++ b/python/ql/src/qlpack.yml @@ -1,8 +1,8 @@ name: codeql/python-queries version: 0.0.2 dependencies: - codeql/python-all: ^0.0.2 - codeql/suite-helpers: ^0.0.2 + codeql/python-all: "*" + codeql/suite-helpers: "*" suites: codeql-suites extractor: python defaultSuiteFile: codeql-suites/python-code-scanning.qls diff --git a/python/ql/test/qlpack.yml b/python/ql/test/qlpack.yml index fb108d37022..f1f66f7832b 100644 --- a/python/ql/test/qlpack.yml +++ b/python/ql/test/qlpack.yml @@ -1,7 +1,7 @@ name: codeql/python-tests -version: 0.0.0 +version: 0.0.2 dependencies: - codeql/python-all: ^0.0.1 - codeql/python-queries: ^0.0.1 + codeql/python-all: "*" + codeql/python-queries: "*" extractor: python tests: .