Coding style normalisation

.editorconfig

@@ -0,0 +1,13 @@
+root                 = true
+[*]
+indent_style         = space
+indent_size          = 2
+shell_variant        = bash
+binary_next_line     = true
+switch_case_indent   = true
+space_redirects      = true
+keep_padding         = true
+function_next_line   = false
+end_of_line          = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/ci.yml

@@ -1,3 +1,5 @@
+name: "Linting & Formatting"
+
 on:
   - push
   - pull_request
@@ -6,7 +8,14 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: ludeeus/action-shellcheck@master
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Lint check"
+        uses: ludeeus/action-shellcheck@master
         env:
           SHELLCHECK_OPTS: -x
+      - name: "Format check"
+        run: |
+          curl -sS https://webi.sh/shfmt | sh
+          shfmt -l -d .

Brewfile

@@ -4,4 +4,5 @@ brew "yq"
 brew "coreutils"
 brew "oath-toolkit"
 brew "gnupg"
+brew "shfmt"
 cask "session-manager-plugin"

bin/aurora/count-sql-backups

@@ -15,9 +15,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ]
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:r:e:d:h" opt; do
@@ -43,12 +42,7 @@ while getopts "i:r:e:d:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$RDS_NAME"
-  || -z "$ENVIRONMENT"
-]]
-then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$RDS_NAME" || -z "$ENVIRONMENT" ]]; then
   usage
 fi
 
@@ -62,13 +56,12 @@ TODAY=$(date +%Y-%m-%d)
 
 echo "==> Counting SQL backups in $INFRASTRUCTURE_NAME $RDS_NAME $ENVIRONMENT..."
 
-if [ -n "$DATE" ]
-then
- aws s3api list-objects-v2 \
-   --bucket "$S3_BUCKET_NAME" \
-   --query "Contents[?contains(LastModified,\`${DATE}\`)].Key" | jq -r 'length'
+if [ -n "$DATE" ]; then
+  aws s3api list-objects-v2 \
+    --bucket "$S3_BUCKET_NAME" \
+    --query "Contents[?contains(LastModified,\`${DATE}\`)].Key" | jq -r 'length'
 else
- aws s3api list-objects-v2 \
-   --bucket "$S3_BUCKET_NAME" \
-   --query "Contents[?contains(LastModified,\`${TODAY}\`)].Key" | jq -r 'length'
+  aws s3api list-objects-v2 \
+    --bucket "$S3_BUCKET_NAME" \
+    --query "Contents[?contains(LastModified,\`${TODAY}\`)].Key" | jq -r 'length'
 fi

bin/aurora/create-database

@@ -18,9 +18,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ]
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:e:r:d:u:P:I:h" opt; do
@@ -55,15 +54,7 @@ while getopts "i:e:r:d:u:P:I:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$RDS_NAME"
-  || -z "$DB_NAME"
-  || -z "$USER_NAME"
-  || -z "$USER_PASSWORD"
-  || -z "$ENVIRONMENT"
-]]
-then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$RDS_NAME" || -z "$DB_NAME" || -z "$USER_NAME" || -z "$USER_PASSWORD" || -z "$ENVIRONMENT" ]]; then
   usage
 fi
 
@@ -96,8 +87,7 @@ RDS_ROOT_USERNAME=$(echo "$RDS_INFO" | jq -r .DBClusters[0].MasterUsername)
 echo "Engine: $RDS_ENGINE"
 echo "Root username: $RDS_ROOT_USERNAME"
 
-if [ -z "$ECS_INSTANCE_ID" ]
-then
+if [ -z "$ECS_INSTANCE_ID" ]; then
   echo "==> Finding ECS instance..."
 
   ECS_INSTANCES=$(

bin/aurora/export-dump

@@ -17,9 +17,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ]
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:e:r:d:o:I:h" opt; do
@@ -51,18 +50,11 @@ while getopts "i:e:r:d:o:I:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$RDS_NAME"
-  || -z "$DATABASE_NAME"
-  || -z "$ENVIRONMENT"
-]]
-then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$RDS_NAME" || -z "$DATABASE_NAME" || -z "$ENVIRONMENT" ]]; then
   usage
 fi
 
-if [ -n "$OUTPUT_FILE_PATH" ]
-then
+if [ -n "$OUTPUT_FILE_PATH" ]; then
   OUTPUT_FILE_PATH="$(realpath "$OUTPUT_FILE_PATH")"
 else
   OUTPUT_FILE_PATH="."
@@ -97,8 +89,7 @@ RDS_ROOT_USERNAME=$(echo "$RDS_INFO" | jq -r .DBClusters[0].MasterUsername)
 echo "Engine: $RDS_ENGINE"
 echo "Root username: $RDS_ROOT_USERNAME"
 
