From d9c7255ab40ee707e5b861ac88dd7855565c59a8 Mon Sep 17 00:00:00 2001
From: toyoda <k-toyoda@pi.jp.nec.com>
Date: Tue, 13 Aug 2019 17:49:38 +0900
Subject: [PATCH] Fix shellcheck failures in cluster/validate-cluster.sh

---
 cluster/validate-cluster.sh | 12 ++++++------
 hack/.shellcheck_failures   |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh
index 9b851135b1f..1c07e5b4537 100755
--- a/cluster/validate-cluster.sh
+++ b/cluster/validate-cluster.sh
@@ -39,7 +39,7 @@ function kubectl_retry() {
   while ! "${KUBE_ROOT}/cluster/kubectl.sh" "$@"; do
     tries=$((tries-1))
     if [[ ${tries} -le 0 ]]; then
-      echo "('kubectl $@' failed, giving up)" >&2
+      echo "('kubectl $*' failed, giving up)" >&2
       return 1
     fi
     echo "(kubectl failed, will retry ${tries} times)" >&2
@@ -59,8 +59,8 @@ if [[ "${KUBERNETES_PROVIDER:-}" == "gce" ]]; then
   echo "Validating gce cluster, MULTIZONE=${MULTIZONE:-}"
   # In multizone mode we need to add instances for all nodes in the region.
   if [[ "${MULTIZONE:-}" == "true" ]]; then
-    EXPECTED_NUM_NODES=$(gcloud -q compute instances list --project="${PROJECT}" --format=[no-heading] \
-      --filter="(name ~ '${NODE_INSTANCE_PREFIX}.*' OR name ~ '${WINDOWS_NODE_INSTANCE_PREFIX}.*') AND zone:($(gcloud -q compute zones list --project="${PROJECT}" --filter=region=${REGION} --format=csv[no-heading]\(name\) | tr "\n" "," | sed  "s/,$//"))" | wc -l)
+    EXPECTED_NUM_NODES=$(gcloud -q compute instances list --project="${PROJECT}" --format="[no-heading]" \
+      --filter="(name ~ '${NODE_INSTANCE_PREFIX}.*' OR name ~ '${WINDOWS_NODE_INSTANCE_PREFIX}.*') AND zone:($(gcloud -q compute zones list --project="${PROJECT}" --filter=region="${REGION}" --format="csv[no-heading](name)" | tr "\n" "," | sed  "s/,$//"))" | wc -l)
     echo "Computing number of nodes, NODE_INSTANCE_PREFIX=${NODE_INSTANCE_PREFIX}, REGION=${REGION}, EXPECTED_NUM_NODES=${EXPECTED_NUM_NODES}"
   fi
 else
@@ -112,7 +112,7 @@ while true; do
   node="${node%.}"
   if [ "${res}" -ne "0" ]; then
     if [[ "${attempt}" -gt "${last_run:-$MAX_ATTEMPTS}" ]]; then
-      echo -e "${color_red} Failed to get nodes.${color_norm}"
+      echo -e "${color_red:-} Failed to get nodes.${color_norm:-}"
       exit 1
     else
       continue
@@ -134,11 +134,11 @@ while true; do
     break
   else
     if [[ "${REQUIRED_NUM_NODES}" -le "${ready}" ]]; then
-      echo -e "${color_green}Found ${REQUIRED_NUM_NODES} Nodes, allowing additional ${ADDITIONAL_ITERATIONS} iterations for other Nodes to join.${color_norm}"
+      echo -e "${color_green:-}Found ${REQUIRED_NUM_NODES} Nodes, allowing additional ${ADDITIONAL_ITERATIONS} iterations for other Nodes to join.${color_norm}"
       last_run="${last_run:-$((attempt + ADDITIONAL_ITERATIONS - 1))}"
     fi
     if [[ "${attempt}" -gt "${last_run:-$MAX_ATTEMPTS}" ]]; then
-      echo -e "${color_yellow}Detected ${ready} ready nodes, found ${found} nodes out of expected ${EXPECTED_NUM_NODES}. Your cluster may not be fully functional.${color_norm}"
+      echo -e "${color_yellow:-}Detected ${ready} ready nodes, found ${found} nodes out of expected ${EXPECTED_NUM_NODES}. Your cluster may not be fully functional.${color_norm}"
       kubectl_retry get nodes
       if [[ "${REQUIRED_NUM_NODES}" -gt "${ready}" ]]; then
         exit 1
diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index be6ab488a92..fd30a7a921c 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -11,4 +11,3 @@
 ./cluster/gce/util.sh
 ./cluster/log-dump/log-dump.sh
 ./cluster/pre-existing/util.sh
-./cluster/validate-cluster.sh