all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-offline-mirror 2/3] cli: extract subscription key helper
Date: Fri, 16 Sep 2022 12:35:34 +0200	[thread overview]
Message-ID: <20220916103535.103013-3-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20220916103535.103013-1-f.gruenbichler@proxmox.com>

for re-use in the (not-yet-created) create-all command.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 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<Option<SubscriptionKey>, Error> {
+    if let Some(product) = &mirror.use_subscription {
+        let subscriptions: Vec<SubscriptionKey> = 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<SubscriptionKey> =
-            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(&section_config, &config)?;
 
     proxmox_offline_mirror::mirror::create_snapshot(
         config,
-- 
2.30.2





  parent reply	other threads:[~2022-09-16 10:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-16 10:35 [pve-devel] [PATCH proxmox-offline-mirror 0/3] --dry-run / create-all additions Fabian Grünbichler
2022-09-16 10:35 ` [pve-devel] [PATCH proxmox-offline-mirror 1/3] mirror: add --dry-run parameter Fabian Grünbichler
2022-09-16 10:35 ` Fabian Grünbichler [this message]
2022-09-16 10:35 ` [pve-devel] [PATCH proxmox-offline-mirror 3/3] cli: add `mirror snapshot create-all` command Fabian Grünbichler
2022-09-16 12:31 ` [pve-devel] applied-series: [PATCH proxmox-offline-mirror 0/3] --dry-run / create-all additions Thomas Lamprecht

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=20220916103535.103013-3-f.gruenbichler@proxmox.com \
    --to=f.gruenbichler@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal