Revert "Revert "Staging to master" due to rendering problems"

This commit is contained in:
Catherine Luse
2022-04-04 17:19:35 -07:00
committed by GitHub
parent d857d24796
commit 7a7fa47547
25 changed files with 26998 additions and 52 deletions
+2 -2
View File
@@ -238,7 +238,7 @@ h2 {
font-size:1.5em;
}
h3 {font-size:1.4em;}
h3 {font-size:1.2em;}
h4 {font-size:1.3em;
line-height:30px;
}
@@ -283,7 +283,7 @@ nav ul li a {
nav ul li a::after {content: target-counter(attr(href url), page, decimal); float:right;margin-right:10px;}
nav ul li ul {list-style-type: none; border-left-style: dashed; border-left-width: 1px; border-color: #000; margin-top:1.5em;}
nav ul li ul li {margin-left:-.5em;color:#ff0000;}
nav ul li ul li a {border:none;font-family:PoppinsExtraLight;margin-top:-1.5em;}
nav ul li ul li a {border:none;font-family:PoppinsExtraLight;font-size:.75em;margin-bottom:1.8em;}
nav ul li ul li a::after {font-size:.75em;}
nav code {background:none;}
nav a{text-decoration:none;outline:none;color:#000;}
+11 -12
View File
@@ -19,7 +19,7 @@ get_id_text() {
get_section_ids() {
id=${1}
jq -r --arg id "${id}" '.[] | select(.id==$id) | .checks[].id' ${results_file}
jq -r --arg id "${id}" '.[] | select(.id==$id) | .checks[].id' ${results_file} | sort -V
}
get_section_desc() {
@@ -53,12 +53,11 @@ for id in $(get_ids); do
test_desc=$(echo ${result} | jq -r '.description')
audit=$(echo ${result} | jq -r '.audit')
audit_config=$(echo ${result} | jq -r '.audit_config')
actual_value=$(echo ${result} | jq -r '.actual_value_per_node."cis-aio-0"')
actual_value=$(echo ${result} | jq -r '.actual_value_per_node[]')
type=$(echo ${result} | jq -r '.test_type')
status=$(echo ${result} | jq -r '.state')
remediation=$(echo ${result} | jq -r '.remediation')
expected_result=$(echo ${result} | jq -r '.expected_result')
# echo "#### ${test} ${test_desc}"
echo
if [ "${type}" = "skip" ]; then
echo "**Result:** Not Applicable"
@@ -76,7 +75,7 @@ for id in $(get_ids); do
if [[ ${audit} =~ ".sh" ]]; then
audit_script=$(basename $(echo ${audit} | cut -d ' ' -f1))
test_helper="${test_helpers}/${audit_script}"
echo "**Audit Script:** ${audit_script}"
echo "**Audit Script:** \`${audit_script}\`"
echo
echo '```bash'
cat ${test_helper}
@@ -106,6 +105,14 @@ for id in $(get_ids); do
echo '```'
echo
fi
if [ ! -z "${expected_result}" ]; then
echo "**Expected Result**:"
echo
echo '```console'
echo ${expected_result}
echo '```'
echo
fi
if [ ! -z "${actual_value}" ] && [ "${status}" != "PASS" ] && [ "${type}" != "skip" ] && [ "${type}" != "manual" ]; then
echo "**Returned Value**:"
echo
@@ -114,14 +121,6 @@ for id in $(get_ids); do
echo '```'
echo
fi
if [ ! -z "${expected_result}" ]; then
echo "**Expected result**:"
echo
echo '```console'
echo ${expected_result}
echo '```'
echo
fi
done
done
done