fix: restore sh files undo formatting

Author: samrose

ansible/files/admin_api_scripts/grow_fs.sh

@@ -8,14 +8,14 @@ VOLUME_TYPE=${1:-data}
 UBUNTU_VERSION=$(lsb_release -rs)
 
 if pgrep resizefs; then
-  echo "resize2fs is already running"
-  exit 1
+    echo "resize2fs is already running"
+    exit 1
 fi
 
 # install amazon disk utilities if not present on 24.04
 if [ "${UBUNTU_VERSION}" = "24.04" ] && ! /usr/bin/dpkg-query -W amazon-ec2-utils >/dev/null 2>&1; then
-  apt-get update
-  apt-get install -y amazon-ec2-utils || true
+    apt-get update
+    apt-get install -y amazon-ec2-utils || true
 fi
 
 # We currently mount 3 possible disks
@@ -27,15 +27,15 @@ XVDA_DEVICE="/dev/nvme0n1"
 XVDH_DEVICE="/dev/nvme1n1"
 # Map AWS devices to NVMe for ubuntu 24.04 and later
 if [ "${UBUNTU_VERSION}" = "24.04" ] && /usr/bin/dpkg-query -W amazon-ec2-utils >/dev/null 2>&1; then
-  for nvme_dev in $(lsblk -dprno name,type | grep disk | awk '{print $1}'); do
-    if [ -b "$nvme_dev" ]; then
-      mapping=$(ebsnvme-id -b "$nvme_dev" 2>/dev/null)
-      case "$mapping" in
-      "xvda" | "/dev/xvda") XVDA_DEVICE="$nvme_dev" ;;
-      "xvdh" | "/dev/xvdh") XVDH_DEVICE="$nvme_dev" ;;
-      esac
-    fi
-  done
+    for nvme_dev in $(lsblk -dprno name,type | grep disk | awk '{print $1}'); do
+        if [ -b "$nvme_dev" ]; then
+            mapping=$(ebsnvme-id -b "$nvme_dev" 2>/dev/null)
+            case "$mapping" in
+                "xvda"|"/dev/xvda") XVDA_DEVICE="$nvme_dev" ;;
+                "xvdh"|"/dev/xvdh") XVDH_DEVICE="$nvme_dev" ;;
+            esac
+        fi
+    done
 fi
 
 echo "Using devices - Root: $XVDA_DEVICE, Data: $XVDH_DEVICE"
@@ -45,29 +45,29 @@ ROOT_DEVICE_FULL=$(findmnt -no SOURCE /)
 ROOT_DEVICE=$(lsblk -no PKNAME "$ROOT_DEVICE_FULL")
 ROOT_PARTITION_NUMBER=$(echo "$ROOT_DEVICE_FULL" | sed "s|.*${ROOT_DEVICE}p||")
 
-if ! [[ $ROOT_PARTITION_NUMBER =~ ^[0-9]+$ ]]; then
+if ! [[ "$ROOT_PARTITION_NUMBER" =~ ^[0-9]+$ ]]; then
   echo "Error: ROOT_PARTITION_NUMBER is not a valid number: $ROOT_PARTITION_NUMBER"
   exit 1
 fi
 
-if [ -b "${XVDH_DEVICE}" ]; then
-  if [[ ${VOLUME_TYPE} == "data" ]]; then
-    resize2fs "${XVDH_DEVICE}"
+if [ -b "${XVDH_DEVICE}" ] ; then
+    if [[ "${VOLUME_TYPE}" == "data" ]]; then
+        resize2fs "${XVDH_DEVICE}"
 
-  elif [[ ${VOLUME_TYPE} == "root" ]]; then
-    PLACEHOLDER_FL=/home/ubuntu/50M_PLACEHOLDER
-    rm -f "${PLACEHOLDER_FL}" || true
-    growpart "${XVDA_DEVICE}" "${ROOT_PARTITION_NUMBER}"
-    resize2fs "${XVDA_DEVICE}p${ROOT_PARTITION_NUMBER}"
-    if [[ ! -f ${PLACEHOLDER_FL} ]]; then
-      fallocate -l50M "${PLACEHOLDER_FL}"
+    elif [[ "${VOLUME_TYPE}" == "root" ]] ; then
+        PLACEHOLDER_FL=/home/ubuntu/50M_PLACEHOLDER
+        rm -f "${PLACEHOLDER_FL}" || true
+        growpart "${XVDA_DEVICE}" "${ROOT_PARTITION_NUMBER}"
+        resize2fs "${XVDA_DEVICE}p${ROOT_PARTITION_NUMBER}"
+        if [[ ! -f "${PLACEHOLDER_FL}" ]] ; then
+            fallocate -l50M "${PLACEHOLDER_FL}"
+        fi
+    else
+        echo "Invalid disk specified: ${VOLUME_TYPE}"
+        exit 1
     fi
-  else
-    echo "Invalid disk specified: ${VOLUME_TYPE}"
-    exit 1
-  fi
 else
