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 9D5451FF15C for ; Wed, 21 Aug 2024 11:41:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 53B0115F5C; Wed, 21 Aug 2024 11:40:44 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 21 Aug 2024 11:40:18 +0200 Message-ID: <20240821094023.667806-17-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240821094023.667806-1-c.heiss@proxmox.com> References: <20240821094023.667806-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH installer v3 16/20] auto-installer: answer: factor out answer file reading into function 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Christoph Heiss --- Changes v2 -> v3: * new patch, split out from later patch proxmox-auto-installer/src/answer.rs | 16 +++++++++++++++- .../src/bin/proxmox-auto-installer.rs | 11 +---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs index d691da1..bada8a5 100644 --- a/proxmox-auto-installer/src/answer.rs +++ b/proxmox-auto-installer/src/answer.rs @@ -1,10 +1,11 @@ +use anyhow::{format_err, Result}; use clap::ValueEnum; use proxmox_installer_common::{ options::{BtrfsRaidLevel, FsType, ZfsChecksumOption, ZfsCompressOption, ZfsRaidLevel}, utils::{CidrAddress, Fqdn}, }; use serde::{Deserialize, Serialize}; -use std::{collections::BTreeMap, net::IpAddr}; +use std::{collections::BTreeMap, io::BufRead, net::IpAddr}; // BTreeMap is used to store filters as the order of the filters will be stable, compared to // storing them in a HashMap @@ -18,6 +19,19 @@ pub struct Answer { pub disks: Disks, } +impl Answer { + pub fn try_from_reader(reader: impl BufRead) -> Result { + let mut buffer = String::new(); + let lines = reader.lines(); + for line in lines { + buffer.push_str(&line.unwrap()); + buffer.push('\n'); + } + + toml::from_str(&buffer).map_err(|err| format_err!("Failed parsing answer file: {err}")) + } +} + #[derive(Clone, Deserialize, Debug)] #[serde(deny_unknown_fields)] pub struct Global { diff --git a/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs b/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs index bf6f8fb..b29228f 100644 --- a/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs +++ b/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs @@ -42,16 +42,7 @@ fn auto_installer_setup(in_test_mode: bool) -> Result<(Answer, UdevInfo)> { .map_err(|err| format_err!("Failed to retrieve udev info details: {err}"))? }; - let mut buffer = String::new(); - let lines = std::io::stdin().lock().lines(); - for line in lines { - buffer.push_str(&line.unwrap()); - buffer.push('\n'); - } - - let answer: Answer = - toml::from_str(&buffer).map_err(|err| format_err!("Failed parsing answer file: {err}"))?; - + let answer = Answer::try_from_reader(std::io::stdin().lock())?; Ok((answer, udev_info)) } -- 2.45.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel