diff --git a/functions_lib.sh b/functions_lib.sh index 037eb52..3e07147 100644 --- a/functions_lib.sh +++ b/functions_lib.sh @@ -5,7 +5,6 @@ host_configuration() { check_1_1 check_1_1_1 check_1_1_2 - check_1_1_end check_1_2 check_1_2_1 check_1_2_2 @@ -19,7 +18,6 @@ host_configuration() { check_1_2_10 check_1_2_11 check_1_2_12 - check_1_2_end check_1_end } @@ -158,10 +156,8 @@ docker_enterprise_configuration() { check_8_1_5 check_8_1_6 check_8_1_7 - check_8_1_end check_8_2 check_8_2_1 - check_8_2_end check_8_end } diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index 8d88303..a9374a1 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -15,7 +15,6 @@ check_1_1() { desc_1_1="General Configuration" check_1_1="$id_1_1 - $desc_1_1" info "$check_1_1" - startsectionjson "$id_1_1" "$desc_1_1" } # 1.1.1 @@ -58,17 +57,12 @@ check_1_1_2() { fi } -check_1_1_end() { - endsectionjson -} - check_1_2() { logit "" id_1_2="1.2" desc_1_2="Linux Hosts Specific Configuration" check_1_2="$id_1_2 - $desc_1_2" info "$check_1_2" - startsectionjson "$id_1_2" "$desc_1_2" } # 1.2.1 @@ -471,10 +465,6 @@ check_1_2_12() { fi } -check_1_2_end() { - endsectionjson -} - check_1_end() { endsectionjson } diff --git a/tests/8_docker_enterprise_configuration.sh b/tests/8_docker_enterprise_configuration.sh index f8bca33..29359fc 100644 --- a/tests/8_docker_enterprise_configuration.sh +++ b/tests/8_docker_enterprise_configuration.sh @@ -28,7 +28,6 @@ check_8_1() { desc_8_1="Universal Control Plane Configuration" check_8_1="$id_8_1 - $desc_8_1" info "$check_8_1" - startsectionjson "$id_8_1" "$desc_8_1" } # 8.1.1 @@ -150,10 +149,6 @@ check_8_1_7() { currentScore=$((currentScore + 0)) } -check_8_1_end() { - endsectionjson -} - check_8_2() { if [ "$enterprise_license" -ne 1 ]; then return @@ -164,7 +159,6 @@ check_8_2() { desc_8_2="Docker Trusted Registry Configuration" check_8_2="$id_8_2 - $desc_8_2" info "$check_8_2" - startsectionjson "$id_8_2" "$desc_8_2" } check_8_2_1() { @@ -183,10 +177,6 @@ check_8_2_1() { currentScore=$((currentScore + 0)) } -check_8_2_end() { - endsectionjson -} - check_8_end() { endsectionjson }