-  growpart "${XVDA_DEVICE}" "${ROOT_PARTITION_NUMBER}"
-  resize2fs "${XVDA_DEVICE}p${ROOT_PARTITION_NUMBER}"
+    growpart "${XVDA_DEVICE}" "${ROOT_PARTITION_NUMBER}"
+    resize2fs "${XVDA_DEVICE}p${ROOT_PARTITION_NUMBER}"
 fi
 echo "Done resizing disk"

ansible/files/admin_api_scripts/manage_readonly_mode.sh

@@ -5,14 +5,13 @@ set -euo pipefail
 SUBCOMMAND=$1
 
 function set_mode {
-  MODE=$1
-  psql -h localhost -U supabase_admin -d postgres -c "ALTER SYSTEM SET default_transaction_read_only to ${MODE};"
-  psql -h localhost -U supabase_admin -d postgres -c "SELECT pg_reload_conf();"
+    MODE=$1
+    psql -h localhost -U supabase_admin -d postgres -c "ALTER SYSTEM SET default_transaction_read_only to ${MODE};"
+    psql -h localhost -U supabase_admin -d postgres -c "SELECT pg_reload_conf();"
 }
 
 function check_override {
-  COMMAND=$(
-    cat <<EOF
+    COMMAND=$(cat <<EOF
 WITH role_comment as (
     SELECT pg_catalog.shobj_description(r.oid, 'pg_authid') AS content
     FROM pg_catalog.pg_roles r
@@ -26,21 +25,21 @@ SELECT
            END as override_active
 FROM role_comment;
 EOF
-  )
-  RESULT=$(psql -h localhost -U supabase_admin -d postgres -At -c "$COMMAND")
-  echo -n "$RESULT"
+)
+    RESULT=$(psql -h localhost -U supabase_admin -d postgres -At -c "$COMMAND")
+    echo -n "$RESULT"
 }
 
 case $SUBCOMMAND in
-"check_override")
-  check_override
-  ;;
-"set")
-  shift
-  set_mode "$@"
-  ;;
-*)
-  echo "Error: '$SUBCOMMAND' is not a known subcommand."
-  exit 1
-  ;;
-esac
+    "check_override")
+        check_override
+        ;;
+    "set")
+       shift
+        set_mode "$@"
+        ;;
+    *)
+        echo "Error: '$SUBCOMMAND' is not a known subcommand."
+        exit 1
+        ;;
+esac

ansible/files/admin_api_scripts/mount-volume.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 DEVICE=${1:-}
 MOUNT_POINT=${2:-}
 
-if [[ -z $DEVICE || -z $MOUNT_POINT ]]; then
+if [[ -z "$DEVICE" || -z "$MOUNT_POINT" ]]; then
   echo "Usage: $0 <device> <mount_point>"
   echo "Example: sudo ./mount-volume.sh /dev/nvme1n1 /data/150008"
   exit 1
@@ -54,7 +54,7 @@ FSTAB_LINE="UUID=$UUID  $MOUNT_POINT  $FSTYPE  $MOUNT_OPTS  0  2"
 
 if ! grep -q "$UUID" "$FSTAB_FILE"; then
   echo "Adding $FSTAB_LINE to $FSTAB_FILE"
-  echo "$FSTAB_LINE" >>"$FSTAB_FILE"
+  echo "$FSTAB_LINE" >> "$FSTAB_FILE"
 else
   echo "UUID $UUID already in $FSTAB_FILE — skipping"
 fi

ansible/files/admin_api_scripts/pg_upgrade_scripts/check.sh

@@ -8,8 +8,9 @@ set -euo pipefail
 STATUS_FILE="/tmp/pg-upgrade-status"
 
 if [ -f "${STATUS_FILE}" ]; then
-  STATUS=$(cat "${STATUS_FILE}")
-  echo -n "${STATUS}"
+    STATUS=$(cat "${STATUS_FILE}")
+    echo -n "${STATUS}"
 else
-  echo -n "unknown"
+    echo -n "unknown"
 fi
+

ansible/files/admin_api_scripts/pg_upgrade_scripts/common.sh

@@ -7,41 +7,41 @@ REPORTING_CREDENTIALS_FILE="/root/upgrade-reporting-credentials"
 
 REPORTING_ANON_KEY=""
 if [ -f "$REPORTING_CREDENTIALS_FILE" ]; then
