proxmoxve: don't read user-data file twice when checking header

coreos · Jun 13, 2024 · 668bbe3 · 668bbe3
1 parent d480893
commit 668bbe3
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/providers/proxmoxve/cloudconfig.rs b/src/providers/proxmoxve/cloudconfig.rs
@@ -11,7 +11,6 @@ use slog_scope::warn;
 use std::{
     collections::HashMap,
     fs::File,
-    io::{BufRead, BufReader},
     net::{AddrParseError, IpAddr},
     path::Path,
     str::FromStr,
@@ -82,14 +81,12 @@ pub struct ProxmoxVECloudNetworkConfigSubnet {
 
 impl ProxmoxVECloudConfig {
     pub fn try_new(path: &Path) -> Result<Self> {
-        let user_data_file = BufReader::new(File::open(path.join("user-data"))?);
         let mut user_data = None;
+        let raw_user_data = std::fs::read_to_string(path.join("user-data"))?;
 
-        if let Some(first_line) = user_data_file.lines().next() {
-            if let Ok(first_line) = first_line {
-                if first_line.starts_with("#cloud-config") {
-                    user_data = serde_yaml::from_reader(File::open(path.join("user-data"))?)?;
-                }
+        if let Some(first_line) = raw_user_data.split('\n').next() {
+            if first_line.starts_with("#cloud-config") {
+                user_data = serde_yaml::from_str(&raw_user_data)?;
             }
         }