Skip to content

split out mount/OVF logic into get_environment #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dongsu Park (dongsupark) merged 2 commits into from
May 30, 2024
Merged

split out mount/OVF logic into get_environment #84

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d631c59
split out mount/OVF logic into get_environment
dongsupark May 17, 2024
a5319ef
move mount_parse_ovf_env to libazureinit/media
dongsupark May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,25 @@ fn mount_parse_ovf_env(dev: String) -> Result<Environment, anyhow::Error> {
Ok(environment)
}

fn get_environment() -> Result<Environment, anyhow::Error> {
Comment thread
jeremycline marked this conversation as resolved.
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) {
Ok(env) => Some(env),
Err(_) => continue,
}
}

environment
.ok_or_else(|| anyhow::anyhow!("Unable to get list of block devices"))
}

fn get_username(
instance_metadata: &InstanceMetadata,
environment: &Environment,
) -> Result<String, anyhow::Error> {
if instance_metadata
.compute
Expand All @@ -49,22 +66,8 @@ fn get_username(
} else {
// password authentication is enabled

// list of CDROM devices that is available with possible filesystems.
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) {
Ok(env) => Some(env),
Err(_) => continue,
}
}

Ok(environment
.ok_or_else(|| {
anyhow::anyhow!("Unable to get list of block devices")
})?
.clone()
.provisioning_section
.linux_prov_conf_set
.username)
Expand Down Expand Up @@ -103,7 +106,7 @@ async fn provision() -> Result<(), anyhow::Error> {
.build()?;

let instance_metadata = imds::query(&client).await?;
let username = get_username(&instance_metadata)?;
let username = get_username(&instance_metadata, &get_environment()?)?;

let mut file_path = "/home/".to_string();
file_path.push_str(username.as_str());
Expand Down