Improve logging on empty script dir

Mahoney · Jan 8, 2021 · 83aa62c · 83aa62c
1 parent 4bd29d9
commit 83aa62c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/docker-lifecycle-listener.sh b/docker-lifecycle-listener.sh
@@ -91,6 +91,11 @@ run_if_possible() {
   fi
 }
 
+is_empty_dir() {
+  local dir="$1"
+  [ -z "$(ls -A "$dir")" ]
+}
+
 run_on() {
   local command="$1"
   local script_dir="$2"
@@ -99,9 +104,13 @@ run_on() {
 
   local dir; dir="$script_dir/on_$command/"
   if [ -d "$dir" ]; then
-    for file in "$dir"/*; do
-      run_if_possible "$file"
-    done
+    if ! is_empty_dir "$dir"; then
+      for file in "$dir"/*; do
+        run_if_possible "$file"
+      done
+    else
+      log "$dir is empty"
+    fi
   else
     log "$dir does not exist"
   fi

diff --git a/test/docker-lifecycle-listener.bats b/test/docker-lifecycle-listener.bats
@@ -67,3 +67,16 @@ teardown() {
 
   test "$status" -ne 0
 }
+
+@test "is_empty_dir succeeds if dir is empty" {
+  local empty_dir; empty_dir=$(mktemp -d)
+  is_empty_dir "$empty_dir"
+}
+
+@test "is_empty_dir fails if dir is empty" {
+  local non_empty_dir; non_empty_dir=$(mktemp -d)
+  touch "$non_empty_dir/something"
+
+  run is_empty_dir "$non_empty_dir"
+  test "$status" -ne 0
+}