Clean up auto-setup.sh (#2516)

Author: alexshtin

docker/auto-setup.sh

@@ -4,80 +4,88 @@ set -eux -o pipefail
 
 # === Auto setup defaults ===
 
-DB="${DB:-cassandra}"
-SKIP_SCHEMA_SETUP="${SKIP_SCHEMA_SETUP:-false}"
-SKIP_DB_CREATE="${SKIP_DB_CREATE:-false}"
+: "${DB:=cassandra}"
+: "${SKIP_SCHEMA_SETUP:=false}"
+: "${SKIP_DB_CREATE:=false}"
 
 # Cassandra
-KEYSPACE="${KEYSPACE:-temporal}"
-VISIBILITY_KEYSPACE="${VISIBILITY_KEYSPACE:-temporal_visibility}"
-
-CASSANDRA_SEEDS="${CASSANDRA_SEEDS:-}"
-CASSANDRA_PORT="${CASSANDRA_PORT:-9042}"
-CASSANDRA_USER="${CASSANDRA_USER:-}"
-CASSANDRA_PASSWORD="${CASSANDRA_PASSWORD:-}"
-CASSANDRA_TLS_ENABLED="${CASSANDRA_TLS_ENABLED:-}"
-CASSANDRA_CERT="${CASSANDRA_CERT:-}"
-CASSANDRA_CERT_KEY="${CASSANDRA_CERT_KEY:-}"
-CASSANDRA_CA="${CASSANDRA_CA:-}"
-CASSANDRA_REPLICATION_FACTOR="${CASSANDRA_REPLICATION_FACTOR:-1}"
+: "${KEYSPACE:=temporal}"
+: "${VISIBILITY_KEYSPACE:=temporal_visibility}"
+
+: "${CASSANDRA_SEEDS:=}"
+: "${CASSANDRA_PORT:=9042}"
+: "${CASSANDRA_USER:=}"
+: "${CASSANDRA_PASSWORD:=}"
+: "${CASSANDRA_TLS_ENABLED:=}"
+: "${CASSANDRA_CERT:=}"
+: "${CASSANDRA_CERT_KEY:=}"
+: "${CASSANDRA_CA:=}"
+: "${CASSANDRA_REPLICATION_FACTOR:=1}"
 
 # MySQL/PostgreSQL
-DBNAME="${DBNAME:-temporal}"
-VISIBILITY_DBNAME="${VISIBILITY_DBNAME:-temporal_visibility}"
-DB_PORT="${DB_PORT:-3306}"
+: "${DBNAME:=temporal}"
+: "${VISIBILITY_DBNAME:=temporal_visibility}"
+: "${DB_PORT:=3306}"
 
-MYSQL_SEEDS="${MYSQL_SEEDS:-}"
-MYSQL_USER="${MYSQL_USER:-}"
-MYSQL_PWD="${MYSQL_PWD:-}"
-MYSQL_TX_ISOLATION_COMPAT="${MYSQL_TX_ISOLATION_COMPAT:-false}"
+: "${MYSQL_SEEDS:=}"
+: "${MYSQL_USER:=}"
+: "${MYSQL_PWD:=}"
+: "${MYSQL_TX_ISOLATION_COMPAT:=false}"
 
-POSTGRES_SEEDS="${POSTGRES_SEEDS:-}"
-POSTGRES_USER="${POSTGRES_USER:-}"
-POSTGRES_PWD="${POSTGRES_PWD:-}"
+: "${POSTGRES_SEEDS:=}"
+: "${POSTGRES_USER:=}"
+: "${POSTGRES_PWD:=}"
 
 # Elasticsearch
-ENABLE_ES="${ENABLE_ES:-false}"
-ES_SCHEME="${ES_SCHEME:-http}"
-ES_SEEDS="${ES_SEEDS:-}"
-ES_PORT="${ES_PORT:-9200}"
-ES_USER="${ES_USER:-}"
-ES_PWD="${ES_PWD:-}"
-ES_VERSION="${ES_VERSION:-v7}"
-ES_VIS_INDEX="${ES_VIS_INDEX:-temporal_visibility_v1_dev}"
-ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS="${ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS:-0}"
+: "${ENABLE_ES:=false}"
+: "${ES_SCHEME:=http}"
+: "${ES_SEEDS:=}"
+: "${ES_PORT:=9200}"
+: "${ES_USER:=}"
+: "${ES_PWD:=}"
+: "${ES_VERSION:=v7}"
+: "${ES_VIS_INDEX:=temporal_visibility_v1_dev}"
+: "${ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS:=0}"
 
 # Server setup
-TEMPORAL_CLI_ADDRESS="${TEMPORAL_CLI_ADDRESS:-}"
+: "${TEMPORAL_CLI_ADDRESS:=}"
 
-SKIP_DEFAULT_NAMESPACE_CREATION="${SKIP_DEFAULT_NAMESPACE_CREATION:-false}"
-DEFAULT_NAMESPACE="${DEFAULT_NAMESPACE:-default}"
-DEFAULT_NAMESPACE_RETENTION=${DEFAULT_NAMESPACE_RETENTION:-1}
+: "${SKIP_DEFAULT_NAMESPACE_CREATION:=false}"
+: "${DEFAULT_NAMESPACE:=default}"
+: "${DEFAULT_NAMESPACE_RETENTION:=1}"
 
-SKIP_ADD_CUSTOM_SEARCH_ATTRIBUTES="${SKIP_ADD_CUSTOM_SEARCH_ATTRIBUTES:-false}"
+: "${SKIP_ADD_CUSTOM_SEARCH_ATTRIBUTES:=false}"
+
+# === Helper functions ===
+
+die() {
+    echo "$*" 1>&2
+    exit 1
+}
 
 # === Main database functions ===
 
 validate_db_env() {
-    if [ "${DB}" == "mysql" ]; then
-        if [ -z "${MYSQL_SEEDS}" ]; then
-            echo "MYSQL_SEEDS env must be set if DB is ${DB}."
-            exit 1
-        fi
-    elif [ "${DB}" == "postgresql" ]; then
-        if [ -z "${POSTGRES_SEEDS}" ]; then
-            echo "POSTGRES_SEEDS env must be set if DB is ${DB}."
-            exit 1
-        fi
-    elif [ "${DB}" == "cassandra" ]; then
-        if [ -z "${CASSANDRA_SEEDS}" ]; then
-            echo "CASSANDRA_SEEDS env must be set if DB is ${DB}."
-            exit 1
-        fi
-    else
-        echo "Unsupported DB type: ${DB}."
-        exit 1
-    fi
+    case ${DB} in
+      mysql)
+          if [[ -z ${MYSQL_SEEDS} ]]; then
+              die "MYSQL_SEEDS env must be set if DB is ${DB}."
+          fi
+          ;;
+      postgresql)
+          if [[ -z ${POSTGRES_SEEDS} ]]; then
+              die "POSTGRES_SEEDS env must be set if DB is ${DB}."
+          fi
+          ;;
+      cassandra)
+          if [[ -z ${CASSANDRA_SEEDS} ]]; then
+              die "CASSANDRA_SEEDS env must be set if DB is ${DB}."
+          fi
+          ;;
+      *)
+          die "Unsupported DB type: ${DB}."
+          ;;
+    esac
 }
 
 wait_for_cassandra() {
@@ -117,16 +125,20 @@ wait_for_postgres() {
 }
 
 wait_for_db() {
-    if [ "${DB}" == "mysql" ]; then
-        wait_for_mysql
-    elif [ "${DB}" == "postgresql" ]; then
-        wait_for_postgres
-    elif [ "${DB}" == "cassandra" ]; then
-        wait_for_cassandra
-    else
-        echo "Unsupported DB type: ${DB}."
-        exit 1
-    fi
+    case ${DB} in
+      mysql)
+          wait_for_mysql
+          ;;
+      postgresql)
+          wait_for_postgres
+          ;;
+      cassandra)
+          wait_for_cassandra
+          ;;
+      *)
+          die "Unsupported DB type: ${DB}."
+          ;;
+    esac
 }
 
 setup_cassandra_schema() {
@@ -141,14 +153,14 @@ setup_cassandra_schema() {
     { export CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD}; } 2> /dev/null
 
     SCHEMA_DIR=${TEMPORAL_HOME}/schema/cassandra/temporal/versioned
-    if [ "${SKIP_DB_CREATE}" != "true" ]; then
+    if [[ ${SKIP_DB_CREATE} != true ]]; then
         temporal-cassandra-tool --ep "${CASSANDRA_SEEDS}" create -k "${KEYSPACE}" --rf "${CASSANDRA_REPLICATION_FACTOR}"
     fi
     temporal-cassandra-tool --ep "${CASSANDRA_SEEDS}" -k "${KEYSPACE}" setup-schema -v 0.0
     temporal-cassandra-tool --ep "${CASSANDRA_SEEDS}" -k "${KEYSPACE}" update-schema -d "${SCHEMA_DIR}"
 
     VISIBILITY_SCHEMA_DIR=${TEMPORAL_HOME}/schema/cassandra/visibility/versioned
-    if [ "${SKIP_DB_CREATE}" != "true" ]; then
+    if [[ ${SKIP_DB_CREATE} != true ]]; then
         temporal-cassandra-tool --ep "${CASSANDRA_SEEDS}" create -k "${VISIBILITY_KEYSPACE}" --rf "${CASSANDRA_REPLICATION_FACTOR}"
     fi
     temporal-cassandra-tool --ep "${CASSANDRA_SEEDS}" -k "${VISIBILITY_KEYSPACE}" setup-schema -v 0.0
@@ -159,21 +171,21 @@ setup_mysql_schema() {
     # TODO (alex): Remove exports
     { export SQL_PASSWORD=${MYSQL_PWD}; } 2> /dev/null
 
-    if [ "${MYSQL_TX_ISOLATION_COMPAT}" == "true" ]; then
+    if [[ ${MYSQL_TX_ISOLATION_COMPAT} == true ]]; then
         MYSQL_CONNECT_ATTR=(--connect-attributes "tx_isolation=READ-COMMITTED")
     else
         MYSQL_CONNECT_ATTR=()
     fi
 
     SCHEMA_DIR=${TEMPORAL_HOME}/schema/mysql/v57/temporal/versioned
-    if [ "${SKIP_DB_CREATE}" != "true" ]; then
+    if [[ ${SKIP_DB_CREATE} != true ]]; then
         temporal-sql-tool --ep "${MYSQL_SEEDS}" -u "${MYSQL_USER}" "${MYSQL_CONNECT_ATTR[@]}" create --db "${DBNAME}"
     fi
     temporal-sql-tool --ep "${MYSQL_SEEDS}" -u "${MYSQL_USER}" "${MYSQL_CONNECT_ATTR[@]}" --db "${DBNAME}" setup-schema -v 0.0
     temporal-sql-tool --ep "${MYSQL_SEEDS}" -u "${MYSQL_USER}" "${MYSQL_CONNECT_ATTR[@]}" --db "${DBNAME}" update-schema -d "${SCHEMA_DIR}"
 
     VISIBILITY_SCHEMA_DIR=${TEMPORAL_HOME}/schema/mysql/v57/visibility/versioned
-    if [ "${SKIP_DB_CREATE}" != "true" ]; then
+    if [[ ${SKIP_DB_CREATE} != true ]]; then
         temporal-sql-tool --ep "${MYSQL_SEEDS}" -u "${MYSQL_USER}" "${MYSQL_CONNECT_ATTR[@]}" create --db "${VISIBILITY_DBNAME}"
     fi
     temporal-sql-tool --ep "${MYSQL_SEEDS}" -u "${MYSQL_USER}" "${MYSQL_CONNECT_ATTR[@]}" --db "${VISIBILITY_DBNAME}" setup-schema -v 0.0
@@ -193,33 +205,39 @@ setup_postgres_schema() {
     temporal-sql-tool --plugin postgres --ep "${POSTGRES_SEEDS}" -u "${POSTGRES_USER}" -p "${DB_PORT}" --db "${DBNAME}" update-schema -d "${SCHEMA_DIR}"
 
     VISIBILITY_SCHEMA_DIR=${TEMPORAL_HOME}/schema/postgresql/v96/visibility/versioned
-    if [ "${VISIBILITY_DBNAME}" != "${POSTGRES_USER}" ] && [ "${SKIP_DB_CREATE}" != "true" ]; then
+    if [[ ${VISIBILITY_DBNAME} != "${POSTGRES_USER}" && ${SKIP_DB_CREATE} != true ]]; then
         temporal-sql-tool --plugin postgres --ep "${POSTGRES_SEEDS}" -u "${POSTGRES_USER}" -p "${DB_PORT}" create --db "${VISIBILITY_DBNAME}"
     fi
     temporal-sql-tool --plugin postgres --ep "${POSTGRES_SEEDS}" -u "${POSTGRES_USER}" -p "${DB_PORT}" --db "${VISIBILITY_DBNAME}" setup-schema -v 0.0
     temporal-sql-tool --plugin postgres --ep "${POSTGRES_SEEDS}" -u "${POSTGRES_USER}" -p "${DB_PORT}" --db "${VISIBILITY_DBNAME}" update-schema -d "${VISIBILITY_SCHEMA_DIR}"
 }
 
 setup_schema() {
-    if [ "${DB}" == "mysql" ]; then
-        echo 'Setup MySQL schema.'
-        setup_mysql_schema
-    elif [ "${DB}" == "postgresql" ]; then
-        echo 'Setup PostgreSQL schema.'
-        setup_postgres_schema
-    else
-        echo 'Setup Cassandra schema.'
-        setup_cassandra_schema
-    fi
+    case ${DB} in
+      mysql)
+          echo 'Setup MySQL schema.'
+          setup_mysql_schema
+          ;;
+      postgresql)
+          echo 'Setup PostgreSQL schema.'
+          setup_postgres_schema
+          ;;
+      cassandra)
+          echo 'Setup Cassandra schema.'
+          setup_cassandra_schema
+          ;;
+      *)
+          die "Unsupported DB type: ${DB}."
+          ;;
+    esac
 }
 
 # === Elasticsearch functions ===
 
 validate_es_env() {
-    if [ "${ENABLE_ES}" == "true" ]; then
-        if [ -z "${ES_SEEDS}" ]; then
-            echo "ES_SEEDS env must be set if ENABLE_ES is ${ENABLE_ES}"
-            exit 1
+    if [[ ${ENABLE_ES} == true ]]; then
+        if [[ -z ${ES_SEEDS} ]]; then
+            die "ES_SEEDS env must be set if ENABLE_ES is ${ENABLE_ES}"
         fi
     fi
 }
