Fix some linter warnings

elasticsearch-init/upload.sh

@@ -4,8 +4,9 @@ TPL_DIR=/templates
 
 _get_tpl_name_from_file() {
     local tpl=$1
-    local tpl_name=$(basename $tpl)
-    echo $tpl_name
+    local tpl_name
+    tpl_name=$(basename "$tpl")
+    echo "$tpl_name"
 }
 
 if [ ! -d $TPL_DIR ]; then
@@ -18,10 +19,8 @@ fi
 for template in $TPLS; do
 
     echo "Handling template file $template"
-    tpl_name=`_get_tpl_name_from_file $template`
+    tpl_name=`_get_tpl_name_from_file "$template"`
 
-    curl -XPUT --retry 2 --retry-delay 2 $ELASTICSEARCH_URI/_template/${tpl_name} -d @$TPL_DIR/$template
+    curl -XPUT --retry 2 --retry-delay 2 "$ELASTICSEARCH_URI"/_template/"${tpl_name}" -d @$TPL_DIR/"$template"
 
 done
-
-

elasticsearch-init/wait-for.sh

@@ -1,15 +1,15 @@
 #!/bin/sh
 
-: ${SLEEP_LENGTH:=2}
+: "${SLEEP_LENGTH:=2}"
 
 wait_for() {
-  echo Waiting for $1 to listen on $2...
-  while ! nc -z $1 $2; do echo sleeping; sleep $SLEEP_LENGTH; done
+  echo "Waiting for $1 to listen on $2..."
+  while ! nc -z "$1" "$2"; do echo sleeping; sleep "$SLEEP_LENGTH"; done
 }
 
 for var in "$@"
 do
   host=${var%:*}
   port=${var#*:}
-  wait_for $host $port
+  wait_for "$host" "$port"
 done

kafka-init/wait-for.sh

@@ -2,7 +2,7 @@
 # Use this script to test if a given TCP host/port are available
 # https://github.com/vishnubob/wait-for-it/blob/master/wait-for-it.sh
 
-cmdname=$(basename $0)
+cmdname=$(basename "$0")
 
 echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
 
@@ -34,10 +34,10 @@ wait_for()
     while :
     do
         if [[ $ISBUSY -eq 1 ]]; then
-            nc -z $HOST $PORT
+            nc -z "$HOST" "$PORT"
             result=$?
         else
-            (echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
+            (echo > /dev/tcp/"$HOST"/"$PORT") >/dev/null 2>&1
             result=$?
         fi
         if [[ $result -eq 0 ]]; then
@@ -54,9 +54,9 @@ wait_for_wrapper()
 {
     # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
     if [[ $QUIET -eq 1 ]]; then
-        timeout $BUSYTIMEFLAG $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+        timeout "$BUSYTIMEFLAG" "$TIMEOUT" "$0" --quiet --child --host="$HOST" --port="$PORT" --timeout="$TIMEOUT" &
     else
-        timeout $BUSYTIMEFLAG $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+        timeout "$BUSYTIMEFLAG" "$TIMEOUT" "$0" --child --host="$HOST" --port="$PORT" --timeout="$TIMEOUT" &
     fi
     PID=$!
     trap "kill -INT -$PID" INT
@@ -172,7 +172,7 @@ if [[ $CLI != "" ]]; then
         echoerr "$cmdname: strict mode, refusing to execute subprocess"
         exit $RESULT
     fi
-    exec $CLI
+    exec "$CLI"
 else
-    exit $RESULT
+    exit "$RESULT"
 fi

kafka/start.sh

@@ -22,21 +22,21 @@ export STATE_CHANGE_LOG_LEVEL=${STATE_CHANGE_LOG_LEVEL:-"INFO"}
 export AUTHORIZER_LOG_LEVEL=${AUTHORIZER_LOG_LEVEL:-"WARN"}
 GC_LOG_ENABLED=${GC_LOG_ENABLED:-"False"}
 
-first_zk=$(echo $ZOOKEEPER_CONNECTION_STRING | cut -d, -f1)
-zk_host=$(echo $first_zk | cut -d\: -f1)
-zk_port=$(echo $first_zk | cut -d\: -f2)
+first_zk=$(echo "$ZOOKEEPER_CONNECTION_STRING" | cut -d, -f1)
+zk_host=$(echo "$first_zk" | cut -d\: -f1)
+zk_port=$(echo "$first_zk" | cut -d\: -f2)
 
 # wait for zookeeper to become available
 if [ "$ZOOKEEPER_WAIT" = "true" ]; then
   success="false"
-  for i in $(seq $ZOOKEEPER_WAIT_RETRIES); do
-    ok=$(echo ruok | nc $zk_host $zk_port -w $ZOOKEEPER_WAIT_TIMEOUT)
+  for i in $(seq "$ZOOKEEPER_WAIT_RETRIES"); do
+    ok=$(echo ruok | nc "$zk_host" "$zk_port" -w "$ZOOKEEPER_WAIT_TIMEOUT")
     if [ $? -eq 0 -a "$ok" = "imok" ]; then
       success="true"
       break
     else
       echo "Connect attempt $i of $ZOOKEEPER_WAIT_RETRIES failed, retrying..."
-      sleep $ZOOKEEPER_WAIT_DELAY
+      sleep "$ZOOKEEPER_WAIT_DELAY"
     fi
   done
 
@@ -69,7 +69,7 @@ for f in $CONFIG_TEMPLATES/*.properties.j2; do
 done
 
 if [ -z "$KAFKA_HEAP_OPTS" ]; then
-  max_heap=$(python /heap.py $KAFKA_MAX_HEAP_MB)
+  max_heap=$(python /heap.py "$KAFKA_MAX_HEAP_MB")
   KAFKA_HEAP_OPTS="-Xmx${max_heap} -Xms${max_heap}"
   export KAFKA_HEAP_OPTS
 fi

keystone/keystone-bootstrap.sh

@@ -41,15 +41,15 @@ fi
 if [[ -e /db-init ]]; then
     echo "Creating bootstrap credentials..."
     keystone-manage bootstrap \
-        --bootstrap-password $admin_password \
-        --bootstrap-username $admin_username \
-        --bootstrap-project-name $admin_project \
-        --bootstrap-role-name $admin_role \
-        --bootstrap-service-name $admin_service \
-        --bootstrap-region-id $admin_region \
-        --bootstrap-admin-url $admin_url \
-        --bootstrap-public-url $public_url \
-        --bootstrap-internal-url $internal_url
+        --bootstrap-password "$admin_password" \
+        --bootstrap-username "$admin_username" \
+        --bootstrap-project-name "$admin_project" \
+        --bootstrap-role-name "$admin_role" \
+        --bootstrap-service-name "$admin_service" \
+        --bootstrap-region-id "$admin_region" \
+        --bootstrap-admin-url "$admin_url" \
+        --bootstrap-public-url "$public_url" \
+        --bootstrap-internal-url "$internal_url"
 
     sleep 5
 

keystone/start.sh

@@ -11,7 +11,7 @@ if [[ "$KEYSTONE_DATABASE_BACKEND" =  "mysql" ]]; then
 
     echo "Waiting for mysql to become available..."
     success="false"
-    for i in $(seq $retries); do
+    for i in $(seq "$retries"); do
         mysqladmin status \
             --host="$mysql_host" \
             --user="$mysql_user" \
@@ -40,7 +40,7 @@ if [[ "$KEYSTONE_DATABASE_BACKEND" =  "mysql" ]]; then
         /etc/keystone/keystone.conf
 
     # check to see if table exists already and skip init if so
-    mysql -h ${mysql_host} -u ${mysql_user} -p${mysql_pass} -e "desc ${mysql_db}.migrate_version" &> /dev/null
+    mysql -h "${mysql_host}" -u "${mysql_user}" -p"${mysql_pass}" -e "desc ${mysql_db}.migrate_version" &> /dev/null
     if [[ $? -eq 0 ]]; then
         echo "MySQL database has already been initialized, skipping..."
     else

kibana/start.sh

@@ -2,8 +2,8 @@
 
 python /template.py /kibana.yml.j2 /opt/kibana/config/kibana.yml
 
-if [ $MONASCA_PLUGIN_ENABLED == True ]; then
-    /wait-for.sh $KEYSTONE_URI -- kibana
+if [ "$MONASCA_PLUGIN_ENABLED" == True ]; then
+    /wait-for.sh "$KEYSTONE_URI" -- kibana
 else
     kibana
 fi

kibana/wait-for.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #   Use this script to test if a given TCP host/port are available
 
-cmdname=$(basename $0)
+cmdname=$(basename "$0")
 
 echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
 
@@ -33,10 +33,10 @@ wait_for()
     while :
     do
         if [[ $ISBUSY -eq 1 ]]; then
-            nc -z $HOST $PORT
+            nc -z "$HOST" "$PORT"
             result=$?
         else
-            (echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
+            (echo > /dev/tcp/"$HOST"/"$PORT") >/dev/null 2>&1
             result=$?
         fi
         if [[ $result -eq 0 ]]; then
@@ -53,9 +53,9 @@ wait_for_wrapper()
 {
     # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
     if [[ $QUIET -eq 1 ]]; then
-        timeout $BUSYTIMEFLAG $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+        timeout "$BUSYTIMEFLAG" "$TIMEOUT" "$0" --quiet --child --host="$HOST" --port="$PORT" --timeout="$TIMEOUT" &
     else
-        timeout $BUSYTIMEFLAG $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+        timeout "$BUSYTIMEFLAG" "$TIMEOUT" "$0" --child --host="$HOST" --port="$PORT" --timeout="$TIMEOUT" &
     fi
     PID=$!
     trap "kill -INT -$PID" INT
@@ -142,7 +142,7 @@ CHILD=${CHILD:-0}
 QUIET=${QUIET:-0}
 
 # check to see if timeout is from busybox?
-TIMEOUT_PATH=$(realpath $(which timeout))
+TIMEOUT_PATH=$(realpath "$(which timeout)")
 if [[ $TIMEOUT_PATH =~ "busybox" ]]; then
         ISBUSY=1
         BUSYTIMEFLAG="-t"
@@ -170,7 +170,7 @@ if [[ $CLI != "" ]]; then
         echoerr "$cmdname: strict mode, refusing to execute subprocess"
         exit $RESULT
     fi
-    exec $CLI
+    exec "$CLI"
 else
-    exit $RESULT
+    exit "$RESULT"
 fi

monasca-alarms/start.sh

@@ -8,7 +8,7 @@ if [ -n "$MONASCA_WAIT_FOR_API" ]; then
   echo "Waiting for Monasca API to become available..."
   success="false"
 
-  for i in $(seq $MONASCA_API_WAIT_RETRIES); do
+  for i in $(seq "$MONASCA_API_WAIT_RETRIES"); do
     monasca alarm-definition-list --limit 1
     if [ $? -eq 0 ]; then
       success="true"
@@ -29,4 +29,4 @@ fi
 echo "Loading Definitions...."
 
 python /template.py /config/definitions.yml.j2 /config/definitions.yml
-python monasca_alarm_definition.py --verbose --definitions-file /config/definitions.yml 
+python monasca_alarm_definition.py --verbose --definitions-file /config/definitions.yml

monasca-api-python/health-check.sh

@@ -39,7 +39,7 @@ KEYSTONE_TOKEN=$(curl --include --silent --show-error --output - --header "Conte
             }'
     ) && \
 curl --include --silent --show-error --output - --header "X-Auth-Token:${KEYSTONE_TOKEN}" \
-    http://localhost:${MONASCA_CONTAINER_API_PORT} 2>&1 | \
+    http://localhost:"${MONASCA_CONTAINER_API_PORT}" 2>&1 | \
     awk '
         BEGIN {status_code="0"; body=""; output=""}
         $1 ~ /^HTTP\// {status_line=$0; status_code=$2}

monasca-api-python/start.sh

@@ -14,7 +14,7 @@ KAFKA_WAIT_DELAY=${KAFKA_WAIT_DELAY:-"5"}
 if [ "$MYSQL_WAIT_RETRIES" != "0" ]; then
   echo "Waiting for MySQL to become available..."
   success="false"
-  for i in $(seq $MYSQL_WAIT_RETRIES); do
+  for i in $(seq "$MYSQL_WAIT_RETRIES"); do
     mysqladmin status \
         --host="$MYSQL_HOST" \
         --user="$MYSQL_USER" \
@@ -41,7 +41,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"
@@ -89,7 +89,7 @@ gunicorn --capture-output \
   -n monasca-api \
   --worker-class="$GUNICORN_WORKER_CLASS" \
   --worker-connections="$GUNICORN_WORKER_CONNECTIONS" \
-  --backlog=$GUNICORN_BACKLOG \
+  --backlog="$GUNICORN_BACKLOG" \
   $access_arg \
   --access-logformat "$ACCESS_LOG_FIELDS" \
   --paste /etc/monasca/api-config.ini \

monasca-forwarder/start.sh

@@ -8,7 +8,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"

monasca-log-api/health-check.sh

@@ -4,7 +4,7 @@
 MONASCA_CONTAINER_LOG_API_PORT=${1:-5607}
 
 curl --include --silent --show-error --output - \
-    http://localhost:${MONASCA_CONTAINER_LOG_API_PORT}/healthcheck 2>&1 | \
+    http://localhost:"${MONASCA_CONTAINER_LOG_API_PORT}"/healthcheck 2>&1 | \
     awk '
         BEGIN {status_code="0"; body=""; output=""}
         $1 ~ /^HTTP\// {status_line=$0; status_code=$2}

monasca-log-api/start.sh

@@ -13,7 +13,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"

monasca-log-metrics/start.sh

@@ -7,7 +7,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"

monasca-log-persister/start.sh

@@ -7,7 +7,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"

monasca-log-transformer/start.sh

@@ -7,7 +7,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"

monasca-notification/start.sh

@@ -9,7 +9,7 @@ KAFKA_WAIT_DELAY=${KAFKA_WAIT_DELAY:-"5"}
 
 echo "Waiting for MySQL to become available..."
 success="false"
-for i in $(seq $MYSQL_WAIT_RETRIES); do
+for i in $(seq "$MYSQL_WAIT_RETRIES"); do
   mysqladmin status \
       --host="$MYSQL_DB_HOST" \
       --port="$MYSQL_DB_PORT" \
@@ -36,7 +36,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"

monasca-persister-python/start.sh

@@ -9,7 +9,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   echo "Waiting for Kafka topics to become available..."
   success="false"
 
-  for i in $(seq $KAFKA_WAIT_RETRIES); do
+  for i in $(seq "$KAFKA_WAIT_RETRIES"); do
     python /kafka_wait_for_topics.py
     if [ $? -eq 0 ]; then
       success="true"