haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(gcloud): lazily read active gcloud config (#2592) 

* refactor(gcloud): lazily read active config once

* refactor(gcloud): wrap gcloud config with `GcloudContext`
This commit is contained in:
Dario Vladović 2021-04-23 08:27:53 +02:00 committed by GitHub
parent ee92c2b575
commit 4fda947cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/modules/gcloud.rs
View File

@ -1,125 +1,110 @@
use std::fs::File; use once_cell::sync::OnceCell;
use std::io::{BufRead, BufReader, Error, ErrorKind}; use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
use std::str::FromStr;
use std::{collections::HashMap, path::Path};
use super::{Context, Module, RootModuleConfig}; use super::{Context, Module, RootModuleConfig};
use crate::configs::gcloud::GcloudConfig; use crate::configs::gcloud::GcloudConfig;
use crate::formatter::StringFormatter; use crate::formatter::StringFormatter;
use crate::utils;
type Account = String; struct GcloudContext {
type Project = String; config_name: String,
type Region = String; config_path: PathBuf,
type Active = String; config: OnceCell<String>,
}
fn get_gcloud_account_from_config(current_config: &Path) -> Option<Account> { impl GcloudContext {
let file = File::open(&current_config).ok()?; pub fn new(config_name: &str, config_path: &Path) -> Self {
let reader = BufReader::new(file); Self {
let lines = reader.lines().filter_map(Result::ok); config_name: config_name.to_string(),
let account_line = lines config_path: PathBuf::from(config_path),
.skip_while(|line| line != "[core]") config: Default::default(),
}
}
fn get_config(&self) -> Option<&str> {
let config = self
.config
.get_or_try_init(|| utils::read_file(&self.config_path));
match config {
Ok(data) => Some(data),
Err(_) => None,
}
}
pub fn get_account(&self) -> Option<String> {
let config = self.get_config()?;
let account_line = config
.lines()
.skip_while(|line| *line != "[core]")
.skip(1) .skip(1)
.take_while(|line| !line.starts_with('[')) .take_while(|line| !line.starts_with('['))
.find(|line| line.starts_with("account"))?; .find(|line| line.starts_with("account"))?;
let account = account_line.split('=').nth(1)?.trim(); let account = account_line.splitn(2, '=').nth(1)?.trim();
Some(account.to_string()) Some(account.to_string())
} }
fn get_gcloud_project_from_config(current_config: &Path) -> Option<Project> { pub fn get_project(&self) -> Option<String> {
let file = File::open(&current_config).ok()?; let config = self.get_config()?;
let reader = BufReader::new(file); let project_line = config
let lines = reader.lines().filter_map(Result::ok); .lines()
let project_line = lines .skip_while(|line| *line != "[core]")
.skip_while(|line| line != "[core]")
.skip(1) .skip(1)
.take_while(|line| !line.starts_with('[')) .take_while(|line| !line.starts_with('['))
.find(|line| line.starts_with("project"))?; .find(|line| line.starts_with("project"))?;
let project = project_line.split('=').nth(1)?.trim(); let project = project_line.splitn(2, '=').nth(1)?.trim();
Some(project.to_string()) Some(project.to_string())
} }
fn get_gcloud_region_from_config(current_config: &Path) -> Option<Region> { pub fn get_region(&self) -> Option<String> {
let file = File::open(&current_config).ok()?; let config = self.get_config()?;
let reader = BufReader::new(file); let region_line = config
let lines = reader.lines().filter_map(Result::ok); .lines()
let region_line = lines .skip_while(|line| *line != "[compute]")
.skip_while(|line| line != "[compute]")
.skip(1) .skip(1)
.take_while(|line| !line.starts_with('[')) .take_while(|line| !line.starts_with('['))
.find(|line| line.starts_with("region"))?; .find(|line| line.starts_with("region"))?;
let region = region_line.split('=').nth(1)?.trim(); let region = region_line.splitn(2, '=').nth(1)?.trim();
Some(region.to_string()) Some(region.to_string())
}
fn get_active_config(context: &Context, config_root: &Path) -> Option<String> {
let config_name = context.get_env("CLOUDSDK_ACTIVE_CONFIG_NAME").or_else(|| {
let path = config_root.join("active_config");
let file = File::open(&path).ok()?;
let reader = BufReader::new(file);
let first_line = match reader.lines().next() {
Some(res) => res,
None => Err(Error::new(ErrorKind::NotFound, "empty")),
};
match first_line {
Ok(c) => Some(c),
Err(_) => None,
} }
})?;
Some(config_name)
} }
fn get_current_config_path(context: &Context) -> Option<PathBuf> { fn get_current_config(context: &Context) -> Option<(String, PathBuf)> {
let config_dir = get_config_dir(context)?; let config_dir = get_config_dir(context)?;
let active_config = get_active_config(context, &config_dir)?; let name = get_active_config(context, &config_dir)?;
let current_config = config_dir.join(format!("configurations/config_{}", active_config)); let path = config_dir
Some(current_config) .join("configurations")
.join(format!("config_{}", name));
Some((name, path))
} }
fn get_config_dir(context: &Context) -> Option<PathBuf> { fn get_config_dir(context: &Context) -> Option<PathBuf> {
let config_dir = context context
.get_env("CLOUDSDK_CONFIG") .get_env("CLOUDSDK_CONFIG")
.and_then(|path| PathBuf::from_str(&path).ok()) .map(PathBuf::from)
.or_else(|| { .or_else(|| {
let mut home = context.get_home()?; let home = context.get_home()?;
home.push(".config/gcloud"); Some(home.join(".config").join("gcloud"))
Some(home) })
})?;
Some(config_dir)
} }
fn alias_region(region: String, aliases: &HashMap<String, &str>) -> String { fn get_active_config(context: &Context, config_dir: &Path) -> Option<String> {
match aliases.get(&region) { context.get_env("CLOUDSDK_ACTIVE_CONFIG_NAME").or_else(|| {
None => region.to_string(), let path = config_dir.join("active_config");
Some(alias) => (*alias).to_string(), match utils::read_file(path) {
Ok(data) => data.lines().next().map(String::from),
Err(_) => None,
} }
})
} }
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let mut module = context.new_module("gcloud"); let mut module = context.new_module("gcloud");
let config: GcloudConfig = GcloudConfig::try_load(module.config); let config: GcloudConfig = GcloudConfig::try_load(module.config);
let config_path = get_current_config_path(context)?; let (config_name, config_path) = get_current_config(context)?;
let gcloud_account = get_gcloud_account_from_config(&config_path); let gcloud_context = GcloudContext::new(&config_name, &config_path);
let gcloud_project = get_gcloud_project_from_config(&config_path);
let gcloud_region = get_gcloud_region_from_config(&config_path);
let config_dir = get_config_dir(context)?;
let gcloud_active: Option<Active> = get_active_config(context, &config_dir);
if gcloud_account.is_none()
&& gcloud_project.is_none()
&& gcloud_region.is_none()
&& gcloud_active.is_none()
{
return None;
}
let mapped_region = if let Some(gcloud_region) = gcloud_region {
Some(alias_region(gcloud_region, &config.region_aliases))
} else {
None
};
let parsed = StringFormatter::new(config.format).and_then(|formatter| { let parsed = StringFormatter::new(config.format).and_then(|formatter| {
formatter formatter
@ -132,10 +117,19 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
_ => None, _ => None,
}) })
.map(|variable| match variable { .map(|variable| match variable {
"account" => gcloud_account.as_ref().map(Ok), "account" => gcloud_context.get_account().map(Ok),
"project" => gcloud_project.as_ref().map(Ok), "region" => gcloud_context
"region" => mapped_region.as_ref().map(Ok), .get_region()
"active" => gcloud_active.as_ref().map(Ok), .map(|region| {
config
.region_aliases
.get(&region)
.map(|alias| (*alias).to_owned())
.unwrap_or(region)
})
.map(Ok),
"project" => gcloud_context.get_project().map(Ok),
"active" => Some(Ok(gcloud_context.config_name.to_owned())),
_ => None, _ => None,
}) })
.parse(None) .parse(None)
@ -169,10 +163,11 @@ mod tests {
active_config_file.write_all(b"default")?; active_config_file.write_all(b"default")?;
create_dir(dir.path().join("configurations"))?; create_dir(dir.path().join("configurations"))?;
let config_default_path = dir.path().join("configurations/config_default"); let config_default_path = dir.path().join("configurations").join("config_default");
let mut config_default_file = File::create(&config_default_path)?; let mut config_default_file = File::create(&config_default_path)?;
config_default_file.write_all( config_default_file.write_all(
b"[core] b"\
[core]
account = foo@example.com account = foo@example.com
", ",
)?; )?;
@ -197,10 +192,11 @@ account = foo@example.com
active_config_file.write_all(b"default")?; active_config_file.write_all(b"default")?;
create_dir(dir.path().join("configurations"))?; create_dir(dir.path().join("configurations"))?;
let config_default_path = dir.path().join("configurations/config_default"); let config_default_path = dir.path().join("configurations").join("config_default");
let mut config_default_file = File::create(&config_default_path)?; let mut config_default_file = File::create(&config_default_path)?;
config_default_file.write_all( config_default_file.write_all(
b"[core] b"\
[core]
account = foo@example.com account = foo@example.com
[compute] [compute]
@ -228,10 +224,11 @@ region = us-central1
active_config_file.write_all(b"default")?; active_config_file.write_all(b"default")?;
create_dir(dir.path().join("configurations"))?; create_dir(dir.path().join("configurations"))?;
let config_default_path = dir.path().join("configurations/config_default"); let config_default_path = dir.path().join("configurations").join("config_default");
let mut config_default_file = File::create(&config_default_path)?; let mut config_default_file = File::create(&config_default_path)?;
config_default_file.write_all( config_default_file.write_all(
b"[core] b"\
[core]
account = foo@example.com account = foo@example.com
[compute] [compute]
@ -283,10 +280,11 @@ region = us-central1
active_config_file.write_all(b"default")?; active_config_file.write_all(b"default")?;
create_dir(dir.path().join("configurations"))?; create_dir(dir.path().join("configurations"))?;
let config_default_path = dir.path().join("configurations/config_default"); let config_default_path = dir.path().join("configurations").join("config_default");
let mut config_default_file = File::create(&config_default_path)?; let mut config_default_file = File::create(&config_default_path)?;
config_default_file.write_all( config_default_file.write_all(
b"[core] b"\
[core]
project = abc project = abc
", ",
)?; )?;
@ -328,18 +326,20 @@ project = abc
active_config_file.write_all(b"default")?; active_config_file.write_all(b"default")?;
create_dir(dir.path().join("configurations"))?; create_dir(dir.path().join("configurations"))?;
let config_default_path = dir.path().join("configurations/config_default"); let config_default_path = dir.path().join("configurations").join("config_default");
let mut config_default_file = File::create(&config_default_path)?; let mut config_default_file = File::create(&config_default_path)?;
config_default_file.write_all( config_default_file.write_all(
b"[core] b"\
[core]
project = default project = default
", ",
)?; )?;
let config_overridden_path = dir.path().join("configurations/config_overridden"); let config_overridden_path = dir.path().join("configurations").join("config_overridden");
let mut config_overridden_file = File::create(&config_overridden_path)?; let mut config_overridden_file = File::create(&config_overridden_path)?;
config_overridden_file.write_all( config_overridden_file.write_all(
b"[core] b"\
[core]
project = overridden project = overridden
", ",
)?; )?;