@@ -229,10 +247,10 @@ wait_for_es() {
 
     ES_SERVER="${ES_SCHEME}://${ES_SEEDS%%,*}:${ES_PORT}"
 
-    until curl --silent --fail --user "${ES_USER}":"${ES_PWD}" "${ES_SERVER}" > /dev/null 2>&1; do
+    until curl --silent --fail --user "${ES_USER}":"${ES_PWD}" "${ES_SERVER}" >& /dev/null; do
         DURATION=${SECONDS}
 
-        if [ "${ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS}" -gt 0 ] && [ ${DURATION} -ge "${ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS}" ]; then
+        if [[ ${ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS} -gt 0 && ${DURATION} -ge "${ES_SCHEMA_SETUP_TIMEOUT_IN_SECONDS}" ]]; then
             echo 'WARNING: timed out waiting for Elasticsearch to start up. Skipping index creation.'
             return;
         fi
@@ -290,30 +308,30 @@ add_custom_search_attributes() {
 setup_server(){
     echo "Temporal CLI address: ${TEMPORAL_CLI_ADDRESS}."
 
-    until tctl cluster health | grep SERVING; do
+    until tctl cluster health | grep -q SERVING; do
         echo "Waiting for Temporal server to start..."
         sleep 1
     done
     echo "Temporal server started."
 
-    if [ "${SKIP_DEFAULT_NAMESPACE_CREATION}" != "true" ]; then
+    if [[ ${SKIP_DEFAULT_NAMESPACE_CREATION} != true ]]; then
         register_default_namespace
     fi
 
-    if [ "${SKIP_ADD_CUSTOM_SEARCH_ATTRIBUTES}" != "true" ]; then
+    if [[ ${SKIP_ADD_CUSTOM_SEARCH_ATTRIBUTES} != true ]]; then
         add_custom_search_attributes
     fi
 }
 
 # === Main ===
 
-if [ "${SKIP_SCHEMA_SETUP}" != "true" ]; then
+if [[ ${SKIP_SCHEMA_SETUP} != true ]]; then
     validate_db_env
     wait_for_db
     setup_schema
 fi
 
-if [ "${ENABLE_ES}" == "true" ]; then
+if [[ ${ENABLE_ES} == true ]]; then
     validate_es_env
     wait_for_es
     setup_es_index

docker/entrypoint.sh

@@ -2,7 +2,8 @@
 
 set -eu -o pipefail
 
-export BIND_ON_IP="${BIND_ON_IP:-$(hostname -i)}"
+: "${BIND_ON_IP:=$(hostname -i)}"
+export BIND_ON_IP
 
 if [[ "${BIND_ON_IP}" =~ ":" ]]; then
     # ipv6
@@ -15,12 +16,12 @@ fi
 dockerize -template /etc/temporal/config/config_template.yaml:/etc/temporal/config/docker.yaml
 
 # Automatically setup Temporal Server (databases, Elasticsearch, default namespace) if "autosetup" is passed as an argument.
-for arg in "$@" ; do [[ ${arg} == "autosetup" ]] && /etc/temporal/auto-setup.sh && break ; done
+for arg; do [[ ${arg} == autosetup ]] && /etc/temporal/auto-setup.sh && break ; done
 
 # Setup Temporal Server in development mode if "develop" is passed as an argument.
-for arg in "$@" ; do [[ ${arg} == "develop" ]] && /etc/temporal/setup-develop.sh && break ; done
+for arg; do [[ ${arg} == develop ]] && /etc/temporal/setup-develop.sh && break ; done
 
 # Run bash instead of Temporal Server if "bash" is passed as an argument (convenient to debug docker image).
-for arg in "$@" ; do [[ ${arg} == "bash" ]] && bash && exit 0 ; done
+for arg; do [[ ${arg} == bash ]] && bash && exit 0 ; done
 
 exec /etc/temporal/start-temporal.sh

docker/setup-develop.sh

@@ -2,7 +2,7 @@
 
 set -eux -o pipefail
 
-TEMPORAL_DBG_NETWORK_DELAY_MS="${TEMPORAL_DBG_NETWORK_DELAY_MS:-}"
+: "${TEMPORAL_DBG_NETWORK_DELAY_MS:=}"
 
 # Adding artificial delay for all network calls.
 # In order to verify that there is a delay, you can login to the container and run:
@@ -12,6 +12,6 @@ TEMPORAL_DBG_NETWORK_DELAY_MS="${TEMPORAL_DBG_NETWORK_DELAY_MS:-}"
 #
 # Read more about what's possible with tc here:
 # https://www.badunetworks.com/traffic-shaping-with-tc/
-if [ -n "${TEMPORAL_DBG_NETWORK_DELAY_MS}" ]; then
+if [[ -n ${TEMPORAL_DBG_NETWORK_DELAY_MS} ]]; then
 	tc qdisc add dev eth0 root netem delay "${TEMPORAL_DBG_NETWORK_DELAY_MS}ms" 
 fi

docker/start-temporal.sh

@@ -2,10 +2,10 @@
 
 set -eu -o pipefail
 
-SERVICES="${SERVICES:-}"
-SERVICE_FLAGS="${SERVICE_FLAGS:-}"
+: "${SERVICES:=}"
+: "${SERVICE_FLAGS:=}"
 
-if [ -z "${SERVICE_FLAGS}" ] && [ -n "${SERVICES}" ]; then
+if [[ -z ${SERVICE_FLAGS}  && -n ${SERVICES} ]]; then
     # Convert semicolon (or comma, for backward compatibility) separated string (i.e. "history:matching")
     # to valid flag list (i.e. "--service=history --service=matching").
     IFS=':,' read -ra SERVICE_FLAGS <<< "${SERVICES}"