Update sourcehawk to 0.4.4, improve tests

Author: brianwyka

Dockerfile

@@ -1,7 +1,7 @@
 # Github Docs: https://docs.github.com/en/free-pro-team@latest/actions/creating-actions/dockerfile-support-for-github-actions
 
 # Small Linux based image with sourcehawk installed
-FROM optumopensource/sourcehawk:0.4.3
+FROM optumopensource/sourcehawk:0.4.4
 
 # Need root to write
 USER root
@@ -12,5 +12,5 @@ WORKDIR /github/workspace
 # Copy Entrypoint script into image
 COPY entrypoint.sh /entrypoint.sh
 
-# Execute the entrypoint
+# Execute the entrypointb
 ENTRYPOINT ["/entrypoint.sh"]

test.sh

@@ -13,29 +13,30 @@ TESTS=( "scan-passed" "scan-failed" "scan-error" "scan-custom" "scan-warning" "s
 PASSED=()
 FAILED=()
 
-echo "Running Tests"
+echo " "
+echo -e "\e[1mRunning Github Action Tests\e[0m"
 echo "----------------------------------------"
 
 # Execute Tests
 for test in "${TESTS[@]}"; do
 
-  echo "[TEST]: ${test}"
+  echo -e "\e[36m${test}\e[0m"
   echo "----------------------------------------"
 
   if ./tests/"${test}".sh "$ROOT" "$TEST_IMAGE"; then
-    echo " >> PASSED"
+    echo -e " >> \e[92mPASSED\e[0m"
     PASSED+=("${test}")
   else
-    echo " >> [ERROR] FAILED"
+    echo -e " >> \e[31mFAILED\e[0m"
     FAILED+=("${test}")
   fi
   echo "----------------------------------------"
 
 done
 
-echo "Tests Completed"
+echo -e "\e[1mTests Completed\e[0m"
 echo -n " >> Result: "
-[ ${#FAILED[@]} -gt 0 ] && echo "FAILURE " || echo "SUCCESS"
+[ ${#FAILED[@]} -gt 0 ] && echo -e "\e[31mFAILURE\e[0m " || echo -e "\e[92mSUCCESS\e[0m"
 echo " >> Tests: $((${#PASSED[@]}+${#FAILED[@]})), Passed: ${#PASSED[@]}, Failed: ${#FAILED[@]}"
 echo "----------------------------------------"
 exit ${#FAILED[@]}

tests/scan-custom.sh

@@ -15,14 +15,34 @@ else
   FAILED+=("$TEST_NAME")
 fi
 
-TEST_NAME="SCAN_RESULT_MESSAGE"
-FIRST_LINE=$(echo "$OUTPUT" | head -1 | sed -e 's/[[:space:]]*$//')
-EXPECTED='{"passed":true,"errorCount":0,"warningCount":0,"messages":{},"formattedMessages":[],"passedWithNoWarnings":true}'
-if [[ "$FIRST_LINE" = "$EXPECTED" ]]; then
+TEST_NAME="SCAN_RESULT_JSON"
+OUTPUT_JSON="$(echo "$OUTPUT" | head -n -1 | sed 's/ *$//')"
+read -r -d '' EXPECTED_JSON << EOS
+{
+  "passedWithNoWarnings" : true,
+  "passed" : true,
+  "warningCount" : 0,
+  "messages" : { },
+  "errorCount" : 0,
+  "formattedMessages" : [ ]
+}
+EOS
+if [[ "$OUTPUT_JSON" == "$EXPECTED_JSON" ]]; then
   echo " > $TEST_NAME: Correct"
   PASSED+=("$TEST_NAME")
 else
-  echo " > $TEST_NAME: Missing or incorrect, found: [$FIRST_LINE], expected: [$EXPECTED]"
+  echo " > $TEST_NAME: Missing or incorrect, found: [$OUTPUT_JSON], expected: [$EXPECTED_JSON]"
+  FAILED+=("$TEST_NAME")
+fi
+
+TEST_NAME="GITHUB_ACTION_OUTPUT"
+LAST_LINE=$(echo "$OUTPUT" | tail -1 | sed -e 's/[[:space:]]*$//')
+EXPECTED="::set-output name=scan-passed::true"
+if [[ "$LAST_LINE" = "$EXPECTED" ]]; then
+  echo " > $TEST_NAME: Correct"
+  PASSED+=("$TEST_NAME")
+else
+  echo " > $TEST_NAME: Missing scan-passed(true) output"
   FAILED+=("$TEST_NAME")
 fi
 
@@ -35,5 +55,15 @@ else
   FAILED+=("$TEST_NAME")
 fi
 
+TEST_NAME="RESULT_FILE_JSON"
+OUTPUT_JSON_FILE="$(sed 's/ *$//' "sourcehawk-scan-results.json")"
+if [[ "$OUTPUT_JSON_FILE" == "$EXPECTED_JSON" ]]; then
+  echo " > $TEST_NAME: Correct"
+  PASSED+=("$TEST_NAME")
+else
+  echo " > $TEST_NAME: Incorrect result file JSON, found: [$OUTPUT_JSON_FILE], expected: [$EXPECTED_JSON]"
+  FAILED+=("$TEST_NAME")
+fi
+
 echo " >> Tests: $((${#PASSED[@]}+${#FAILED[@]})), Passed: ${#PASSED[@]}, Failed: ${#FAILED[@]}"
 exit ${#FAILED[@]}