From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id DC0321FF14C for ; Fri, 29 May 2026 14:59:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 32FA3AE7B; Fri, 29 May 2026 14:58:59 +0200 (CEST) From: Erik Fastermann To: pve-devel@lists.proxmox.com Subject: [PATCH pve-common 1/3] json schema: display nested oneOf error messages Date: Fri, 29 May 2026 14:58:06 +0200 Message-ID: <20260529125808.204983-2-e.fastermann@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260529125808.204983-1-e.fastermann@proxmox.com> References: <20260529125808.204983-1-e.fastermann@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: ETCIJ666MZWUIRWEOWSLEKABSMH7DPK3 X-Message-ID-Hash: ETCIJ666MZWUIRWEOWSLEKABSMH7DPK3 X-MailFrom: efastermann@ruth.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Erik Fastermann X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Correctly display the error message for each oneOf case, not just the empty string. Signed-off-by: Erik Fastermann --- src/PVE/JSONSchema.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 1997c70..fd10338 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -1409,13 +1409,13 @@ sub check_prop { } for my $inner_path (keys $inner_errors->%*) { - add_error($collected_errors, $inner_path, $inner_errors->{$path}); + add_error($collected_errors, $inner_path, $inner_errors->{$inner_path}); } } if (!$is_valid) { for my $inner_path (keys $collected_errors->%*) { - add_error($errors, $inner_path, $collected_errors->{$path}); + add_error($errors, $inner_path, $collected_errors->{$inner_path}); } } } -- 2.47.3