Merge upstream/master

[aws] Update AWS prompt when ACCESS_KEY is present
prompt: update powerlevel10k submodule to v1.14.6
2021-03-05 17:06:54 +01:00 · 2021-03-05 17:06:47 +01:00 · 2021-01-19 11:11:27 -08:00 · 2021-01-05 08:20:35 -08:00
2 changed files with 6 additions and 6 deletions
--- a/modules/aws/functions/aws-info
+++ b/modules/aws/functions/aws-info
@ -14,14 +14,14 @@ unset aws_info
 typeset -gA aws_info

 if (( ${+AWS_SECRET_ACCESS_KEY} )); then
-  aws_prompt='ACCESS_KEY'
+  aws_prompt="${AWS_PROFILE}  "
 elif (( ${+AWS_PROFILE} )); then
    aws_prompt=$AWS_PROFILE
+fi

-    if (( ${+AWS_DEFAULT_REGION} )) && [[ ${_aws_region} = "true" ]]; then
-      AWS_REGION=$(cut -d "-" -f 1 <<<$AWS_DEFAULT_REGION | cut -b 1)$(cut -d "-" -f 2 <<<$AWS_DEFAULT_REGION | cut -b 1)$(cut -d "-" -f 3 <<<$AWS_DEFAULT_REGION | cut -b 1)
-      aws_region_prompt=" $AWS_REGION"
-    fi
+if (( ${+AWS_DEFAULT_REGION} )) && [[ ${_aws_region} = "true" ]]; then
+  AWS_REGION=$(cut -d "-" -f 1 <<<$AWS_DEFAULT_REGION | cut -b 1)$(cut -d "-" -f 2 <<<$AWS_DEFAULT_REGION | cut -b 1)$(cut -d "-" -f 3 <<<$AWS_DEFAULT_REGION | cut -b 1)
+  aws_region_prompt=" $AWS_REGION"
 fi

 if (( ${+AWS_SECRET_ACCESS_KEY} )) || (( ${+AWS_DEFAULT_REGION} )); then
--- a/modules/prompt/external/powerlevel10k
+++ b/modules/prompt/external/powerlevel10k
@ -1 +1 @@
-Subproject commit b9b3399b354e64bac631eb700cc4570d91fdb0da
+Subproject commit d26bdcd6010cfe82bc7bab07e4363b40be834cc8
Author	SHA1	Message	Date
Daniel Carrillo	c005e87859	Merge upstream/master	2021-03-05 17:06:54 +01:00
Daniel Carrillo	667fba697e	[aws] Update AWS prompt when ACCESS_KEY is present	2021-03-05 17:06:47 +01:00
Roman Perepelitsa	704fc46c3f	prompt: update powerlevel10k submodule to v1.14.6 Release notes: - https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.6	2021-01-19 11:11:27 -08:00
Roman Perepelitsa	c43d483d47	prompt: update powerlevel10k submodule to v1.14.5 Release notes: - https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.5	2021-01-05 08:20:35 -08:00