From ae5a33df64d7bc5a2b96b45bec4df466c968eb97 Mon Sep 17 00:00:00 2001
From: --global <yuxz@amazon.com>
Date: Fri, 10 Apr 2026 13:07:51 -0400
Subject: [PATCH] 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.

Only [default] and [profile NAME] sections are matched, filtering out
[sso-session ...], [services ...], and other non-profile sections.

Falls back to AWS CLI if neither file is readable.

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

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 0c43031df..e6771a143 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -239,9 +239,31 @@ 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
 }
 
 function _aws_regions() {