Merge pull request #4535 from helgi/aws-query

ref(aws): Improve AWS queries instead of piping output.

Author: mboersma

contrib/aws/check

@@ -15,9 +15,7 @@ function check-elb-service {
     rigger-log "Waiting for ELB (${elb_name}) to see an instance in InService..."
     IN_SERVICE=$(aws elb describe-instance-health \
                          --load-balancer-name "${elb_name}" \
-                         --query 'InstanceStates[].State' \
-                 | grep InService \
-                 | wc -l)
+                         --query 'length(InstanceStates[?State==`InService`])')
   done
 }
 

contrib/aws/provision-aws-cluster.sh

@@ -122,28 +122,27 @@ aws ec2 describe-instances \
     $EXTRA_AWS_CLI_ARGS
 
 # get ELB public DNS name through cloudformation
-# TODO: is "first output value" going to be reliable enough?
 export ELB_DNS_NAME=$(aws cloudformation describe-stacks \
     --stack-name $STACK_NAME \
     --max-items 1 \
-    --query 'Stacks[].[ Outputs[0].[ OutputValue ] ]' \
+    --query 'Stacks[].[ Outputs[?OutputKey==`DNSName`].OutputValue ] ]' \
     --output=text \
     $EXTRA_AWS_CLI_ARGS)
 
 # get ELB friendly name through aws elb
 ELB_NAME=$(aws elb describe-load-balancers \
-    --query 'LoadBalancerDescriptions[].[ DNSName,LoadBalancerName ]' \
+    --query "LoadBalancerDescriptions[?DNSName=='$ELB_DNS_NAME'].[ LoadBalancerName ]" \
     --output=text \
-    $EXTRA_AWS_CLI_ARGS | grep -F $ELB_DNS_NAME | head -n1 | cut -f2)
+    $EXTRA_AWS_CLI_ARGS)
 echo "Using ELB $ELB_NAME at $ELB_DNS_NAME"
 
 # Instance launched into a VPC may not have a PublicIPAddress
 for ip_type in PublicIpAddress PrivateIpAddress; do
     FIRST_INSTANCE=$(aws ec2 describe-instances \
         --filters Name=tag:aws:cloudformation:stack-name,Values=$STACK_NAME Name=instance-state-name,Values=running \
-        --query "Reservations[].Instances[].[$ip_type]" \
+        --query "Reservations[].Instances[].[$ip_type][0]" \
         --output text \
-        $EXTRA_AWS_CLI_ARGS | head -1)
+        $EXTRA_AWS_CLI_ARGS)
     if [[ ! $FIRST_INSTANCE == "None" ]]; then
         break
     fi