proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-15 06:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JSONSchema: use validator in print_property_string too

Browse Source 
Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-06-25 13:35:40 +02:00 committed by Fabian Grünbichler
parent 70fdc0501b
commit d500c0381e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/PVE/JSONSchema.pm
View File

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