From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Fri, 2 Oct 2020 16:31:59 +0000 (+0200)
Subject: BUG/MINOR: stats: fix validity of the json schema
X-Git-Tag: v2.3-dev6~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a53ce4cc011250a0e561f4e5bb62f46719813534;p=thirdparty%2Fhaproxy.git

BUG/MINOR: stats: fix validity of the json schema

The json schema seems to be invalid when checking using the validator
from https://www.jsonschemavalidator.net/. Correct it using the
following specification :
http://json-schema.org/draft/2019-09/json-schema-validation.html#rfc.section.9.1

The impact of the bug it not well known as I am not sure of how useful
the json schema is for users. It is probably not used at all or else
this bug would have been reported.

This should be backported up to 1.8.
---

diff --git a/src/stats.c b/src/stats.c
index 38cac0cb93..c306bfcef3 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -3579,9 +3579,9 @@ static void stats_dump_json_schema(struct buffer *out)
 			"\"title\":\"Info\","
 			"\"type\":\"array\","
 			"\"items\":{"
+			 "\"title\":\"InfoItem\","
+			 "\"type\":\"object\","
 			 "\"properties\":{"
-			  "\"title\":\"InfoItem\","
-			  "\"type\":\"object\","
 			  "\"field\":{\"$ref\":\"#/definitions/field\"},"
 			  "\"processNum\":{\"$ref\":\"#/definitions/processNum\"},"
 			  "\"tags\":{\"$ref\":\"#/definitions/tags\"},"
@@ -3626,9 +3626,9 @@ static void stats_dump_json_schema(struct buffer *out)
 			"\"properties\":{"
 			 "\"errorStr\":{"
 			  "\"type\":\"string\""
-			 "},"
-			 "\"required\":[\"errorStr\"]"
-			"}"
+			 "}"
+			"},"
+			"\"required\":[\"errorStr\"]"
 		       "}"
 		      "],"
 		      "\"definitions\":{"