From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E627A933A2 for ; Fri, 16 Sep 2022 12:35:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D94E922902 for ; Fri, 16 Sep 2022 12:35:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 16 Sep 2022 12:35:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 301604447D for ; Fri, 16 Sep 2022 12:35:46 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 16 Sep 2022 12:35:34 +0200 Message-Id: <20220916103535.103013-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220916103535.103013-1-f.gruenbichler@proxmox.com> References: <20220916103535.103013-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.150 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mirror.rs] Subject: [pve-devel] [PATCH proxmox-offline-mirror 2/3] cli: extract subscription key helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Sep 2022 10:35:46 -0000 for re-use in the (not-yet-created) create-all command. Signed-off-by: Fabian Grünbichler --- src/bin/proxmox_offline_mirror_cmds/mirror.rs | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/src/bin/proxmox_offline_mirror_cmds/mirror.rs b/src/bin/proxmox_offline_mirror_cmds/mirror.rs index 0798f86..4503971 100644 --- a/src/bin/proxmox_offline_mirror_cmds/mirror.rs +++ b/src/bin/proxmox_offline_mirror_cmds/mirror.rs @@ -1,5 +1,6 @@ use anyhow::{format_err, Error}; +use proxmox_section_config::SectionConfigData; use proxmox_subscription::SubscriptionStatus; use serde_json::Value; @@ -17,6 +18,33 @@ use proxmox_offline_mirror::{ use super::get_config_path; +fn get_subscription_key( + config: &SectionConfigData, + mirror: &MirrorConfig, +) -> Result, Error> { + if let Some(product) = &mirror.use_subscription { + let subscriptions: Vec = config.convert_to_typed_array("subscription")?; + let key = subscriptions + .iter() + .find(|key| { + if let Ok(Some(info)) = key.info() { + info.status == SubscriptionStatus::Active && key.product() == *product + } else { + false + } + }) + .ok_or_else(|| { + format_err!( + "Need matching active subscription key for product {product}, but none found." + ) + })? + .clone(); + Ok(Some(key)) + } else { + Ok(None) + } +} + #[api( input: { properties: { @@ -49,28 +77,7 @@ async fn create_snapshot( let (section_config, _digest) = proxmox_offline_mirror::config::config(&config)?; let config: MirrorConfig = section_config.lookup("mirror", &id)?; - let subscription = if let Some(product) = &config.use_subscription { - let subscriptions: Vec = - section_config.convert_to_typed_array("subscription")?; - let key = subscriptions - .iter() - .find(|key| { - if let Ok(Some(info)) = key.info() { - info.status == SubscriptionStatus::Active && key.product() == *product - } else { - false - } - }) - .ok_or_else(|| { - format_err!( - "Need matching active subscription key for product {product}, but none found." - ) - })? - .clone(); - Some(key) - } else { - None - }; + let subscription = get_subscription_key(§ion_config, &config)?; proxmox_offline_mirror::mirror::create_snapshot( config, -- 2.30.2