From a7069419dbd7f312fa884b2a70ab872c0bdb498d Mon Sep 17 00:00:00 2001
From: Ludovic Fernandez <ldez@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:41:24 +0200
Subject: [PATCH] fix: JSON schema about severities (#4617)

---
 jsonschema/golangci.jsonschema.json      | 104 +++++++----------------
 jsonschema/golangci.next.jsonschema.json | 104 +++++++----------------
 2 files changed, 60 insertions(+), 148 deletions(-)

diff --git a/jsonschema/golangci.jsonschema.json b/jsonschema/golangci.jsonschema.json
index f411de6c..6e72616e 100644
--- a/jsonschema/golangci.jsonschema.json
+++ b/jsonschema/golangci.jsonschema.json
@@ -332,57 +332,6 @@
           "type": "string"
         }
       ]
-    },
-    "issue-match-path": {
-      "type": "object",
-      "properties": {
-        "path": {
-          "type": "string"
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
-    },
-    "issue-match-linters": {
-      "type": "object",
-      "properties": {
-        "linters": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/linters"
-          }
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
-    },
-    "issue-match-source": {
-      "type": "object",
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
-    },
-    "issue-match-text": {
-      "type": "object",
-      "properties": {
-        "text": {
-          "type": "string"
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
     }
   },
   "type": "object",
@@ -3461,32 +3410,39 @@
           "description": "When a list of severity rules are provided, severity information will be added to lint issues. Severity rules have the same filtering capability as exclude rules except you are allowed to specify one matcher per severity rule.\nOnly affects out formats that support setting severity information.",
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "oneOf": [
-                  {
-                    "$ref": "#/definitions/issue-match-path"
-                  },
-                  {
-                    "$ref": "#/definitions/issue-match-source"
-                  },
-                  {
-                    "$ref": "#/definitions/issue-match-linters"
-                  },
-                  {
-                    "$ref": "#/definitions/issue-match-text"
-                  }
-                ]
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "severity": {
+                "type": "string"
               },
-              {
-                "properties": {
-                  "severity": {
-                    "type": "string"
-                  }
+              "path": {
+                "type": "string"
+              },
+              "path-except": {
+                "type": "string"
+              },
+              "linters": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/linters"
                 }
+              },
+              "text": {
+                "type": "string"
+              },
+              "source": {
+                "type": "string"
               }
-            ],
-            "required": ["severity"]
+            },
+            "required": ["severity"],
+            "anyOf": [
+              { "required": ["path"] },
+              { "required": ["path-except"] },
+              { "required": ["linters"] },
+              { "required": ["text"] },
+              { "required": ["source"] }
+            ]
           },
           "default": []
         }
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
index 18267d08..3dda2e35 100644
--- a/jsonschema/golangci.next.jsonschema.json
+++ b/jsonschema/golangci.next.jsonschema.json
@@ -333,57 +333,6 @@
           "type": "string"
         }
       ]
-    },
-    "issue-match-path": {
-      "type": "object",
-      "properties": {
-        "path": {
-          "type": "string"
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
-    },
-    "issue-match-linters": {
-      "type": "object",
-      "properties": {
-        "linters": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/linters"
-          }
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
-    },
-    "issue-match-source": {
-      "type": "object",
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
-    },
-    "issue-match-text": {
-      "type": "object",
-      "properties": {
-        "text": {
-          "type": "string"
-        },
-        "severity": {
-          "$comment": "This is here only to allow `additionalProperties: false`."
-        }
-      },
-      "additionalProperties": false
     }
   },
   "type": "object",
@@ -3476,32 +3425,39 @@
           "description": "When a list of severity rules are provided, severity information will be added to lint issues. Severity rules have the same filtering capability as exclude rules except you are allowed to specify one matcher per severity rule.\nOnly affects out formats that support setting severity information.",
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "oneOf": [
-                  {
-                    "$ref": "#/definitions/issue-match-path"
-                  },
-                  {
-                    "$ref": "#/definitions/issue-match-source"
-                  },
-                  {
-                    "$ref": "#/definitions/issue-match-linters"
-                  },
-                  {
-                    "$ref": "#/definitions/issue-match-text"
-                  }
-                ]
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "severity": {
+                "type": "string"
               },
-              {
-                "properties": {
-                  "severity": {
-                    "type": "string"
-                  }
+              "path": {
+                "type": "string"
+              },
+              "path-except": {
+                "type": "string"
+              },
+              "linters": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/linters"
                 }
+              },
+              "text": {
+                "type": "string"
+              },
+              "source": {
+                "type": "string"
               }
-            ],
-            "required": ["severity"]
+            },
+            "required": ["severity"],
+            "anyOf": [
+              { "required": ["path"] },
+              { "required": ["path-except"] },
+              { "required": ["linters"] },
+              { "required": ["text"] },
+              { "required": ["source"] }
+            ]
           },
           "default": []
         }