From 3f4f2de63c4646f8496ad085009ec8ca52b66f24 Mon Sep 17 00:00:00 2001
From: Ben Wolfe <ben.wolfe@blackboard.com>
Date: Thu, 3 Oct 2019 11:03:53 -0400
Subject: [PATCH] Allow multiple host checks

---
 README.md      | 11 +++++++++-
 wait-for-it.sh | 54 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 4891736..4d67acc 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 wait-for-it.sh host:port [-s] [-t timeout] [-- command args]
 -h HOST | --host=HOST       Host or IP under test
 -p PORT | --port=PORT       TCP port under test
-                            Alternatively, you specify the host and port as host:port
+                            Alternatively, you specify the host and port as host:port, multiple parameters allowed
 -s | --strict               Only execute subcommand if the test succeeds
 -q | --quiet                Don't output any status messages
 -t TIMEOUT | --timeout=TIMEOUT
@@ -27,6 +27,15 @@ wait-for-it.sh: www.google.com:80 is available after 0 seconds
 google is up
 ```
 
+```
+$ ./wait-for-it.sh www.google.com:80 images.google.com:80 -- echo "both google search and google images are up"
+wait-for-it.sh: waiting 15 seconds for www.google.com:80
+wait-for-it.sh: www.google.com:80 is available after 0 seconds
+wait-for-it.sh: waiting 15 seconds for images.google.com:80
+wait-for-it.sh: images.google.com:80 is available after 0 seconds
+both google search and google images are up
+```
+
 You can set your own timeout with the `-t` or `--timeout=` option.  Setting the timeout value to 0 will disable the timeout:
 
 ```
diff --git a/wait-for-it.sh b/wait-for-it.sh
index 071c2be..73e9d1f 100755
--- a/wait-for-it.sh
+++ b/wait-for-it.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
+#   Use this script to test if a given TCP host/port(s) are available
 
 WAITFORIT_cmdname=${0##*/}
 
@@ -12,7 +12,8 @@ Usage:
     $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
     -h HOST | --host=HOST       Host or IP under test
     -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
+                                Alternatively, you specify the host and port as host:port,
+                                multiple parameters allowed
     -s | --strict               Only execute subcommand if the test succeeds
     -q | --quiet                Don't output any status messages
     -t TIMEOUT | --timeout=TIMEOUT
@@ -67,14 +68,19 @@ wait_for_wrapper()
     return $WAITFORIT_RESULT
 }
 
+declare -a WAITFORIT_HOSTS
+declare -a WAITFORIT_PORTS
+I=0
+
 # process arguments
 while [[ $# -gt 0 ]]
 do
     case "$1" in
         *:* )
         WAITFORIT_hostport=(${1//:/ })
-        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
-        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        I=$((I + 1))
+        WAITFORIT_HOSTS[I]=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORTS[I]=${WAITFORIT_hostport[1]}
         shift 1
         ;;
         --child)
@@ -90,21 +96,21 @@ do
         shift 1
         ;;
         -h)
-        WAITFORIT_HOST="$2"
-        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        WAITFORIT_HOSTS[0]="$2"
+        if [[ $WAITFORIT_HOSTS[0] == "" ]]; then break; fi
         shift 2
         ;;
         --host=*)
-        WAITFORIT_HOST="${1#*=}"
+        WAITFORIT_HOSTS[0]="${1#*=}"
         shift 1
         ;;
         -p)
-        WAITFORIT_PORT="$2"
-        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        WAITFORIT_PORTS[0]="$2"
+        if [[ $WAITFORIT_PORTS[0] == "" ]]; then break; fi
         shift 2
         ;;
         --port=*)
-        WAITFORIT_PORT="${1#*=}"
+        WAITFORIT_PORTS[0]="${1#*=}"
         shift 1
         ;;
         -t)
@@ -131,8 +137,8 @@ do
     esac
 done
 
-if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
+if [[ "${#WAITFORIT_HOSTS[*]}" == "0" || "${#WAITFORIT_PORTS[*]}" == "0" ]]; then
+    echoerr "Error: you need to provide at least one host and port to test."
     usage
 fi
 
@@ -153,19 +159,23 @@ else
         WAITFORIT_BUSYTIMEFLAG=""
 fi
 
-if [[ $WAITFORIT_CHILD -gt 0 ]]; then
-    wait_for
-    WAITFORIT_RESULT=$?
-    exit $WAITFORIT_RESULT
-else
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        WAITFORIT_RESULT=$?
-    else
+for i in "${!WAITFORIT_HOSTS[@]}"; do
+    WAITFORIT_HOST=${WAITFORIT_HOSTS[$i]}
+    WAITFORIT_PORT=${WAITFORIT_PORTS[$i]}
+    if [[ $WAITFORIT_CHILD -gt 0 ]]; then
         wait_for
         WAITFORIT_RESULT=$?
+        exit $WAITFORIT_RESULT
+    else
+        if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+            wait_for_wrapper
+            WAITFORIT_RESULT=$?
+        else
+            wait_for
+            WAITFORIT_RESULT=$?
+        fi
     fi
-fi
+done
 
 if [[ $WAITFORIT_CLI != "" ]]; then
     if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then