Fix ConfigMap masking not applied when called from gather_run

The masking code in gather_services_cm was only executed when the script
was run directly (CALLED=1), but not when sourced and called from
gather_run. This caused passwords and sensitive data in ConfigMaps to
remain unmasked during must-gather collection.

Move the wait_bg and masking logic inside the gather_services_cm()
function itself, following the same pattern used in gather_secrets.
This ensures masking is applied regardless of how the script is invoked.

Follow-up to: 466f4e7 (Mask sensitive data in CRs and ConfigMaps)

Jira: OSPRH-20621

Signed-off-by: Martin Schuppert <[email protected]>

Author: stuggi

collection-scripts/gather_services_cm

@@ -34,6 +34,14 @@ gather_services_cm () {
     for svc in "${OSP_SERVICES[@]}"; do
             get_cm "$NS" "$svc"
     done
+
+    # Ensure background configmap gathering tasks are done before masking
+    wait_bg
+
+    if [[ "${DO_NOT_MASK}" -eq 0 ]]; then
+        # All configmaps have been collected, apply masking on the configmaps directory
+        /usr/bin/mask.py --dir "${NAMESPACE_PATH}/${NS}/configmaps"
+    fi
 }
 
 
@@ -45,10 +53,4 @@ if [[ $CALLED -eq 1 ]]; then
     fi
 
     gather_services_cm "$NS"
-    wait_bg
-
-    if [[ "${DO_NOT_MASK}" -eq 0 ]]; then
-        # All configmaps have been collected, apply masking on the configmaps directory
-        /usr/bin/mask.py --dir "${NAMESPACE_PATH}/${NS}/configmaps"
-    fi
 fi