From: Stefan Reiter <s.reiter@proxmox.com>
Date: Thu, 25 Jun 2020 11:35:40 +0000 (+0200)
Subject: JSONSchema: use validator in print_property_string too
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=d500c0381efc515b053fc3594ab3f45f11dea34b

JSONSchema: use validator in print_property_string too

Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---

diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
index de2261e..c5002d8 100644
--- a/src/PVE/JSONSchema.pm
+++ b/src/PVE/JSONSchema.pm
@@ -1897,9 +1897,12 @@ sub generate_typetext {
 sub print_property_string {
     my ($data, $format, $skip, $path) = @_;
 
+    my $validator;
     if (ref($format) ne 'HASH') {
 	my $schema = get_format($format);
 	die "not a valid format: $format\n" if !$schema;
+	# named formats can have validators attached
+	$validator = $format_validators->{$format};
 	$format = $schema;
     }
 
@@ -1909,6 +1912,8 @@ sub print_property_string {
 	raise "format error", errors => $errors;
     }
 
+    $data = $validator->($data) if $validator;
+
     my ($default_key, $keyAliasProps) = &$find_schema_default_key($format);
 
     my $res = '';