Require type for oneOf mutual exclusion (#5426)

Namnamseo · ldez · web-flow · commit 3d28c57b576d · 2025-02-17T13:39:05.000+01:00
Co-authored-by: Fernandez Ludovic &lt;ldez@users.noreply.github.com&gt;
diff --git a/jsonschema/golangci.jsonschema.json b/jsonschema/golangci.jsonschema.json
@@ -3846,7 +3846,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -3846,7 +3846,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.57.jsonschema.json b/jsonschema/golangci.v1.57.jsonschema.json
@@ -3198,7 +3198,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.58.jsonschema.json b/jsonschema/golangci.v1.58.jsonschema.json
@@ -3356,7 +3356,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.59.jsonschema.json b/jsonschema/golangci.v1.59.jsonschema.json
@@ -3484,7 +3484,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.60.jsonschema.json b/jsonschema/golangci.v1.60.jsonschema.json
@@ -3510,7 +3510,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.61.jsonschema.json b/jsonschema/golangci.v1.61.jsonschema.json
@@ -3515,7 +3515,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.62.jsonschema.json b/jsonschema/golangci.v1.62.jsonschema.json
@@ -3578,7 +3578,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/jsonschema/golangci.v1.63.jsonschema.json b/jsonschema/golangci.v1.63.jsonschema.json
@@ -3795,7 +3795,8 @@
                 {
                   "properties": {
                     "type": {"enum": ["module"] }
-                  }
+                  },
+                  "required": ["type"]
                 },
                 {
                   "required": ["path"]
diff --git a/test/testdata/configs/custom_linter_goplugin.yml b/test/testdata/configs/custom_linter_goplugin.yml
@@ -0,0 +1,8 @@
+linters-settings:
+  custom:
+    foo:
+      type: "goplugin"
+      path: "bin/linter/myplugin.so"
+      description: I am a Go plugin system-based custom linter.
+      settings:
+        message: hello
diff --git a/test/testdata/configs/custom_linter_module.yml b/test/testdata/configs/custom_linter_module.yml
@@ -0,0 +1,7 @@
+linters-settings:
+  custom:
+    foo:
+      type: "module"
+      description: I am a module-based custom linter.
+      settings:
+        message: hello
diff --git a/test/testdata/configs/custom_linter_notype.yml b/test/testdata/configs/custom_linter_notype.yml
@@ -0,0 +1,9 @@
+linters-settings:
+  custom:
+    foo:
+      path: "bin/linter/myplugin.so"
+      description: >
+        I didn't specify the type, so I am a Go plugin system-based custom linter.
+        As such, I need to be specified the path.
+      settings:
+        message: hello

Original file line number	Diff line number	Diff line change
`@@ -3846,7 +3846,8 @@`
`3846`	`3846`	`{`
`3847`	`3847`	`"properties": {`
`3848`	`3848`	`"type": {"enum": ["module"] }`
`3849`		`- }`
	`3849`	`+ },`
	`3850`	`+ "required": ["type"]`
`3850`	`3851`	`},`
`3851`	`3852`	`{`
`3852`	`3853`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3198,7 +3198,8 @@`
`3198`	`3198`	`{`
`3199`	`3199`	`"properties": {`
`3200`	`3200`	`"type": {"enum": ["module"] }`
`3201`		`- }`
	`3201`	`+ },`
	`3202`	`+ "required": ["type"]`
`3202`	`3203`	`},`
`3203`	`3204`	`{`
`3204`	`3205`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3356,7 +3356,8 @@`
`3356`	`3356`	`{`
`3357`	`3357`	`"properties": {`
`3358`	`3358`	`"type": {"enum": ["module"] }`
`3359`		`- }`
	`3359`	`+ },`
	`3360`	`+ "required": ["type"]`
`3360`	`3361`	`},`
`3361`	`3362`	`{`
`3362`	`3363`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3484,7 +3484,8 @@`
`3484`	`3484`	`{`
`3485`	`3485`	`"properties": {`
`3486`	`3486`	`"type": {"enum": ["module"] }`
`3487`		`- }`
	`3487`	`+ },`
	`3488`	`+ "required": ["type"]`
`3488`	`3489`	`},`
`3489`	`3490`	`{`
`3490`	`3491`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3510,7 +3510,8 @@`
`3510`	`3510`	`{`
`3511`	`3511`	`"properties": {`
`3512`	`3512`	`"type": {"enum": ["module"] }`
`3513`		`- }`
	`3513`	`+ },`
	`3514`	`+ "required": ["type"]`
`3514`	`3515`	`},`
`3515`	`3516`	`{`
`3516`	`3517`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3515,7 +3515,8 @@`
`3515`	`3515`	`{`
`3516`	`3516`	`"properties": {`
`3517`	`3517`	`"type": {"enum": ["module"] }`
`3518`		`- }`
	`3518`	`+ },`
	`3519`	`+ "required": ["type"]`
`3519`	`3520`	`},`
`3520`	`3521`	`{`
`3521`	`3522`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3578,7 +3578,8 @@`
`3578`	`3578`	`{`
`3579`	`3579`	`"properties": {`
`3580`	`3580`	`"type": {"enum": ["module"] }`
`3581`		`- }`
	`3581`	`+ },`
	`3582`	`+ "required": ["type"]`
`3582`	`3583`	`},`
`3583`	`3584`	`{`
`3584`	`3585`	`"required": ["path"]`
Original file line number	Diff line number	Diff line change
`@@ -3795,7 +3795,8 @@`
`3795`	`3795`	`{`
`3796`	`3796`	`"properties": {`
`3797`	`3797`	`"type": {"enum": ["module"] }`
`3798`		`- }`
	`3798`	`+ },`
	`3799`	`+ "required": ["type"]`
`3799`	`3800`	`},`
`3800`	`3801`	`{`
`3801`	`3802`	`"required": ["path"]`