Packaging: Update suite-helpers qlpack

aeisenberg · aeisenberg · commit e566fb9c5a01 · 2021-08-16T17:51:33.000-07:00
Uses new style naming scheme.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{ "provide": [ "*/ql/src/qlpack.yml",`
	`2`	`+ "*/ql/lib/qlpack.yml",`
`2`	`3`	`"*/ql/test/qlpack.yml",`
`3`	`4`	`"cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml",`
`4`	`5`	`"*/ql/examples/qlpack.yml",`