-if [ -z "$ECS_INSTANCE_ID" ]
-then
+if [ -z "$ECS_INSTANCE_ID" ]; then
   echo "==> Finding ECS instance..."
 
   ECS_INSTANCES=$(

bin/aurora/get-root-password

@@ -14,9 +14,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ];
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:e:r:h" opt; do
@@ -39,11 +38,7 @@ while getopts "i:e:r:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$RDS_NAME"
-  || -z "$ENVIRONMENT"
-]]; then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$RDS_NAME" || -z "$ENVIRONMENT" ]]; then
   usage
 fi
 

bin/aurora/import-dump

@@ -20,9 +20,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ]
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 SCRIPT_PATH="$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
@@ -60,13 +59,7 @@ while getopts "i:e:r:d:f:R:p:I:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$RDS_NAME"
-  || -z "$DATABASE_NAME"
-  || -z "$ENVIRONMENT"
-]]
-then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$RDS_NAME" || -z "$DATABASE_NAME" || -z "$ENVIRONMENT" ]]; then
   usage
 fi
 
@@ -99,8 +92,7 @@ RDS_ROOT_USERNAME=$(echo "$RDS_INFO" | jq -r .DBClusters[0].MasterUsername)
 echo "Engine: $RDS_ENGINE"
 echo "Root username: $RDS_ROOT_USERNAME"
 
-if [ -z "$ECS_INSTANCE_ID" ]
-then
+if [ -z "$ECS_INSTANCE_ID" ]; then
   echo "==> Finding ECS instance..."
 
   ECS_INSTANCES=$(
@@ -115,14 +107,12 @@ fi
 
 echo "ECS instance ID: $ECS_INSTANCE_ID"
 
-if [ ! -f "$DB_DUMP_FILE" ];
-then
+if [ ! -f "$DB_DUMP_FILE" ]; then
     echo "$DB_DUMP_FILE not found ..."
     exit 1
 fi
 
-if [ -n "$REWRITE_FILE" ];
-then
+if [ -n "$REWRITE_FILE" ]; then
   INPUT_FILE="$(realpath "$DB_DUMP_FILE")"
   OUTPUT_PATH="$APP_ROOT/bin/tmp/sql-munged"
   REWRITE_FILE="$(realpath "$REWRITE_FILE")"
@@ -149,12 +139,15 @@ echo ""
 echo "Are you sure?"
 echo ""
 
-echo "Continue (Yes/No)"
+echo "Continue (Y/N)"
 read -r -p " > " choice
+
 case "$choice" in
-  Yes ) echo "==> Importing ...";;
-  * ) echo "Aborting!"
-    exit 1
+  Y)
+    echo "==> Importing ..."
+    ;;
+  *)
+    echo "Aborting!" && exit 1
     ;;
 esac
 

bin/aurora/list-databases

@@ -14,9 +14,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ]
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:e:r:h" opt; do
@@ -39,12 +38,7 @@ while getopts "i:e:r:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$ENVIRONMENT"
-  || -z "$RDS_NAME"
-]]
-then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$ENVIRONMENT" || -z "$RDS_NAME" ]]; then
   usage
 fi
 
@@ -65,9 +59,7 @@ RDS_ROOT_PASSWORD=$(
     | jq -r .Parameters[0].Value
 )
 
-
-if [ -z "$ECS_INSTANCE_ID" ]
-then
+if [ -z "$ECS_INSTANCE_ID" ]; then
   echo "==> Finding ECS instance..."
 
   ECS_INSTANCES=$(

bin/aurora/list-instances

@@ -13,9 +13,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ]
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:e:h" opt; do
@@ -35,17 +34,13 @@ while getopts "i:e:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME" ||
-  -z "$ENVIRONMENT"
-]]
-then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$ENVIRONMENT" ]]; then
   usage
 fi
 
 echo "==> Getting RDS instances in $INFRASTRUCTURE_NAME $ENVIRONMENT..."
 
 RDS_IDENTIFIER_SEARCH="${INFRASTRUCTURE_NAME//-/}.*${ENVIRONMENT//-/}"
 
-aws rds describe-db-clusters  \
+aws rds describe-db-clusters \
   | jq -r '.DBClusters[] | "Name: \(.DBClusterIdentifier) Engine: \(.Engine) Address: \(.Endpoint):\(.Port)" ' | grep "$RDS_IDENTIFIER_SEARCH"

bin/aurora/set-root-password

@@ -15,9 +15,8 @@ usage() {
 }
 
 # if there are no arguments passed exit with usage
-if [ $# -lt 1 ];
-then
- usage
+if [ $# -lt 1 ]; then
+  usage
 fi
 
 while getopts "i:e:r:P:h" opt; do
@@ -43,12 +42,7 @@ while getopts "i:e:r:P:h" opt; do
   esac
 done
 
-if [[
-  -z "$INFRASTRUCTURE_NAME"
-  || -z "$RDS_NAME"
-  || -z "$ENVIRONMENT"
-  || -z "$NEW_PASSWORD"
-]]; then
+if [[ -z "$INFRASTRUCTURE_NAME" || -z "$RDS_NAME" || -z "$ENVIRONMENT" || -z "$NEW_PASSWORD" ]]; then
   usage
 fi