diff --git a/cluster/gce/list-resources.sh b/cluster/gce/list-resources.sh index 3e33075db8..0caa6f4165 100755 --- a/cluster/gce/list-resources.sh +++ b/cluster/gce/list-resources.sh @@ -49,20 +49,20 @@ function gcloud-list() { local attempt=1 local result="" while true; do - if result=$(gcloud ${group} ${resource} list --project=${PROJECT} ${filter:+--filter="$filter"} ${@:4}); then - if [[ ! -z "${GREP_REGEX}" ]]; then + if result=$(gcloud "${group}" "${resource}" list --project="${PROJECT}" "${filter:+--filter="$filter"}" "${@:4}"); then + if [[ -n "${GREP_REGEX:-}" ]]; then result=$(echo "${result}" | grep "${GREP_REGEX}" || true) fi echo "${result}" return fi echo -e "Attempt ${attempt} failed to list ${resource}. Retrying." >&2 - attempt=$(($attempt+1)) + attempt=$((attempt + 1)) if [[ ${attempt} -gt 5 ]]; then echo -e "List ${resource} failed!" >&2 exit 2 fi - sleep $((5*${attempt})) + sleep $((5 * attempt)) done } diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 69190b20f6..d5bf305ede 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -11,7 +11,6 @@ ./cluster/gce/gci/flexvolume_node_setup.sh ./cluster/gce/gci/health-monitor.sh ./cluster/gce/gci/master-helper.sh -./cluster/gce/list-resources.sh ./cluster/gce/upgrade-aliases.sh ./cluster/gce/upgrade.sh ./cluster/gce/util.sh