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

feat(aws): Add support for profile from awsume (#2609)

This commit is contained in:
Andrew McClenaghan 2021-04-21 02:35:07 +10:00 committed by GitHub
parent 83c906457e
commit 8bf69cbaa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/config/README.md
View File

@ -257,6 +257,9 @@ is read from the `AWS_VAULT` env var.
When using [awsu](https://github.com/kreuzwerker/awsu) the profile When using [awsu](https://github.com/kreuzwerker/awsu) the profile
is read from the `AWSU_PROFILE` env var. is read from the `AWSU_PROFILE` env var.
When using [AWSume](https://awsu.me) the profile
is read from the `AWSUME_PROFILE` env var.
### Options ### Options
| Option | Default | Description | | Option | Default | Description |

16
src/modules/aws.rs
View File

@ -47,7 +47,7 @@ fn get_aws_region_from_config(context: &Context, aws_profile: Option<&str>) -> O
} }
fn get_aws_profile_and_region(context: &Context) -> (Option<Profile>, Option<Region>) { fn get_aws_profile_and_region(context: &Context) -> (Option<Profile>, Option<Region>) {
let profile_env_vars = vec!["AWSU_PROFILE", "AWS_VAULT", "AWS_PROFILE"]; let profile_env_vars = vec!["AWSU_PROFILE", "AWS_VAULT", "AWSUME_PROFILE", "AWS_PROFILE"];
let profile = profile_env_vars let profile = profile_env_vars
.iter() .iter()
.find_map(|env_var| context.get_env(env_var)); .find_map(|env_var| context.get_env(env_var));
@ -214,6 +214,20 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
#[test]
fn profile_set_from_awsume() {
let actual = ModuleRenderer::new("aws")
.env("AWSUME_PROFILE", "astronauts-awsume")
.env("AWS_PROFILE", "astronauts-profile")
.collect();
let expected = Some(format!(
"on {}",
Color::Yellow.bold().paint("☁️ astronauts-awsume ")
));
assert_eq!(expected, actual);
}
#[test] #[test]
fn profile_and_region_set() { fn profile_and_region_set() {
let actual = ModuleRenderer::new("aws") let actual = ModuleRenderer::new("aws")