From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 60F481FF146 for ; Tue, 23 Jun 2026 16:35:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A62834574; Tue, 23 Jun 2026 16:35:08 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage 05/13] api: plugins/storage/plugin: factor plugin metadata code into helper Date: Tue, 23 Jun 2026 16:33:22 +0200 Message-ID: <20260623143402.772452-6-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260623143402.772452-1-m.carrara@proxmox.com> References: <20260623143402.772452-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: 1782225241556 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.080 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: UF2BA4YX3UI5MZYHKKX326G4A5V3V3CP X-Message-ID-Hash: UF2BA4YX3UI5MZYHKKX326G4A5V3V3CP 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 reduce the number of places that need to be touched when adding more properties to the returned metadata. Signed-off-by: Max R. Carrara --- src/PVE/API2/Plugins/Storage/Plugin.pm | 35 +++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/PVE/API2/Plugins/Storage/Plugin.pm b/src/PVE/API2/Plugins/Storage/Plugin.pm index 757ae1e8..457c070d 100644 --- a/src/PVE/API2/Plugins/Storage/Plugin.pm +++ b/src/PVE/API2/Plugins/Storage/Plugin.pm @@ -65,6 +65,19 @@ my sub get_schema_for_plugin : prototype($) ($plugin) { return $schema; } +my sub build_plugin_metadata : prototype($) ($type) { + my $plugin = eval { PVE::Storage::Plugin->lookup($type) }; + if ($@) { + raise("Plugin '$type' not found - $@", code => HTTP_NOT_FOUND); + } + + return { + module => $plugin, + schema => get_schema_for_plugin($plugin), + type => $type, + }; +} + # plugins/storage/plugin __PACKAGE__->register_method({ @@ -87,14 +100,7 @@ __PACKAGE__->register_method({ my $result = []; for my $type ($ALL_PLUGIN_TYPES->@*) { - my $plugin = PVE::Storage::Plugin->lookup($type); - - my $item = { - module => $plugin, - schema => get_schema_for_plugin($plugin), - type => $type, - }; - + my $item = build_plugin_metadata($type); push($result->@*, $item); } @@ -124,18 +130,7 @@ __PACKAGE__->register_method({ code => sub($param) { my $param_type = extract_param($param, 'type'); - my $plugin = eval { PVE::Storage::Plugin->lookup($param_type) }; - if ($@) { - raise("Plugin '$param_type' not found - $@", code => HTTP_NOT_FOUND); - } - - my $result = { - module => $plugin, - schema => get_schema_for_plugin($plugin), - type => $param_type, - }; - - return $result; + return build_plugin_metadata($param_type); }, }); 1; -- 2.47.3