Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-06-07 02:50:47 +00:00
Code Issues Releases Activity

fix(aws): support official AWS_SHARED_CREDENTIALS_FILE variable (#4242)

Browse Source 
* fix(aws): use AWS_SHARED_CREDENTIALS_FILE instead

Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>

* fix tests & keep support for older variant

Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
Co-authored-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
This commit is contained in:
David Knaack 2022-08-11 07:48:22 +02:00 committed by GitHub
parent 53c1093528
commit 1390036882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/aws.rs
View File

@ -19,7 +19,8 @@ type AwsCredsFile = OnceCell<Option<Ini>>;
fn get_credentials_file_path(context: &Context) -> Option<PathBuf> {
context
.get_env("AWS_CREDENTIALS_FILE")
.get_env("AWS_SHARED_CREDENTIALS_FILE")
.or_else(|| context.get_env("AWS_CREDENTIALS_FILE"))
.and_then(|path| PathBuf::from_str(&path).ok())
.or_else(|| {
let mut home = context.get_home()?;
@ -428,7 +429,7 @@ mod tests {
assert!(ModuleRenderer::new("aws")
.env(
"AWS_CREDENTIALS_FILE",
"AWS_SHARED_CREDENTIALS_FILE",
config_path.to_string_lossy().as_ref(),
)
.collect()
@ -667,6 +668,15 @@ expiration={}
)?;
let actual = ModuleRenderer::new("aws")
.env("AWS_PROFILE", "astronauts")
.env("AWS_REGION", "ap-northeast-2")
.env(
"AWS_SHARED_CREDENTIALS_FILE",
credentials_path.to_string_lossy().as_ref(),
)
.collect();
let actual_variant = ModuleRenderer::new("aws")
.env("AWS_PROFILE", "astronauts")
.env("AWS_REGION", "ap-northeast-2")
.env(
@ -675,6 +685,11 @@ expiration={}
)
.collect();
assert_eq!(
actual, actual_variant,
"both AWS_SHARED_CREDENTIALS_FILE and AWS_CREDENTIALS_FILE should work"
);
// In principle, "30m" should be correct. However, bad luck in scheduling
// on shared runners may delay it. Allow for up to 2 seconds of delay.
let possible_values = ["30m", "29m59s", "29m58s"];
@ -830,7 +845,7 @@ aws_secret_access_key=dummy
.env("AWS_PROFILE", "astronauts")
.env("AWS_REGION", "ap-northeast-2")
.env(
"AWS_CREDENTIALS_FILE",
"AWS_SHARED_CREDENTIALS_FILE",
credentials_path.to_string_lossy().as_ref(),
)
.collect();