The default case for property names in TOML configuration files is de
facto snake_case. The answer file for the auto-installer adapted this,
but this causes inconsistencies with the property names in other Proxmox
config file formats, which are preferably in kebab-case.
To gradually migrate from snake_cased to kebab-cased property names in
answer files, allow both cases for the time being and deprecate the
snake_cased variant of all properties in a future major version.
Signed-off-by: Daniel Kral <d.k...@proxmox.com>
---
proxmox-auto-installer/src/answer.rs | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/proxmox-auto-installer/src/answer.rs
b/proxmox-auto-installer/src/answer.rs
index e8614d2..c834591 100644
--- a/proxmox-auto-installer/src/answer.rs
+++ b/proxmox-auto-installer/src/answer.rs
@@ -10,6 +10,9 @@ use proxmox_installer_common::{
use serde::{Deserialize, Serialize};
use std::{collections::BTreeMap, io::BufRead, net::IpAddr};
+// NOTE New answer file properties must use kebab-case, but should allow
snake_case for backwards
+// compatibility. TODO Remove the snake_cased variants in a future major
version (e.g. PVE 10).
+
// BTreeMap is used to store filters as the order of the filters will be
stable, compared to
// storing them in a HashMap
@@ -40,27 +43,30 @@ impl Answer {
}
#[derive(Clone, Deserialize, Debug)]
-#[serde(deny_unknown_fields)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct Global {
pub country: String,
pub fqdn: Fqdn,
pub keyboard: KeyboardLayout,
pub mailto: String,
pub timezone: String,
+ #[serde(alias = "root_password")]
pub root_password: Option<String>,
+ #[serde(alias = "root_password_hashed")]
pub root_password_hashed: Option<String>,
- #[serde(default)]
+ #[serde(alias = "reboot_on_error", default)]
pub reboot_on_error: bool,
- #[serde(default)]
+ #[serde(alias = "root_ssh_keys", default)]
pub root_ssh_keys: Vec<String>,
}
#[derive(Clone, Deserialize, Debug)]
-#[serde(deny_unknown_fields)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct PostNotificationHookInfo {
/// URL to send a POST request to
pub url: String,
/// SHA256 cert fingerprint if certificate pinning should be used.
+ #[serde(alias = "cert_fingerprint")]
pub cert_fingerprint: Option<String>,
}
@@ -209,12 +215,13 @@ pub struct NetworkManual {
}
#[derive(Clone, Debug, Deserialize)]
-#[serde(deny_unknown_fields)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct DiskSetup {
pub filesystem: Filesystem,
- #[serde(default)]
+ #[serde(alias = "disk_list", default)]
pub disk_list: Vec<String>,
pub filter: Option<BTreeMap<String, String>>,
+ #[serde(alias = "filter_match")]
pub filter_match: Option<FilterMatch>,
pub zfs: Option<ZfsOptions>,
pub lvm: Option<LvmOptions>,
@@ -330,10 +337,11 @@ pub enum Filesystem {
}
#[derive(Clone, Copy, Default, Deserialize, Debug)]
-#[serde(deny_unknown_fields)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct ZfsOptions {
pub raid: Option<ZfsRaidLevel>,
pub ashift: Option<usize>,
+ #[serde(alias = "arc_max")]
pub arc_max: Option<usize>,
pub checksum: Option<ZfsChecksumOption>,
pub compress: Option<ZfsCompressOption>,
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
