From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 01FB81FF16F
for <inbox@lore.proxmox.com>; Tue, 29 Apr 2025 15:21:28 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A9A95E3B3;
Tue, 29 Apr 2025 15:21:32 +0200 (CEST)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 29 Apr 2025 15:20:24 +0200
Message-ID: <20250429132025.1543199-2-c.heiss@proxmox.com>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250429132025.1543199-1-c.heiss@proxmox.com>
References: <20250429132025.1543199-1-c.heiss@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.029 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
Subject: [pve-devel] [PATCH installer 2/2] auto: answer: simplify `BTreeMap`
handling in deserialization
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Instead of using an `Option<BTreeMap<..>>`, we can use a `BTreeMap`
directly and let serde default to an empty map.
No functional changes.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
proxmox-auto-installer/src/answer.rs | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs
index cbf268d..f785d89 100644
--- a/proxmox-auto-installer/src/answer.rs
+++ b/proxmox-auto-installer/src/answer.rs
@@ -186,7 +186,8 @@ struct NetworkInAnswer {
pub cidr: Option<CidrAddress>,
pub dns: Option<IpAddr>,
pub gateway: Option<IpAddr>,
- pub filter: Option<BTreeMap<String, String>>,
+ #[serde(default)]
+ pub filter: BTreeMap<String, String>,
}
#[derive(Clone, Deserialize, Debug)]
@@ -209,7 +210,7 @@ impl TryFrom<NetworkInAnswer> for Network {
if network.gateway.is_none() {
return Err("Field 'gateway' must be set.");
}
- if network.filter.is_none() {
+ if network.filter.is_empty() {
return Err("Field 'filter' must be set.");
}
@@ -218,7 +219,7 @@ impl TryFrom<NetworkInAnswer> for Network {
cidr: network.cidr.unwrap(),
dns: network.dns.unwrap(),
gateway: network.gateway.unwrap(),
- filter: network.filter.unwrap(),
+ filter: network.filter,
}),
})
} else {
@@ -231,7 +232,7 @@ impl TryFrom<NetworkInAnswer> for Network {
if network.gateway.is_some() {
return Err("Field 'gateway' not supported for 'from-dhcp' config.");
}
- if network.filter.is_some() {
+ if !network.filter.is_empty() {
return Err("Field 'filter' not supported for 'from-dhcp' config.");
}
@@ -262,7 +263,8 @@ pub struct DiskSetup {
pub filesystem: Filesystem,
#[serde(alias = "disk_list", default)]
pub disk_list: Vec<String>,
- pub filter: Option<BTreeMap<String, String>>,
+ #[serde(default)]
+ pub filter: BTreeMap<String, String>,
#[serde(alias = "filter_match")]
pub filter_match: Option<FilterMatch>,
pub zfs: Option<ZfsOptions>,
@@ -283,17 +285,17 @@ impl TryFrom<DiskSetup> for Disks {
type Error = &'static str;
fn try_from(source: DiskSetup) -> Result<Self, Self::Error> {
- if source.disk_list.is_empty() && source.filter.is_none() {
- return Err("Need either 'disk_list' or 'filter' set");
+ if source.disk_list.is_empty() && source.filter.is_empty() {
+ return Err("Need either 'disk-list' or 'filter' set");
}
- if !source.disk_list.is_empty() && source.filter.is_some() {
- return Err("Cannot use both, 'disk_list' and 'filter'");
+ if !source.disk_list.is_empty() && !source.filter.is_empty() {
+ return Err("Cannot use both, 'disk-list' and 'filter'");
}
let disk_selection = if !source.disk_list.is_empty() {
DiskSelection::Selection(source.disk_list.clone())
} else {
- DiskSelection::Filter(source.filter.clone().unwrap())
+ DiskSelection::Filter(source.filter.clone())
};
let lvm_checks = |source: &DiskSetup| -> Result<(), Self::Error> {
--
2.49.0
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel