From 6f27d734c807dc510163649c47881a4f11a4f673 Mon Sep 17 00:00:00 2001
From: Yu Xiang Zhang <yuxz@amazon.com>
Date: Fri, 23 Jan 2026 17:09:39 -0500
Subject: [PATCH 1/2] perf(aws): speed up aws_profiles by parsing config files
 directly

Parse ~/.aws/config and ~/.aws/credentials directly instead of invoking
`aws configure list-profiles`, which has significant startup overhead
due to the Python-based AWS CLI.

Falls back to AWS CLI if neither file is readable.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 plugins/aws/aws.plugin.zsh | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 0c43031df..a1932cba0 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -239,9 +239,30 @@ 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: match [default], [profile name], but not [sso-session ...] etc.
+  # Pattern handles optional whitespace around brackets and profile keyword
+  if [[ -r "$config_file" ]]; then
+    profiles+=($(grep --color=never -Eo '\[.*\]' "$config_file" \
+      | sed -nE 's/^[[:space:]]*\[(profile[[:space:]]+)?([^[:space:]]+)[[:space:]]*\]$/\2/p' \
+      | grep -v '^sso-session$'))
+  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
+  if [[ ${#profiles[@]} -gt 0 ]]; then
+    printf '%s\n' "${profiles[@]}" | sort -u
+  else
+    aws --no-cli-pager configure list-profiles 2>/dev/null
+  fi
 }
 
 function _aws_regions() {

From b3fe6c2880f952397e2bd3274745d6746b398476 Mon Sep 17 00:00:00 2001
From: Yu Xiang Zhang <yuxz@amazon.com>
Date: Fri, 23 Jan 2026 17:10:30 -0500
Subject: [PATCH 2/2] perf(aws): speed up asp region lookup by parsing config
 file directly

Add `_aws_get_profile_region` helper that parses ~/.aws/config directly
instead of invoking `aws configure get region`, which has significant
startup overhead due to the Python-based AWS CLI.

Falls back to AWS CLI if the fast method doesn't find a region.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 plugins/aws/aws.plugin.zsh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index a1932cba0..feb33b8bc 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -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
 
@@ -265,6 +265,28 @@ function aws_profiles() {
   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 ~ "\\[(profile )?[ ]*"profile"[ ]*\\]") }
+      in_profile && /^[ ]*region[ ]*=/ { gsub(/^[ ]*region[ ]*=[ ]*/, ""); gsub(/[ ]*$/, ""); 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() {
   reply=($(aws_regions))
 }