From 59449915cb7b32bd6f064e1895f33117524f65d9 Mon Sep 17 00:00:00 2001
From: Will Jordan <will@code.org>
Date: Thu, 12 May 2016 10:43:06 -0700
Subject: [PATCH] Fix get_elb_list function when looking up from ELB

---
 load-balancing/elb/common_functions.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/load-balancing/elb/common_functions.sh b/load-balancing/elb/common_functions.sh
index 7ee6dbe..d24c43d 100644
--- a/load-balancing/elb/common_functions.sh
+++ b/load-balancing/elb/common_functions.sh
@@ -404,16 +404,9 @@ get_elb_list() {
 
     if [ -z "${asg_name}" ]; then
         msg "Instance is not part of an ASG. Looking up from ELB."
-        local all_balancers=$($AWS_CLI elb describe-load-balancers \
-            --query LoadBalancerDescriptions[*].LoadBalancerName \
-            --output text | sed -e $'s/\t/ /g')
-        for elb in $all_balancers; do
-            local instance_health
-            instance_health=$(get_instance_health_elb $instance_id $elb)
-            if [ $? == 0 ]; then
-                elb_list="$elb_list $elb"
-            fi
-        done
+        elb_list=$($AWS_CLI elb describe-load-balancers \
+            --query 'LoadBalancerDescriptions[].[LoadBalancerName,Instances[].InstanceId]' \
+            --output text | grep $instance_id | awk '{ORS=" ";print $1}')
     else
         elb_list=$($AWS_CLI autoscaling describe-auto-scaling-groups \
             --auto-scaling-group-names "${asg_name}" \