public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Jakob Klocker <j.klocker@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [RFC pve-common v2 02/17] jsonschema: support 'patternProperties' and allow 'x-' keywords
Date: Mon, 20 Jul 2026 14:01:44 +0200	[thread overview]
Message-ID: <5b25fce3-23ab-4a95-9756-b153a23c41cc@proxmox.com> (raw)
In-Reply-To: <20260717154943.696411-3-m.carrara@proxmox.com>

comments inline

On 7/17/26 5:49 PM, Max R. Carrara wrote:
> by adding the necessary validation code before the
> `additionalProperties` handling in `check_object()` and extending the
> default schema (the schema for JSON schemas).
> 
> At the same time, allow all keywords beginning with 'x-' to be
> included in a given schema. This makes it possible specify custom
> extension keywords that can be used for e.g. hints, flags, and other
> things.
> 
> Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
> ---
> NOTE: This patch is experimental and thus marked as RFC.
> 
>  src/PVE/JSONSchema.pm    | 61 +++++++++++++++++++++++++++++++++++-----
>  test/json-schema-test.pl |  2 +-
>  2 files changed, 55 insertions(+), 8 deletions(-)
> 
> diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
> index 49f6aa6..1bfa5f6 100644
> --- a/src/PVE/JSONSchema.pm
> +++ b/src/PVE/JSONSchema.pm
> @@ -1073,6 +1073,9 @@ sub parse_property_string {
>      # In property strings we default to not allowing additional properties
>      $additional_properties = 0 if !defined($additional_properties);
> 
> +    # In property strings we do not allow pattern properties at all
> +    my $pattern_properties = 0;
> +
>      # Support named formats here, too:
>      my $validator;
>      if (!ref($format)) {
> @@ -1141,7 +1144,7 @@ sub parse_property_string {
>      }
> 
>      my $errors = {};
> -    check_object($path, $format, $res, $additional_properties, $errors);
> +    check_object($path, $format, $res, $pattern_properties, $additional_properties, $errors);
>      if (scalar(%$errors)) {
>          raise "format error\n", errors => $errors;
>      }
> @@ -1294,7 +1297,7 @@ my sub get_instance_type {
>  }
> 
>  sub check_object {
> -    my ($path, $schema, $value, $additional_properties, $errors) = @_;
> +    my ($path, $schema, $value, $pattern_properties, $additional_properties, $errors) = @_;
> 
>      # print "Check Object " . Dumper($value) . "\nSchema: " . Dumper($schema);
> 
> @@ -1367,6 +1370,23 @@ sub check_object {
>              next if $matched_type; # value is already checked above
>          }
> 
> +        if (defined($pattern_properties) && $pattern_properties) {

checking if the variable is defined and then the variable itself seems
redundant - if `$pattern_properties` is undef the `if` check would be
false anyway
> +            my $has_err = 0;
> +            my $pattern_schema = undef;
> +
> +            for my $pattern (keys $pattern_properties->%*) {
> +                if ($k =~ $pattern) {
> +                    $pattern_schema = $pattern_properties->{$pattern};
> +                    last;
> +                }
> +            }
> +
> +            next if $has_err;

`$has_err` is initialized to 0 and never changed, so this next is dead
code. Was it meant to handle the case where no pattern matches $k?
> +
> +            check_prop($value->{$k}, $pattern_schema, $newpath, $errors);
> +            next;
> +        }
> +
>          if (defined($additional_properties) && !$additional_properties) {
>              add_error(
>                  $errors,
[snip]




  reply	other threads:[~2026-07-20 12:02 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-17 15:49 [PATCH common/manager/proxmox-widget-toolkit/storage v2 00/17] GUI Support for Custom Storage Plugins Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-common v2 01/17] json schema: add multiline string format Max R. Carrara
2026-07-17 15:49 ` [RFC pve-common v2 02/17] jsonschema: support 'patternProperties' and allow 'x-' keywords Max R. Carrara
2026-07-20 12:01   ` Jakob Klocker [this message]
2026-07-17 15:49 ` [PATCH pve-storage v2 03/17] api: plugins/storage: add initial routes and endpoints Max R. Carrara
2026-07-20 12:17   ` Jakob Klocker
2026-07-20 12:21   ` Jakob Klocker
2026-07-17 15:49 ` [PATCH pve-storage v2 04/17] api: plugins/storage/plugin: include schema in plugin metadata Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-storage v2 05/17] api: plugins/storage/plugin: mark sensitive properties in schema Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-storage v2 06/17] api: plugins/storage/plugin: factor plugin metadata code into helper Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-storage v2 07/17] api: plugins/storage/plugin: add plugins' 'content' to their metadata Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-storage v2 08/17] all plugins: add 'title' to properties, adapt 'description's Max R. Carrara
2026-07-17 15:49 ` [RFC pve-storage v2 09/17] plugin: mark 'preallocation' and 'content-dirs' properties as advanced Max R. Carrara
2026-07-17 15:49 ` [RFC pve-storage v2 10/17] plugin, dirplugin: mark certain properties as hidden Max R. Carrara
2026-07-17 15:49 ` [PATCH proxmox-widget-toolkit v2 11/17] form: introduce new 'proxmoxtextarea' field Max R. Carrara
2026-07-17 15:49 ` [PATCH proxmox-widget-toolkit v2 12/17] utils: introduce helper function getFieldDefFromPropertySchema Max R. Carrara
2026-07-17 15:49 ` [PATCH proxmox-widget-toolkit v2 13/17] acme: use helper to construct ExtJS fields from property schemas Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-manager v2 14/17] api: add API routes 'plugins' and 'plugins/storage' Max R. Carrara
2026-07-20 12:26   ` Jakob Klocker
2026-07-17 15:49 ` [PATCH pve-manager v2 15/17] ui: storage view: display error when no editor for storage type exists Max R. Carrara
2026-07-17 15:49 ` [PATCH pve-manager v2 16/17] ui: storage: add basic UI integration for custom storage plugins Max R. Carrara
2026-07-17 15:49 ` [RFC pve-manager v2 17/17] ui: storage: use property extension keywords for UI hints Max R. Carrara
2026-07-18 18:19 ` [PATCH common/manager/proxmox-widget-toolkit/storage v2 00/17] GUI Support for Custom Storage Plugins Ciro Iriarte
2026-07-21  9:24   ` Max R. Carrara
2026-07-20 12:48 ` Jakob Klocker
2026-07-21  9:09   ` Max R. Carrara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5b25fce3-23ab-4a95-9756-b153a23c41cc@proxmox.com \
    --to=j.klocker@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal