[PATCH proxmox/installer 0/2] fix auto-installer/post-hook after schema change

[PATCH proxmox/installer 0/2] fix auto-installer/post-hook after schema change

[Christoph Heiss]

This series adapts pve-installer to the schema change after commit

  4d7f57a12 ("installer-types: replace illegal oneOf schema")

in `proxmox`, which changed the `fqdn` field.

proxmox:

Christoph Heiss (1):
  installer-types: FqdnConfigContainer: implement AsRef into FqdnConfig

 proxmox-installer-types/src/answer.rs | 6 ++++++
 1 file changed, 6 insertions(+)

pve-installer:

Christoph Heiss (1):
  auto, post-hook: explicitly ref FqdnConfigContainer when `match`ing

 proxmox-auto-installer/src/utils.rs | 2 +-
 proxmox-post-hook/src/main.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[PATCH proxmox 1/2] installer-types: FqdnConfigContainer: implement AsRef into FqdnConfig

[Christoph Heiss]

Zero-cost, makes handling FqdnConfigContainer (especially `match`ing on
it) simpler for consumers.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 proxmox-installer-types/src/answer.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/proxmox-installer-types/src/answer.rs b/proxmox-installer-types/src/answer.rs
index a0ca620f..e2e9b8e4 100644
--- a/proxmox-installer-types/src/answer.rs
+++ b/proxmox-installer-types/src/answer.rs
@@ -300,6 +300,12 @@ impl From<FqdnConfig> for FqdnConfigContainer {
     }
 }
 
+impl AsRef<FqdnConfig> for FqdnConfigContainer {
+    fn as_ref(&self) -> &FqdnConfig {
+        &self.fqdn
+    }
+}
+
 impl From<FqdnConfigContainer> for FqdnConfig {
     fn from(fqdn: FqdnConfigContainer) -> Self {
         fqdn.fqdn
-- 
2.55.0

[PATCH installer 2/2] auto, post-hook: explicitly ref FqdnConfigContainer when `match`ing

[Christoph Heiss]

Adaps both crates/binaries to the schema change after commit

  4d7f57a12 ("installer-types: replace illegal oneOf schema")

in `proxmox`, which changed the `fqdn` field.

FqdnConfigContainer now implements AsRef<FqdnConfig>, so switch to that.

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Depends on the previous patch and needs an appropriate bump of the
proxmox-installer-types crate dependency.

 proxmox-auto-installer/src/utils.rs | 2 +-
 proxmox-post-hook/src/main.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs
index 710af21..7205ae3 100644
--- a/proxmox-auto-installer/src/utils.rs
+++ b/proxmox-auto-installer/src/utils.rs
@@ -40,7 +40,7 @@ fn get_network_settings(
         .interface_name_pinning()
         .map(|answer| answer.into());
 
-    let mut network_options = match &answer.global.fqdn {
+    let mut network_options = match answer.global.fqdn.as_ref() {
         // If the user set a static FQDN in the answer file, override it
         FqdnConfig::Simple(name) => {
             let mut opts = NetworkOptions::defaults_from(
diff --git a/proxmox-post-hook/src/main.rs b/proxmox-post-hook/src/main.rs
index ec9ab74..749fd0e 100644
--- a/proxmox-post-hook/src/main.rs
+++ b/proxmox-post-hook/src/main.rs
@@ -98,7 +98,7 @@ mod detail {
                 .and_then(|r| Ok(String::from_utf8(r.stdout)?))
         };
 
-        let fqdn = match &answer.global.fqdn {
+        let fqdn = match answer.global.fqdn.as_ref() {
             FqdnConfig::Simple(name) => name.to_string(),
             FqdnConfig::FromDhcp(FqdnFromDhcpConfig {
                 source: FqdnSourceMode::FromDhcp,
-- 
2.55.0