diff options
| author | nils måsén <nils@piksel.se> | 2021-03-13 09:35:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-13 09:35:50 +0100 |
| commit | e5cdd9c1b3c17ffcf5416c39bf95dbb556b4f90f (patch) | |
| tree | 7220791269402c95b4527f1d2f4a51dc34097cc9 | |
| parent | 69b9bf72c3380217d82cec863edb7db0f29e6862 (diff) | |
feat(aws): add support for getting profile from awsu (#2451)
| -rw-r--r-- | docs/config/README.md | 3 | ||||
| -rw-r--r-- | src/modules/aws.rs | 30 |
2 files changed, 25 insertions, 8 deletions
diff --git a/docs/config/README.md b/docs/config/README.md index 475981683..926e26dc0 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -249,6 +249,9 @@ The `aws` module shows the current AWS region and profile. This is based on When using [aws-vault](https://github.com/99designs/aws-vault) the profile is read from the `AWS_VAULT` env var. +When using [awsu](https://github.com/kreuzwerker/awsu) the profile +is read from the `AWSU_PROFILE` env var. + ### Options | Option | Default | Description | diff --git a/src/modules/aws.rs b/src/modules/aws.rs index 516a2d2ba..72a57f72e 100644 --- a/src/modules/aws.rs +++ b/src/modules/aws.rs @@ -47,14 +47,14 @@ 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>) { - match ( - context - .get_env("AWS_VAULT") - .or_else(|| context.get_env("AWS_PROFILE")), - context - .get_env("AWS_DEFAULT_REGION") - .or_else(|| context.get_env("AWS_REGION")), - ) { + let profile_env_vars = vec!["AWSU_PROFILE", "AWS_VAULT", "AWS_PROFILE"]; + let profile = profile_env_vars + .iter() + .find_map(|env_var| context.get_env(env_var)); + let region = context + .get_env("AWS_DEFAULT_REGION") + .or_else(|| context.get_env("AWS_REGION")); + match (profile, region) { (Some(p), Some(r)) => (Some(p), Some(r)), (None, Some(r)) => (None, Some(r)), (Some(ref p), None) => ( @@ -201,6 +201,20 @@ mod tests { } #[test] + fn profile_set_from_awsu() { + let actual = ModuleRenderer::new("aws") + .env("AWSU_PROFILE", "astronauts-awsu") + .env("AWS_PROFILE", "astronauts-profile") + .collect(); + let expected = Some(format!( + "on {}", + Color::Yellow.bold().paint("☁️ astronauts-awsu ") + )); + + assert_eq!(expected, actual); + } + + #[test] fn profile_and_region_set() { let actual = ModuleRenderer::new("aws") .env("AWS_PROFILE", "astronauts") |