-  REPORTING_ANON_KEY=$(cat "$REPORTING_CREDENTIALS_FILE")
+    REPORTING_ANON_KEY=$(cat "$REPORTING_CREDENTIALS_FILE")
 fi
 
 # shellcheck disable=SC2120
 # Arguments are passed in other files
 function run_sql {
-  psql -h localhost -U supabase_admin -d postgres "$@"
+    psql -h localhost -U supabase_admin -d postgres "$@"
 }
 
 function ship_logs {
-  LOG_FILE=$1
-
-  if [ -z "$REPORTING_ANON_KEY" ]; then
-    echo "No reporting key found. Skipping log upload."
-    return 0
-  fi
-
-  if [ ! -f "$LOG_FILE" ]; then
-    echo "No log file found. Skipping log upload."
-    return 0
-  fi
-
-  if [ ! -s "$LOG_FILE" ]; then
-    echo "Log file is empty. Skipping log upload."
-    return 0
-  fi
-
-  HOSTNAME=$(hostname)
-  DERIVED_REF="${HOSTNAME##*-}"
-
-  printf -v BODY '{ "ref": "%s", "step": "%s", "content": %s }' "$DERIVED_REF" "completion" "$(cat "$LOG_FILE" | jq -Rs '.')"
-  curl -sf -X POST "https://$REPORTING_PROJECT_REF.supabase.co/rest/v1/error_logs" \
-    -H "apikey: ${REPORTING_ANON_KEY}" \
-    -H 'Content-type: application/json' \
-    -d "$BODY"
+    LOG_FILE=$1
+
+    if [ -z "$REPORTING_ANON_KEY" ]; then
+        echo "No reporting key found. Skipping log upload."
+        return 0
+    fi
+
+    if [ ! -f "$LOG_FILE" ]; then
+        echo "No log file found. Skipping log upload."
+        return 0
+    fi
+
+    if [ ! -s "$LOG_FILE" ]; then
+        echo "Log file is empty. Skipping log upload."
+        return 0
+    fi
+
+    HOSTNAME=$(hostname)
+    DERIVED_REF="${HOSTNAME##*-}"
+
+    printf -v BODY '{ "ref": "%s", "step": "%s", "content": %s }' "$DERIVED_REF" "completion" "$(cat "$LOG_FILE" | jq -Rs '.')"
+    curl -sf -X POST "https://$REPORTING_PROJECT_REF.supabase.co/rest/v1/error_logs" \
+         -H "apikey: ${REPORTING_ANON_KEY}" \
+         -H 'Content-type: application/json' \
+         -d "$BODY"
 }
 
 function retry {
@@ -54,53 +54,53 @@ function retry {
     wait=$((2 ** (count + 1)))
     count=$((count + 1))
     if [ $count -lt "$retries" ]; then
-      echo "Command $* exited with code $exit, retrying..."
-      sleep $wait
+        echo "Command $* exited with code $exit, retrying..."
+        sleep $wait
     else
-      echo "Command $* exited with code $exit, no more retries left."
-      return $exit
+        echo "Command $* exited with code $exit, no more retries left."
+        return $exit
     fi
   done
   return 0
 }
 
 CI_stop_postgres() {
-  BINDIR=$(pg_config --bindir)
-  ARG=${1:-""}
+    BINDIR=$(pg_config --bindir)
+    ARG=${1:-""}
 
-  if [ "$ARG" = "--new-bin" ]; then
-    BINDIR="/tmp/pg_upgrade_bin/$PG_MAJOR_VERSION/bin"
-  fi
+    if [ "$ARG" = "--new-bin" ]; then
+        BINDIR="/tmp/pg_upgrade_bin/$PG_MAJOR_VERSION/bin"
+    fi
 
-  su postgres -c "$BINDIR/pg_ctl stop -o '-c config_file=/etc/postgresql/postgresql.conf' -l /tmp/postgres.log"
+    su postgres -c "$BINDIR/pg_ctl stop -o '-c config_file=/etc/postgresql/postgresql.conf' -l /tmp/postgres.log"
 }
 
 CI_start_postgres() {
-  BINDIR=$(pg_config --bindir)
-  ARG=${1:-""}
+    BINDIR=$(pg_config --bindir)
+    ARG=${1:-""}
 
-  if [ "$ARG" = "--new-bin" ]; then
-    BINDIR="/tmp/pg_upgrade_bin/$PG_MAJOR_VERSION/bin"
-  fi
+    if [ "$ARG" = "--new-bin" ]; then
+        BINDIR="/tmp/pg_upgrade_bin/$PG_MAJOR_VERSION/bin"
+    fi
 
-  su postgres -c "$BINDIR/pg_ctl start -o '-c config_file=/etc/postgresql/postgresql.conf' -l /tmp/postgres.log"
+    su postgres -c "$BINDIR/pg_ctl start -o '-c config_file=/etc/postgresql/postgresql.conf' -l /tmp/postgres.log"
 }
 
 swap_postgres_and_supabase_admin() {
-  run_sql <<'EOSQL'
+    run_sql <<'EOSQL'
 alter database postgres connection limit 0;
 select pg_terminate_backend(pid) from pg_stat_activity where backend_type = 'client backend' and pid != pg_backend_pid();
 EOSQL
 
-  if [ -z "$IS_CI" ]; then
-    retry 5 systemctl restart postgresql
-  else
-    CI_start_postgres ""
-  fi
+    if [ -z "$IS_CI" ]; then
+        retry 5 systemctl restart postgresql
+    else
+        CI_start_postgres ""
+    fi
 
-  retry 8 pg_isready -h localhost -U supabase_admin
+    retry 8 pg_isready -h localhost -U supabase_admin
 
-  run_sql <<'EOSQL'
+    run_sql <<'EOSQL'
 set statement_timeout = '600s';
 begin;
 create role supabase_tmp superuser;