Merge pull request #3527 from aeisenberg/aeisenberg/fix-qlpack-schema

Fix the qlpack json schema
github · Apr 3, 2024 · 00c0e70 · 00c0e70
2 parents 7da3740 + 44c3c29
commit 00c0e70
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 19 deletions.
diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [UNRELEASED]
 
 - Add new supported source and sink kinds in the CodeQL Model Editor [#3511](https://github.com/github/vscode-codeql/pull/3511)
+- Fix a bug where the test explorer wouldn't display certain tests. [#3527](https://github.com/github/vscode-codeql/pull/3527)
 
 ## 1.12.4 - 20 March 2024
 

diff --git a/extensions/ql-vscode/src/model-editor/extension-pack-metadata.schema.json b/extensions/ql-vscode/src/model-editor/extension-pack-metadata.schema.json
@@ -67,6 +67,9 @@
                 "$ref": "#/definitions/SuiteInstruction"
               }
             },
+            {
+              "$ref": "#/definitions/SuiteInstruction"
+            },
             {
               "type": "null"
             }
@@ -93,19 +96,33 @@
         "include": {
           "type": "object",
           "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         "exclude": {
           "type": "object",
           "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         "description": {

diff --git a/extensions/ql-vscode/src/packaging/qlpack-file.schema.json b/extensions/ql-vscode/src/packaging/qlpack-file.schema.json
@@ -51,6 +51,9 @@
                 "$ref": "#/definitions/SuiteInstruction"
               }
             },
+            {
+              "$ref": "#/definitions/SuiteInstruction"
+            },
             {
               "type": "null"
             }
@@ -93,19 +96,33 @@
         "include": {
           "type": "object",
           "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         "exclude": {
           "type": "object",
           "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         "description": {

diff --git a/extensions/ql-vscode/src/packaging/qlpack-file.ts b/extensions/ql-vscode/src/packaging/qlpack-file.ts
@@ -10,7 +10,7 @@ export interface QlPackFile {
   extensionTargets?: Record<string, string> | null;
   dbscheme?: string | null;
   library?: boolean | null;
-  defaultSuite?: SuiteInstruction[] | null;
+  defaultSuite?: SuiteInstruction[] | SuiteInstruction | null;
   defaultSuiteFile?: string | null;
   dataExtensions?: string[] | string | null;
 }
diff --git a/extensions/ql-vscode/src/packaging/suite-instruction.ts b/extensions/ql-vscode/src/packaging/suite-instruction.ts
@@ -5,8 +5,8 @@ export interface SuiteInstruction {
   qlpack?: string;
   query?: string;
   queries?: string;
-  include?: Record<string, string[]>;
-  exclude?: Record<string, string[]>;
+  include?: Record<string, string[] | string>;
+  exclude?: Record<string, string[] | string>;
   description?: string;
   import?: string;
   from?: string;