diff --git a/util/html/generate-html-from-csv.sh b/util/html/generate-html-from-csv.sh
index 7c745020..47433366 100755
--- a/util/html/generate-html-from-csv.sh
+++ b/util/html/generate-html-from-csv.sh
@@ -122,9 +122,11 @@ addHtmlHeader() {
| Status |
Result |
+ Severity |
AccountID |
Region |
- Group |
+ Compliance |
+ Service |
CheckID |
Check Title |
Check Output |
@@ -166,16 +168,17 @@ EOF
unset HTML_REPORT_INIT
}
-
addHtmlHeader > ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
-while read PROFILE ACCOUNT_NUM REGION TITLE_ID RESULT SCORED LEVEL TITLE_TEXT NOTES;do
+while IFS=, read -r PROFILE ACCOUNT_NUM REPREGION TITLE_ID RESULT SCORED LEVEL TITLE_TEXT NOTES ASFF_COMPLIANCE_TYPE CHECK_SEVERITY CHECK_SERVICENAME;do
if [[ $RESULT == "INFO" ]]; then
echo '
' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo 'INFO | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SEVERITY' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$ACCOUNT_NUM' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$REGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$LEVEL' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$REPREGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$ASFF_COMPLIANCE_TYPE' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SERVICENAME' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_ID' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_TEXT' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$NOTES' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
@@ -185,9 +188,11 @@ while read PROFILE ACCOUNT_NUM REGION TITLE_ID RESULT SCORED LEVEL TITLE_TEXT NO
echo '
' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo 'PASS | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SEVERITY' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$ACCOUNT_NUM' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$REGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$LEVEL' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$REPREGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$ASFF_COMPLIANCE_TYPE' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SERVICENAME' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_ID' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_TEXT' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$NOTES' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
@@ -197,9 +202,11 @@ while read PROFILE ACCOUNT_NUM REGION TITLE_ID RESULT SCORED LEVEL TITLE_TEXT NO
echo '
' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo '| | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo 'FAIL | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SEVERITY' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$ACCOUNT_NUM' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$REGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$LEVEL' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$REPREGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$ASFF_COMPLIANCE_TYPE' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SERVICENAME' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_ID' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_TEXT' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$NOTES' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
@@ -209,9 +216,11 @@ while read PROFILE ACCOUNT_NUM REGION TITLE_ID RESULT SCORED LEVEL TITLE_TEXT NO
echo '
' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo 'WARN | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SEVERITY' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$ACCOUNT_NUM' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$REGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
- echo ''$LEVEL' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$REPREGION' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$ASFF_COMPLIANCE_TYPE' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+ echo ''$CHECK_SERVICENAME' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_ID' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$TITLE_TEXT' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
echo ''$NOTES' | ' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML