tests: add shfmt support

Author: Jose Diaz-Gonzalez

.github/workflows/lint.yaml

@@ -38,6 +38,21 @@ jobs:
         uses: ludeeus/action-shellcheck@d586102c117f97e63d7e3b56629d269efc9a7c60
         # 1.0.0 => d586102c117f97e63d7e3b56629d269efc9a7c60
 
+  shfmt:
+    name: shfmt
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+      - name: Run shfmt
+        uses: luizm/action-sh-checker@802b81f66b6c31ea423aa41ad4f49f4b7b869272
+        # v0.1.8 => 802b81f66b6c31ea423aa41ad4f49f4b7b869272
+        env:
+          SHFMT_OPTS: -l -d -i 2
+        with:
+          sh_checker_checkbashisms_enable: true
+          sh_checker_shellcheck_disable: true
+
   yamllint:
     name: yamllint
     runs-on: ubuntu-20.04

bin/dokku-unlock

@@ -3,7 +3,7 @@ set -e
 
 setup-ssh
 
-log-info "Unlocking Dokku deployment";
+log-info "Unlocking Dokku deployment"
 
 ssh_port=$(parse-ssh-port)
 ssh_host=$(parse-ssh-host)

bin/entrypoint

@@ -7,36 +7,36 @@ action="$1"
 action_arg="$2"
 
 if [ "$action" = "review-apps:create" ] || [ "$action" = 'review-apps:destroy' ]; then
-    if [ -z "$action_arg" ]; then
-        log-error "No review app name specified"
-        exit 1
-    fi
+  if [ -z "$action_arg" ]; then
+    log-error "No review app name specified"
+    exit 1
+  fi
 fi
 
 app_name="$(parse-app-name)"
 review_app_name="${action_arg}"
 ssh_remote="ssh://dokku@$(parse-ssh-host):$(parse-ssh-port)"
 
 if [ "$action" = "review-app:destroy" ]; then
-    log-info "Destroying review app '${review_app_name}'"
-    ssh "$ssh_remote" -- --force apps:destroy "$review_app_name"
-    exit 0
+  log-info "Destroying review app '${review_app_name}'"
+  ssh "$ssh_remote" -- --force apps:destroy "$review_app_name"
+  exit 0
 fi
 
 if [ -n "$action" ] && [ "$action" != "review-apps:create" ]; then
-    log-error "Invalid action specified"
-    exit 1
+  log-error "Invalid action specified"
+  exit 1
 fi
 
 if [ "$action" = "review-apps:create" ]; then
-    log-info "Ensuring review app '${review_app_name}' exists"
-    ssh "$ssh_remote" -- apps:clone --skip-deploy --ignore-existing "$app_name" "$review_app_name"
+  log-info "Ensuring review app '${review_app_name}' exists"
+  ssh "$ssh_remote" -- apps:clone --skip-deploy --ignore-existing "$app_name" "$review_app_name"
 fi
 
-log-info "Pushing to Dokku Host";
+log-info "Pushing to Dokku Host"
 
 if [ -n "$review_app_name" ] && [ "$app_name" != "$review_app_name" ]; then
-    GIT_REMOTE_URL="${GIT_REMOTE_URL%"/$app_name"}/${review_app_name}"
+  GIT_REMOTE_URL="${GIT_REMOTE_URL%"/$app_name"}/${review_app_name}"
 fi
 
 git push "$GIT_PUSH_FLAGS" "$GIT_REMOTE_URL" "$GITHUB_SHA:refs/heads/$BRANCH" --force

bin/parse-app-name

@@ -1,4 +1,4 @@
 #!/bin/sh -l
 set -e
 
-echo "$GIT_REMOTE_URL" | sed -e 's/.*\///'
+echo "$GIT_REMOTE_URL" | sed -e 's/.*\///'

bin/parse-ssh-port

@@ -6,4 +6,4 @@ if [ -z "$ssh_port" ]; then
   ssh_port=22
 fi
 
-echo $ssh_port
+echo $ssh_port

bin/setup-ssh

@@ -4,20 +4,20 @@ set -e
 log-info "Setting up SSH Key"
 
 mkdir -p /root/.ssh
-echo "$SSH_PRIVATE_KEY" | tr -d '\r' > /root/.ssh/id_rsa
+echo "$SSH_PRIVATE_KEY" | tr -d '\r' >/root/.ssh/id_rsa
 chmod 600 /root/.ssh/id_rsa
 chmod 700 /root/.ssh
 
 if [ -n "$SSH_HOST_KEY" ]; then
   log-info "Adding SSH_HOST_KEY to known_hosts"
-  echo "$SSH_HOST_KEY" >> "/root/.ssh/known_hosts"
+  echo "$SSH_HOST_KEY" >>"/root/.ssh/known_hosts"
   chmod 600 "/root/.ssh/known_hosts"
 else
   ssh_port=$(parse-ssh-port)
   ssh_host=$(parse-ssh-host)
 
   log-info "Generating SSH_HOST_KEY from ssh-keyscan against $ssh_host:$ssh_port"
-  ssh-keyscan -H -p "$ssh_port" "$ssh_host" >> /root/.ssh/known_hosts
+  ssh-keyscan -H -p "$ssh_port" "$ssh_host" >>/root/.ssh/known_hosts
 fi
 
 log-info "Adding SSH Key to ssh-agent"