Fix config generator schema validation

qwc-services · Mar 5, 2024 · fdd51a0 · fdd51a0
1 parent 257b86e
commit fdd51a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/schemas/qwc-config-generator.json b/schemas/qwc-config-generator.json
@@ -147,7 +147,7 @@
       "type": "array",
       "items": {
         "description": "Generator config for a service",
-        "oneOf": [
+        "anyOf": [
           {"$ref": "#/definitions/common_service"},
           {"$ref": "#/definitions/mapViewer"},
           {"$ref": "#/definitions/ogc"}
@@ -156,7 +156,6 @@
     }
   },
   "required": [
-    "service",
     "themesConfig",
     "config",
     "services"

diff --git a/src/config_generator/config_generator.py b/src/config_generator/config_generator.py
@@ -277,14 +277,14 @@ def __init__(self, config, logger, config_file_dir):
         self.json_schemas_path = os.environ.get('JSON_SCHEMAS_PATH', '/tmp/')
 
         # validate config-generator JSON schema
-        self.logger.debug(f"Validate qwc-config-generator schema URL: {self.config.get('$schema', '')}")
-        if self.validate_schema(self.config, self.config.get('$schema', '')):
+        self.logger.debug("Validate qwc-config-generator schema URL")
+        if self.validate_schema(self.config, self.schema_urls["configGenerator"]):
             self.logger.debug(
-                "'%s' service config validates against schema" % self.config.get('service', '')
+                "qwc-config-generator config validates against schema"
             )
         else:
             self.logger.error(
-                "'%s' service config failed schema validation" % self.config.get('service', '')
+                "qwc-config-generator config failed schema validation"
             )
 
         # create service config handlers

diff --git a/src/schema-versions.json b/src/schema-versions.json
@@ -1,5 +1,9 @@
 {
   "schemas": [
+    {
+      "service": "configGenerator",
+      "schema_url": "https://github.com/qwc-services/qwc-config-generator/raw/master/schemas/qwc-config-generator.json"
+    },
     {
       "service": "adminGui",
       "schema_url": "https://github.com/qwc-services/qwc-admin-gui/raw/master/schemas/qwc-admin-gui.json"