Skip to content

Commit 3e5fafd

Browse files
authored
Merge pull request #5998 from theotherjimmy/strict-config-schema
Restrict target_overrides usage
2 parents 1e79439 + fad2ee5 commit 3e5fafd

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

tools/config/definitions.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
"type": "object",
3030
"patternProperties": {
3131
"\\*": {
32-
"type": "object",
33-
"patternProperties": {
34-
".*\\..*": {}
35-
},
36-
"additionalProperties": false
32+
"$ref": "#/target_override_entry"
3733
},
3834
"^\\S+$": {
3935
"$ref": "#/target_override_entry"
@@ -69,6 +65,7 @@
6965
},
7066
"config_parameter_short": {
7167
"type": [
68+
"array",
7269
"string",
7370
"integer",
7471
"boolean",
@@ -88,7 +85,15 @@
8885
"target_override_entry": {
8986
"type": "object",
9087
"patternProperties": {
91-
"^\\S+$": {}
88+
"^\\S+$": {
89+
"type": [
90+
"array",
91+
"string",
92+
"integer",
93+
"boolean",
94+
"null"
95+
]
96+
}
9297
},
9398
"additionalProperties": false
9499
}

0 commit comments

Comments
 (0)