summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew McClenaghan <andymac4182@users.noreply.github.com>2021-04-21 02:35:07 +1000
committerGitHub <noreply@github.com>2021-04-20 18:35:07 +0200
commit8bf69cbaa894adfc87925f40d26777c7e8152566 (patch)
tree0fbbf2ed700fa5256cc3e7209829da6b714909ff
parent83c906457e06a68061637868626fc0ab0e1d2753 (diff)
feat(aws): Add support for profile from awsume (#2609)
-rw-r--r--docs/config/README.md3
-rw-r--r--src/modules/aws.rs16
2 files changed, 18 insertions, 1 deletions
diff --git a/docs/config/README.md b/docs/config/README.md
index 643867c6c..3d93396f0 100644
--- a/docs/config/README.md
+++ b/docs/config/README.md
@@ -257,6 +257,9 @@ 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.
+When using [AWSume](https://awsu.me) the profile
+is read from the `AWSUME_PROFILE` env var.
+
### Options
| Option | Default | Description |
diff --git a/src/modules/aws.rs b/src/modules/aws.rs
index 72a57f72e..637ecc7fc 100644
--- a/src/modules/aws.rs
+++ b/src/modules/aws.rs
@@ -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>) {
- 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
.iter()
.find_map(|env_var| context.get_env(env_var));
@@ -215,6 +215,20 @@ mod tests {
}
#[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]
fn profile_and_region_set() {
let actual = ModuleRenderer::new("aws")
.env("AWS_PROFILE", "astronauts")