Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-28 15:56:28 +00:00
Code Issues Releases Activity

feat(gcloud): honor CLOUDSDK_CORE_PROJECT env variable (#2596)

Browse Source 
Co-authored-by: Filip Bachul <filip.b@masterborn.com>
This commit is contained in:
Dario Vladović 2021-04-30 08:13:51 +02:00 committed by GitHub
parent 65cbd2093c
commit d242d40db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/modules/gcloud.rs
View File

@ -128,7 +128,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
.unwrap_or(region)
})
.map(Ok),
"project" => gcloud_context.get_project().map(Ok),
"project" => context
.get_env("CLOUDSDK_CORE_PROJECT")
.or_else(|| gcloud_context.get_project())
.map(Ok),
"active" => Some(Ok(gcloud_context.config_name.to_owned())),
_ => None,
})
@ -302,6 +305,40 @@ project = abc
dir.close()
}
#[test]
fn project_set_in_env() -> io::Result<()> {
let dir = tempfile::tempdir()?;
let active_config_path = dir.path().join("active_config");
let mut active_config_file = File::create(&active_config_path)?;
active_config_file.write_all(b"default")?;
create_dir(dir.path().join("configurations"))?;
let config_default_path = dir.path().join("configurations").join("config_default");
let mut config_default_file = File::create(&config_default_path)?;
config_default_file.write_all(
b"\
[core]
project = abc
",
)?;
let actual = ModuleRenderer::new("gcloud")
.env("CLOUDSDK_CORE_PROJECT", "env_project")
.env("CLOUDSDK_CONFIG", dir.path().to_string_lossy())
.config(toml::toml! {
[gcloud]
format = "on [$symbol$project]($style) "
})
.collect();
let expected = Some(format!(
"on {} ",
Color::Blue.bold().paint("☁️ env_project")
));
assert_eq!(actual, expected);
dir.close()
}
#[test]
fn region_not_set_with_display_region() -> io::Result<()> {
let dir = tempfile::tempdir()?;