Merge pull request #10 from RickvdStaaij/patch-1

Follow symbolic links when searching for files with environment variable to replace.

Author: nstapelbroek

files/bin/instateEnvironment.sh

@@ -5,6 +5,11 @@ if [ -z "$1" ]; then
     exit 1;
 fi
 
+if [ ! -f "$1" ]; then
+    (>&2 echo "$1 No such file or directory")
+    exit 2;
+fi
+
 grep -o "{container.env.[a-zA-Z0-9_]\+}" $1 | while read -r GREPRESULT ; do
     # Remove the {container.env.} from the grep result
     ENVNAME=$(echo $GREPRESULT | cut -c16- | rev | cut -c2- | rev)

files/etc/cont-init.d/01-scan-webfiles-for-environment-variables

@@ -1,2 +1,2 @@
 #!/usr/bin/with-contenv sh
-find /var/www -type f -exec /bin/instateEnvironment.sh {} \;
+find -L /var/www -type f -exec /bin/instateEnvironment.sh {} \;

test/files/symlink_to_singleline.txt

@@ -0,0 +1 @@
+singleline.txt

test/files/symlink_to_symlink

@@ -0,0 +1 @@
+symlink_to_singleline.txt

test/symlinks.bats

@@ -0,0 +1,43 @@
+#/usr/bin/env bats
+
+load helpers/environment
+load helpers/assert_file
+load helpers/assertions/all
+
+setup () {
+    # @todo: fix test for [] since it breaks the grep assertion
+    
+    __setup_environment
+    __create_run_directory
+    export BATS_VARIABLE='nstapelbroek-was-here'
+}
+
+@test "Replacing a normal symlink" {
+    FILE=$BATS_RUN_DIR/files/symlink_to_singleline.txt
+    run /bin/sh $BATS_BINARY_DIR/instateEnvironment.sh $FILE
+    assert_success "Replacing {container.env.BATS_VARIABLE} with $BATS_VARIABLE in $FILE"
+    assert_file_refute_contains $FILE {container.env.BATS_VARIABLE}
+    assert_file_contains $FILE $BATS_VARIABLE
+}
+
+@test "Replacing a symlink to a symlink" {
+    FILE=$BATS_RUN_DIR/files/symlink_to_symlink
+    run /bin/sh $BATS_BINARY_DIR/instateEnvironment.sh $FILE
+    assert_success "Replacing {container.env.BATS_VARIABLE} with $BATS_VARIABLE in $FILE"
+    assert_file_refute_contains $FILE {container.env.BATS_VARIABLE}
+    assert_file_contains $FILE $BATS_VARIABLE
+}
+
+@test "Replacing a dead_symlink" {
+    FILE=$BATS_RUN_DIR/files/dead_symlink
+    ln -s $BATS_RUN_DIR/files/does_not_exists $FILE
+    run /bin/sh $BATS_BINARY_DIR/instateEnvironment.sh $FILE
+    assert_failure
+    rm -rf $FILE
+}
+
+@test "Replacing a non existing file" {
+    FILE=$BATS_RUN_DIR/files/does_not_exist
+    run /bin/sh $BATS_BINARY_DIR/instateEnvironment.sh $FILE
+    assert_failure
+}