move mount_parse_ovf_env to libazureinit/media

As mount_parse_ovf_env is a helper for media module, it makes sense
to move the function to libazureinit/media.

Author: dongsupark

libazureinit/Cargo.toml

@@ -20,6 +20,7 @@ serde_json = "1.0.96"
 nix = {version = "0.28.0", features = ["fs", "user"]}
 libc = "0.2.146"
 block-utils = "0.11.1"
+anyhow = "1.0.86"
 
 [dev-dependencies]
 tempfile = "3"

libazureinit/src/media.rs

@@ -9,6 +9,8 @@ use std::os::unix::fs::PermissionsExt;
 use std::path::PathBuf;
 use std::process::Command;
 
+use anyhow::Context;
+
 use serde::Deserialize;
 use serde_xml_rs::from_str;
 
@@ -187,6 +189,24 @@ pub fn parse_ovf_env(ovf_body: &str) -> Result<Environment, Error> {
     }
 }
 
+// Mount the given device, get OVF environment data, return it.
+pub fn mount_parse_ovf_env(dev: String) -> Result<Environment, anyhow::Error> {
+    let mount_media =
+        Media::new(PathBuf::from(dev), PathBuf::from(PATH_MOUNT_POINT));
+    let mounted = mount_media
+        .mount()
+        .with_context(|| "Failed to mount media.")?;
+
+    let ovf_body = mounted.read_ovf_env_to_string()?;
+    let environment = parse_ovf_env(ovf_body.as_str())?;
+
+    mounted
+        .unmount()
+        .with_context(|| "Failed to remove media.")?;
+
+    Ok(environment)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/main.rs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use std::path::PathBuf;
 use std::process::ExitCode;
 
 use anyhow::Context;
@@ -11,38 +10,20 @@ use libazureinit::imds::InstanceMetadata;
 use libazureinit::{
     error::Error as LibError,
     goalstate, imds, media,
-    media::{Environment, Media},
+    media::Environment,
     reqwest::{header, Client},
     user,
 };
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-// Mount the given device, get OVF environment data, return it.
-fn mount_parse_ovf_env(dev: String) -> Result<Environment, anyhow::Error> {
-    let mount_media =
-        Media::new(PathBuf::from(dev), PathBuf::from(media::PATH_MOUNT_POINT));
-    let mounted = mount_media
-        .mount()
-        .with_context(|| "Failed to mount media.")?;
-
-    let ovf_body = mounted.read_ovf_env_to_string()?;
-    let environment = media::parse_ovf_env(ovf_body.as_str())?;
-
-    mounted
-        .unmount()
-        .with_context(|| "Failed to remove media.")?;
-
-    Ok(environment)
-}
-
 fn get_environment() -> Result<Environment, anyhow::Error> {
     let ovf_devices = media::get_mount_device()?;
     let mut environment: Option<Environment> = None;
 
     // loop until it finds a correct device.
     for dev in ovf_devices {
-        environment = match mount_parse_ovf_env(dev) {
+        environment = match media::mount_parse_ovf_env(dev) {
             Ok(env) => Some(env),
             Err(_) => continue,
         }