From 0a8a4fe75e78fa9c98759156c81ab8df414c19c7 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 22 Feb 2019 17:17:05 -0800 Subject: [PATCH] registration: Fix 'ResourceLoaderWikiModule' schema validation There is a full schema for ResourceModules when the class: ResourceLoaderWikiModule is used. Except it doesn't actually work, since it it fails validating against that schema, it will continue to check the other anyOf schemas, find the arbitrary class one, and pass that one. Blacklisting ResourceLoaderWikiModule from the arbitrary class schema means that it has to pass the specified schema for it, or fail validation. I verified that all extensions and skins in Gerrit pass validation with this patch. Change-Id: Icb862088c0ca1f89ed5a57a4286dd9049d213021 --- docs/extension.schema.v1.json | 2 +- docs/extension.schema.v2.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json index 2174ddb3b5..8cd4e711c0 100644 --- a/docs/extension.schema.v1.json +++ b/docs/extension.schema.v1.json @@ -347,7 +347,7 @@ "properties": { "class": { "type": "string", - "pattern": "^(?!ResourceLoader(File|Image)Module).*$" + "pattern": "^(?!ResourceLoader(File|Image|Wiki)Module).*$" } }, "required": ["class"] diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json index d634f703a0..1d64095a46 100644 --- a/docs/extension.schema.v2.json +++ b/docs/extension.schema.v2.json @@ -356,7 +356,7 @@ "properties": { "class": { "type": "string", - "pattern": "^(?!ResourceLoader(File|Image)Module).*$" + "pattern": "^(?!ResourceLoader(File|Image|Wiki)Module).*$" } }, "required": ["class"] -- 2.20.1