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

style(aws): Add spacing between profile and region (#2417) 

and also after the symbol when using the Nerd font glyph.
This commit is contained in:
Eric Nielsen 2021-03-06 14:47:06 -05:00 committed by GitHub
parent 7385dc27a9
commit fb6cefa4b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/config/README.md
View File

@ -253,7 +253,7 @@ is read from the `AWS_VAULT` env var.
| Option | Default | Description |
| ---------------- | ---------------------------------------------- | --------------------------------------------------------------- |
| `format` | `'on [$symbol$profile(\($region\))]($style) '` | The format for the module. |
| `format` | `'on [$symbol($profile )(\($region\) )]($style)'` | The format for the module. |
| `symbol` | `"☁️ "` | The symbol used before displaying the current AWS profile. |
| `region_aliases` | | Table of region aliases to display in addition to the AWS name. |
| `style` | `"bold yellow"` | The style for the module. |
@ -278,7 +278,7 @@ is read from the `AWS_VAULT` env var.
# ~/.config/starship.toml
[aws]
format = 'on [$symbol$profile(\($region\))]($style) '
format = 'on [$symbol($profile )(\($region\) )]($style)'
style = "bold blue"
symbol = "🅰 "
[aws.region_aliases]

2
docs/presets/README.md
View File

@ -18,7 +18,7 @@ If emojis aren't your thing, this might catch your eye!
```toml
[aws]
symbol = " "
symbol = " "
[conda]
symbol = " "

2
src/configs/aws.rs
View File

@ -14,7 +14,7 @@ pub struct AwsConfig<'a> {
impl<'a> RootModuleConfig<'a> for AwsConfig<'a> {
fn new() -> Self {
AwsConfig {
format: "on [$symbol$profile(\\($region\\))]($style) ",
format: "on [$symbol($profile )(\\($region\\) )]($style)",
symbol: "☁️ ",
style: "bold yellow",
disabled: false,

46
src/modules/aws.rs
View File

@ -138,8 +138,8 @@ mod tests {
.env("AWS_REGION", "ap-northeast-2")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ (ap-northeast-2)")
"on {}",
Color::Yellow.bold().paint("☁️ (ap-northeast-2) ")
));
assert_eq!(expected, actual);
@ -154,7 +154,7 @@ mod tests {
ap-southeast-2 = "au"
})
.collect();
let expected = Some(format!("on {} ", Color::Yellow.bold().paint("☁️ (au)")));
let expected = Some(format!("on {}", Color::Yellow.bold().paint("☁️ (au) ")));
assert_eq!(expected, actual);
}
@ -166,8 +166,8 @@ mod tests {
.env("AWS_DEFAULT_REGION", "ap-northeast-1")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ (ap-northeast-1)")
"on {}",
Color::Yellow.bold().paint("☁️ (ap-northeast-1) ")
));
assert_eq!(expected, actual);
@ -179,8 +179,8 @@ mod tests {
.env("AWS_PROFILE", "astronauts")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ astronauts")
"on {}",
Color::Yellow.bold().paint("☁️ astronauts ")
));
assert_eq!(expected, actual);
@ -193,8 +193,8 @@ mod tests {
.env("AWS_PROFILE", "astronauts-profile")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ astronauts-vault")
"on {}",
Color::Yellow.bold().paint("☁️ astronauts-vault ")
));
assert_eq!(expected, actual);
@ -207,8 +207,10 @@ mod tests {
.env("AWS_REGION", "ap-northeast-2")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ astronauts(ap-northeast-2)")
"on {}",
Color::Yellow
.bold()
.paint("☁️ astronauts (ap-northeast-2) ")
));
assert_eq!(expected, actual);
@ -234,8 +236,8 @@ region = us-east-2
.env("AWS_CONFIG_FILE", config_path.to_string_lossy().as_ref())
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ (us-east-1)")
"on {}",
Color::Yellow.bold().paint("☁️ (us-east-1) ")
));
assert_eq!(expected, actual);
@ -266,8 +268,8 @@ region = us-east-2
})
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ astronauts(us-east-2)")
"on {}",
Color::Yellow.bold().paint("☁️ astronauts (us-east-2) ")
));
assert_eq!(expected, actual);
@ -281,8 +283,10 @@ region = us-east-2
.env("AWS_REGION", "ap-northeast-1")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ astronauts(ap-northeast-1)")
"on {}",
Color::Yellow
.bold()
.paint("☁️ astronauts (ap-northeast-1) ")
));
assert_eq!(expected, actual);
@ -294,8 +298,8 @@ region = us-east-2
.env("AWS_PROFILE", "astronauts")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ astronauts")
"on {}",
Color::Yellow.bold().paint("☁️ astronauts ")
));
assert_eq!(expected, actual);
@ -307,8 +311,8 @@ region = us-east-2
.env("AWS_REGION", "ap-northeast-1")
.collect();
let expected = Some(format!(
"on {} ",
Color::Yellow.bold().paint("☁️ (ap-northeast-1)")
"on {}",
Color::Yellow.bold().paint("☁️ (ap-northeast-1) ")
));
assert_eq!(expected, actual);