浏览代码

fix(aws): pass default region to fetch regions (#12175)

Co-authored-by: Gauthier Delacroix <no@email.com>
Gauthier Delacroix 1 年之前
父节点
当前提交
e195c7cb43
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10 1
      plugins/aws/aws.plugin.zsh

+ 10 - 1
plugins/aws/aws.plugin.zsh

@@ -202,8 +202,17 @@ function aws_change_access_key() {
 }
 }
 
 
 function aws_regions() {
 function aws_regions() {
+  local region
+  if [[ $AWS_DEFAULT_REGION ]];then
+      region="$AWS_DEFAULT_REGION"
+  elif [[ $AWS_REGION ]];then
+      region="$AWS_REGION"
+  else
+      region="us-west-1"
+  fi
+
   if [[ $AWS_DEFAULT_PROFILE || $AWS_PROFILE ]];then
   if [[ $AWS_DEFAULT_PROFILE || $AWS_PROFILE ]];then
-    aws ec2 describe-regions |grep RegionName | awk -F ':' '{gsub(/"/, "", $2);gsub(/,/, "", $2);gsub(/ /, "", $2);  print $2}'
+    aws ec2 describe-regions --region $region |grep RegionName | awk -F ':' '{gsub(/"/, "", $2);gsub(/,/, "", $2);gsub(/ /, "", $2);  print $2}'
   else
   else
     echo "You must specify a AWS profile."
     echo "You must specify a AWS profile."
   fi
   fi