Merge pull request #58 from KCFTech/master

Remove new line characters from AWS Commands results

Author: feverLu

load-balancing/elb/common_functions.sh

@@ -235,7 +235,7 @@ autoscaling_group_name() {
     local autoscaling_name=$($AWS_CLI autoscaling describe-auto-scaling-instances \
         --instance-ids $instance_id \
         --output text \
-        --query AutoScalingInstances[0].AutoScalingGroupName)
+        --query AutoScalingInstances[0].AutoScalingGroupName | tr -d '\n\r')
 
     if [ $? != 0 ]; then
         return 1
@@ -342,7 +342,7 @@ autoscaling_enter_standby() {
 #   successful.
 autoscaling_exit_standby() {
     local instance_id=$1
-    local asg_name=${2}
+    local asg_name=${2} 
 
     msg "Checking if this instance has already been moved out of Standby state"
     local instance_state=$(get_instance_state_asg $instance_id)
@@ -365,6 +365,7 @@ autoscaling_exit_standby() {
     $AWS_CLI autoscaling exit-standby \
         --instance-ids $instance_id \
         --auto-scaling-group-name \"${asg_name}\"
+
     if [ $? != 0 ]; then
         msg "Failed to put instance $instance_id back into InService for ASG ${asg_name}."
         return 1
@@ -501,7 +502,7 @@ wait_for_state() {
 
     msg "Checking $WAITER_ATTEMPTS times, every $WAITER_INTERVAL seconds, for instance $instance_id to be in state $state_name"
 
-    local instance_state=$($instance_state_cmd)
+    local instance_state=$($instance_state_cmd | tr -d '\n\r')
     local count=1
 
     msg "Instance is currently in state: $instance_state"
@@ -514,7 +515,7 @@ wait_for_state() {
 
         sleep $WAITER_INTERVAL
 
-        instance_state=$($instance_state_cmd)
+        instance_state=$($instance_state_cmd | tr -d '\n\r')
         count=$(($count + 1))
         msg "Instance is currently in state: $instance_state"
     done