fix: align config schemas to data model.

Author: outofcoffee

docs/rate_limiting.md

@@ -157,10 +157,9 @@ concurrency:
 
   - threshold: 5
     response:
-      delay:
-        range:
-          min: 500
-          max: 2000  # Random delay between 0.5-2 seconds
+      delay: # Random delay between 0.5-2 seconds
+        min: 500
+        max: 2000
       statusCode: 200
       content: "Heavily throttled"
 ```

examples/rest/rate-limiting/README.md

@@ -90,9 +90,8 @@ resources:
           "processingTime": "normal"
         }
       delay:
-        range:
-          min: 100
-          max: 500
+        min: 100
+        max: 500
       headers:
         Content-Type: application/json
 

examples/rest/rate-limiting/imposter-config.yaml

@@ -114,9 +114,8 @@ resources:
           "status": "success"
         }
       delay:
-        range:
-          min: 100
-          max: 500
+        min: 100
+        max: 500
       headers:
         Content-Type: application/json
 
@@ -211,9 +210,8 @@ resources:
           "status": "success"
         }
       delay:
-        range:
-          min: 50
-          max: 200
+        min: 50
+        max: 200
       headers:
         Content-Type: application/json
 
@@ -250,9 +248,8 @@ resources:
           "estimatedTime": "5-10 seconds"
         }
       delay:
-        range:
-          min: 5000
-          max: 10000
+        min: 5000
+        max: 10000
       headers:
         Content-Type: application/json
 

examples/rest/steps/imposter-config.yaml

@@ -63,6 +63,6 @@ resources:
             expression: "${remote.response.body.id}"
 
     response:
-      content: User created with ID: ${stores.request.userId}
+      content: "User created with ID: ${stores.request.userId}"
       statusCode: 201
-      template: true 
+      template: true

tools/validate_config/current-format-schema.json

@@ -4,15 +4,19 @@
     "definitions": {
         "currentFormat": {
             "type": "object",
-            "required": ["plugin", "resources"],
+            "required": ["plugin"],
             "properties": {
                 "plugin": {
                     "type": "string",
-                    "enum": ["rest", "soap", "hbase", "openapi"]
+                    "enum": ["rest", "soap", "hbase", "openapi", "oidc-server", "swaggerui"]
                 },
                 "basePath": {
                     "type": "string"
                 },
+                "specFile": {
+                    "description": "OpenAPI specification file (YAML or JSON)",
+                    "type": "string"
+                },
                 "wsdlFile": {
                     "type": "string"
                 },
@@ -71,7 +75,13 @@
                         }
                     },
                     "additionalProperties": false
-                }
+                },
+                "config": {
+                    "type": "object",
+                    "description": "Plugin-specific configuration block for external plugins",
+                    "additionalProperties": true
+                },
+                "validation": { "$ref": "shared-definitions.json#/definitions/validation" }
             },
             "additionalProperties": false
         }

tools/validate_config/legacy-format-schema.json

@@ -9,15 +9,17 @@
                 {
                     "required": ["resources"],
                     "not": {
-                        "required": ["response", "path", "method", "contentType"]
+                        "required": ["response", "path", "method", "contentType", "specFile", "wsdlFile"]
                     }
                 },
                 {
                     "anyOf": [
                         { "required": ["response"] },
                         { "required": ["path"] },
                         { "required": ["method"] },
-                        { "required": ["contentType"] }
+                        { "required": ["contentType"] },
+                        { "required": ["specFile"] },
+                        { "required": ["wsdlFile"] }
                     ],
                     "not": {
                         "required": ["resources"]
@@ -32,6 +34,10 @@
                 "basePath": {
                     "type": "string"
                 },
+                "specFile": {
+                    "description": "OpenAPI specification file (YAML or JSON)",
+                    "type": "string"
+                },
                 "wsdlFile": {
                     "type": "string"
                 },
@@ -99,6 +105,12 @@
                 "contentType": { 
                     "type": "string",
                     "description": "[DEPRECATED] Please use response.headers['Content-Type'] instead. This property will be removed in a future version."
+                },
+                "validation": { "$ref": "shared-definitions.json#/definitions/validation" },
+                "config": {
+                    "type": "object",
+                    "description": "Plugin-specific configuration block for external plugins",
+                    "additionalProperties": true
                 }
             }
         }

tools/validate_config/shared-definitions.json

@@ -161,6 +161,41 @@
                 }
             },
             "additionalProperties": true
+        },
+        "validation": {
+            "type": "object",
+            "description": "OpenAPI request/response validation configuration",
+            "properties": {
+                "request": {
+                    "oneOf": [
+                        { "type": "boolean" },
+                        { 
+                            "type": "string", 
+                            "enum": ["fail", "log", "ignore", "true", "false"] 
+                        }
+                    ],
+                    "description": "Enable/disable request validation against OpenAPI spec"
+                },
+                "response": {
+                    "oneOf": [
+                        { "type": "boolean" },
+                        { 
+                            "type": "string", 
+                            "enum": ["fail", "log", "ignore", "true", "false"] 
+                        }
+                    ],
+                    "description": "Enable/disable response validation against OpenAPI spec"
+                },
+                "levels": {
+                    "type": "object",
+                    "description": "Map of validation keys to log levels",
+                    "additionalProperties": {
+                        "type": "string",
+                        "enum": ["ERROR", "WARN"]
+                    }
+                }
+            },
+            "additionalProperties": false
         }
     }
 } 

tools/validate_config/validate_configs.py

@@ -37,7 +37,8 @@ def validate_config_file(file_path, schema):
     """Validate a single config file against the schema."""
     try:
         with open(file_path, 'r') as f:
-            config = yaml.safe_load(f)
+            # Handle multi-document YAML files
+            documents = list(yaml.safe_load_all(f))
 
             # Create a resolver that can handle references to other schema files
             schema_dir = Path(__file__).parent.resolve()
@@ -64,9 +65,30 @@ def custom_uri_handler(uri):
                 handlers={'': custom_uri_handler}
             )
 
-            Draft7Validator(schema, resolver=resolver).validate(config)
-            print(f"✓ {file_path} - Valid")
-            return True
+            validator = Draft7Validator(schema, resolver=resolver)
+            
+            # Validate each document
+            all_valid = True
+            for i, config in enumerate(documents):
+                if config is None:  # Skip empty documents
+                    continue
+                try:
+                    validator.validate(config)
+                except ValidationError as e:
+                    print(f"✗ {file_path} - Document {i+1} Invalid:")
+                    print(f"  Error: {e.message}")
+                    print(f"  Path: {' -> '.join(str(p) for p in e.path)}")
+                    all_valid = False
+            
+            if all_valid:
+                doc_count = len([d for d in documents if d is not None])
+                if doc_count > 1:
+                    print(f"✓ {file_path} - Valid ({doc_count} documents)")
+                else:
+                    print(f"✓ {file_path} - Valid")
+                return True
+            return False
+            
     except ValidationError as e:
         print(f"✗ {file_path} - Invalid:")
         print(f"  Error: {e.message}")