Merge pull request #541 from marcjay/sort-checks-correctly-when-excludes-in-place-492

Avoid changing the execution order of checks when some checks are excluded

prowler

@@ -344,38 +344,38 @@ show_all_group_titles() {
 	done
 }
 
-
 # Function to execute all checks but exclude some of them
 get_all_checks_without_exclusion() {
-        CHECKS_EXCLUDED=()
+  CHECKS_EXCLUDED=()
-        local CHECKS_TO_EXCLUDE=()
+  local CHECKS_TO_EXCLUDE=()
-        local TOTAL_CHECKS=()
+  local TOTAL_CHECKS=()
-        #Get a list of checks to exclude
+  # Get a list of checks to exclude
-        IFS=',' read -ra E_CHECKS <<< "$1"
+  IFS=',' read -ra E_CHECKS <<< "$1"
-        for E_CHECK in "${E_CHECKS[@]}"; do
+  for E_CHECK in "${E_CHECKS[@]}"; do
-            CHECKS_TO_EXCLUDE+=($E_CHECK)
+    CHECKS_TO_EXCLUDE+=($E_CHECK)
-        done
+  done
-        #Get a list of total checks available by ID
+  # Get a list of total checks available by ID
-	for i in "${!GROUP_TITLE[@]}"; do
+  for i in "${!GROUP_TITLE[@]}"; do
-		#show_group_title $i
+    # show_group_title $i
-		IFS=',' read -ra CHECKS <<< ${GROUP_CHECKS[$i]}
+    IFS=',' read -ra CHECKS <<< ${GROUP_CHECKS[$i]}
-		for j in ${CHECKS[@]}; do
+    for j in ${CHECKS[@]}; do
-                    TOTAL_CHECKS+=($CHECK_ID_$j)
+      TOTAL_CHECKS+=($CHECK_ID_$j)
-		done
+    done
-	done
+  done
-        TOTAL_CHECKS=($(echo "${TOTAL_CHECKS[*]}" | tr ' ' '\n' | sort -u)) #removes duplicate and store the result as an array
+  # Remove duplicates whilst preserving the order of checks, and store the result as an array
-        #Create a list that contains all checks but excluded ones
+  TOTAL_CHECKS=($(echo "${TOTAL_CHECKS[*]}" | tr ' ' '\n' | awk '!seen[$0]++'))
-        for i in "${TOTAL_CHECKS[@]}"; do
+  # Create a list that contains all checks but excluded ones
-            local COINCIDENCE=false
+  for i in "${TOTAL_CHECKS[@]}"; do
-            for x in "${CHECKS_TO_EXCLUDE[@]}"; do
+    local COINCIDENCE=false
-                if [[ "$i" == "$x" ]]; then
+    for x in "${CHECKS_TO_EXCLUDE[@]}"; do
-                    COINCIDENCE=true
+      if [[ "$i" == "$x" ]]; then
-                fi
+        COINCIDENCE=true
-            done
+      fi
-            if [[ "$COINCIDENCE" = false ]]; then
+    done
-                CHECKS_EXCLUDED+=($i)
+    if [[ "$COINCIDENCE" = false ]]; then
-            fi
+      CHECKS_EXCLUDED+=($i)
-        done
+    fi
+  done
 }
 
 ### All functions defined above ... run the workflow