From d500c0381efc515b053fc3594ab3f45f11dea34b Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Thu, 25 Jun 2020 13:35:40 +0200 Subject: [PATCH] JSONSchema: use validator in print_property_string too MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Suggested-by: Fabian Grünbichler Signed-off-by: Stefan Reiter --- src/PVE/JSONSchema.pm | 5 +++++ 1 file changed, 5 insertions(+) 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 = ''; -- 2.39.2