Seb35 has uploaded a new change for review. https://gerrit.wikimedia.org/r/299396
Change subject: Better JSON schema
......................................................................
Better JSON schema
---
M docs/farms-schema.json
1 file changed, 41 insertions(+), 149 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/96/299396/1
diff --git a/docs/farms-schema.json b/docs/farms-schema.json
index 926be60..f25a7df 100644
--- a/docs/farms-schema.json
+++ b/docs/farms-schema.json
@@ -9,58 +9,28 @@
{
"type": "object",
"additionalProperties": false,
+ "required": ["suffix", "wikiID"],
"properties": {
"variables": {
"type": "array",
"description": "List of
variables in the host.",
"additionalItems":
false,
- "items": [
- {
- "type":
"object",
-
"description": "An host variable.",
-
"additionalProperties": false,
-
"properties": {
-
"variable": {
-
"type": "string",
-
"description": "Name of the host variable."
-
},
-
"file": {
-
"type": "string",
-
"description": "Path of the existing values for this variable."
-
}
- }
- },
- {
- "type":
"object",
-
"description": "An host variable.",
-
"additionalProperties": false,
-
"properties": {
-
"variable": {
-
"type": "string",
-
"description": "Name of the host variable."
-
},
-
"file": {
-
"type": "string",
-
"description": "Path of the existing values for this variable."
-
}
- }
- },
- {
- "type":
"object",
-
"description": "An host variable.",
-
"additionalProperties": false,
-
"properties": {
-
"variable": {
-
"type": "string",
-
"description": "Name of the host variable."
-
},
-
"file": {
-
"type": "string",
-
"description": "Path of the existing values for this variable."
-
}
+ "items": {
+ "type":
"object",
+ "description":
"An host variable.",
+
"additionalProperties": false,
+ "required":
["variable"],
+ "properties": {
+
"variable": {
+
"type": "string",
+
"description": "Name of the host variable."
+ },
+ "file":
{
+
"type": "string",
+
"description": "Path of the existing values for this variable."
}
}
- ]
+ }
},
"suffix": {
"type": "string",
@@ -88,118 +58,40 @@
"type": "array",
"description": "List of
configuration files.",
"additionalItems":
false,
- "items": [
- {
- "type":
"object",
-
"description": "A configuration file.",
-
"additionalProperties": false,
-
"properties": {
-
"file": {
-
"type": "string",
-
"description": "Path of the configuration file."
-
},
-
"key": {
-
"type": "string",
-
"description": "Pattern of the of the key.",
-
"pattern": "^(default|\\*|[a-z$*-]+)$"
-
},
-
"default": {
-
"type": "string",
-
"description": "Default key.",
-
"pattern": "^[a-z$*-]+$"
-
},
-
"exec": {
-
"type": "boolean",
-
"description": "This file must be directly.",
-
"enum": [true]
-
}
- }
- },
- {
- "type":
"object",
-
"description": "A configuration file.",
-
"additionalProperties": false,
-
"properties": {
-
"file": {
-
"type": "string",
-
"description": "Path of the configuration file."
-
},
-
"key": {
-
"type": "string",
-
"description": "Pattern of the of the key.",
-
"pattern": "^(default|\\*|[a-z$*-]+)$"
-
},
-
"default": {
-
"type": "string",
-
"description": "Default key.",
-
"pattern": "^[a-z$*-]+$"
-
},
-
"exec": {
-
"type": "boolean",
-
"description": "This file must be directly.",
-
"enum": [true]
-
}
- }
- },
- {
- "type":
"object",
-
"description": "A configuration file.",
-
"additionalProperties": false,
-
"properties": {
-
"file": {
-
"type": "string",
-
"description": "Path of the configuration file."
-
},
-
"key": {
-
"type": "string",
-
"description": "Pattern of the of the key.",
-
"pattern": "^(default|\\*|[a-z$*-]+)$"
-
},
-
"default": {
-
"type": "string",
-
"description": "Default key.",
-
"pattern": "^[a-z$*-]+$"
-
},
-
"exec": {
-
"type": "boolean",
-
"description": "This file must be directly.",
-
"enum": [true]
-
}
- }
- },
- {
- "type":
"object",
-
"description": "A configuration file.",
-
"additionalProperties": false,
-
"properties": {
-
"file": {
-
"type": "string",
-
"description": "Path of the configuration file."
-
},
-
"key": {
-
"type": "string",
-
"description": "Pattern of the of the key.",
-
"pattern": "^(default|\\*|[a-z$*-]+)$"
-
},
-
"default": {
-
"type": "string",
-
"description": "Default key.",
-
"pattern": "^[a-z$*-]+$"
-
},
-
"exec": {
-
"type": "boolean",
-
"description": "This file must be directly.",
-
"enum": [true]
-
}
+ "items": {
+ "type":
"object",
+ "description":
"A configuration file.",
+
"additionalProperties": false,
+ "required":
["file"],
+ "properties": {
+ "file":
{
+
"type": "string",
+
"description": "Path of the configuration file."
+ },
+ "key": {
+
"type": "string",
+
"description": "Pattern of the of the key.",
+
"pattern": "^(default|\\*|[a-z$*-]+)$"
+ },
+
"default": {
+
"type": "string",
+
"description": "Default key.",
+
"pattern": "^[a-z$-]+$"
+ },
+ "exec":
{
+
"type": "boolean",
+
"description": "This file must be directly.",
+
"enum": [true]
}
}
- ]
+ }
}
}
},
{
"type": "object",
"additionalProperties": false,
+ "required": ["redirect"],
"properties": {
"redirect": {
"type": "string",
--
To view, visit https://gerrit.wikimedia.org/r/299396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5111ae4efcab1e73f2494c75a50f6be4b10ee7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
