mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-05-22 04:51:12 +02:00
Merge b29e4db103 into a07126330b
This commit is contained in:
commit
4b9cc10740
1 changed files with 54 additions and 4 deletions
|
|
@ -42,7 +42,7 @@ function asp() {
|
|||
export AWS_PROFILE=$1
|
||||
export AWS_EB_PROFILE=$1
|
||||
|
||||
export AWS_PROFILE_REGION=$(aws configure get region)
|
||||
export AWS_PROFILE_REGION=$(_aws_get_profile_region "$1")
|
||||
|
||||
_aws_update_state
|
||||
|
||||
|
|
@ -239,9 +239,59 @@ function aws_regions() {
|
|||
}
|
||||
|
||||
function aws_profiles() {
|
||||
aws --no-cli-pager configure list-profiles 2> /dev/null && return
|
||||
[[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
|
||||
grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
|
||||
local config_file="${AWS_CONFIG_FILE:-$HOME/.aws/config}"
|
||||
local credentials_file="${AWS_SHARED_CREDENTIALS_FILE:-$HOME/.aws/credentials}"
|
||||
local profiles=()
|
||||
|
||||
# Parse config file: only match [default] and [profile ...] sections,
|
||||
# skipping [sso-session ...], [services ...], and other non-profile sections
|
||||
if [[ -r "$config_file" ]]; then
|
||||
profiles+=($(grep --color=never -E '^\[[ ]*(default|profile[ ]+)' "$config_file" \
|
||||
| sed -nE 's/^\[[ ]*(profile[ ]+)?([^]]+[^ ])[ ]*\]$/\2/p'))
|
||||
fi
|
||||
|
||||
# Parse credentials file (profiles have [name] format, no "profile" prefix)
|
||||
if [[ -r "$credentials_file" ]]; then
|
||||
profiles+=($(grep --color=never -Eo '\[.*\]' "$credentials_file" \
|
||||
| sed -nE 's/^[[:space:]]*\[([^[:space:]]+)[[:space:]]*\]$/\1/p'))
|
||||
fi
|
||||
|
||||
# Return unique profiles, or fall back to AWS CLI.
|
||||
# Note: profiles only visible via AWS CLI (e.g. config plugins, SSO) will
|
||||
# be missed when config files have entries. Intentional for performance.
|
||||
if [[ ${#profiles[@]} -gt 0 ]]; then
|
||||
printf '%s\n' "${profiles[@]}" | sort -u
|
||||
else
|
||||
aws --no-cli-pager configure list-profiles 2>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
# Fast region lookup by parsing config file directly, with fallback to AWS CLI
|
||||
function _aws_get_profile_region() {
|
||||
local profile="${1:-$AWS_PROFILE}"
|
||||
local config_file="${AWS_CONFIG_FILE:-$HOME/.aws/config}"
|
||||
local region=""
|
||||
|
||||
# Try fast config file parsing first
|
||||
if [[ -r "$config_file" ]]; then
|
||||
region=$(awk -v profile="$profile" '
|
||||
/^\[/ {
|
||||
in_profile = 0
|
||||
s = $0; sub(/^\[[ ]*/, "", s); sub(/[ ]*\].*/, "", s)
|
||||
if (profile == "default" ? (s == "default" || s == "profile default") \
|
||||
: sub(/^profile[ ]+/, "", s) && s == profile)
|
||||
in_profile = 1
|
||||
}
|
||||
in_profile && /^[ ]*region[ ]*=/ { sub(/^[ ]*region[ ]*=[ ]*/, ""); sub(/[ ]*$/, ""); print; exit }
|
||||
' "$config_file")
|
||||
fi
|
||||
|
||||
# Fallback to AWS CLI if fast method didn't find region
|
||||
if [[ -z "$region" ]]; then
|
||||
region=$(aws configure get region --profile "$profile" 2>/dev/null)
|
||||
fi
|
||||
|
||||
echo "$region"
|
||||
}
|
||||
|
||||
function _aws_regions() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue