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 564711FF13B for ; Wed, 22 Apr 2026 13:17:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EADD71889A; Wed, 22 Apr 2026 13:14:40 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v1 33/54] plugin: use parsing helper in parse_volume_id sub Date: Wed, 22 Apr 2026 13:12:59 +0200 Message-ID: <20260422111322.257380-34-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260422111322.257380-1-m.carrara@proxmox.com> References: <20260422111322.257380-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776856350910 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: Y7GGDK7MPT23ROW7WNP7AS64FLUGHM36 X-Message-ID-Hash: Y7GGDK7MPT23ROW7WNP7AS64FLUGHM36 X-MailFrom: m.carrara@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 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In order to avoid having multiple subroutines do (sort of) the same thing, use the `parse_volid_as_parts()` parsing function inside the `parse_volume_id()` plugin API sub. Signed-off-by: Max R. Carrara --- src/PVE/Storage/Plugin.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 65e0869b..3853682b 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -22,6 +22,7 @@ use PVE::Storage::Common qw( use PVE::Storage::Common::Parse qw( parse_volname_as_parts parse_path_as_volid_parts + parse_volid_as_parts ); use JSON; @@ -428,8 +429,8 @@ PVE::JSONSchema::register_format('pve-volume-id', \&parse_volume_id); sub parse_volume_id { my ($volid, $noerr) = @_; - if ($volid =~ m/^([a-z][a-z0-9\-\_\.]*[a-z0-9]):(.+)$/i) { - return wantarray ? ($1, $2) : $1; + if (defined(my $parts = parse_volid_as_parts($volid))) { + return wantarray ? ($parts->{storeid}, $parts->{volname}) : $parts->{storeid}; } return undef if $noerr; die "unable to parse volume ID '$volid'\n"; -- 2.47.3