From 3adc7093f5407b4811f1cd4bf1c0970c037d3d63 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 17 Apr 2026 02:34:46 +0700
Subject: [PATCH] Resolving conflicts

---
 .../Procedure_push_docker_images.yml          | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index 3b94091d..28e9e104 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -128,23 +128,10 @@ jobs:
           echo "ALL_PRODUCTS_SELECTED=false" >> $GITHUB_OUTPUT
         fi
         # Set WAZUH_COMPONENTS
-        WC_JSON_ARRAY=""
-        if [[ "${{ inputs.products }}" != "null" && "${{ inputs.products }}" != "" ]]; then
-          # Convert comma-separated list to JSON array format
-          IFS=',' read -ra COMPONENTS <<< "${{ inputs.products }}"
-          WC_JSON_ARRAY="["
-          for i in "${!COMPONENTS[@]}"; do
-            if [ $i -gt 0 ]; then
-              WC_JSON_ARRAY+=","
-            fi
-            WC_JSON_ARRAY+="\"${COMPONENTS[$i]}\""
-          done
-          WC_JSON_ARRAY+="]"
-        else
-          WC_JSON_ARRAY='["wazuh-manager","wazuh-dashboard","wazuh-indexer","wazuh-agent"]'
-        fi
-        echo "Products to build: $WC_JSON_ARRAY"
-        echo "WAZUH_COMPONENTS=$WC_JSON_ARRAY" >> $GITHUB_OUTPUT
+        # Convert to JSON for the matrix (Your existing logic)
+        IFS=',' read -ra COMPONENTS <<< "$PRODUCTS"
+        JSON_ARRAY=$(printf '%s\n' "${COMPONENTS[@]}" | jq -R . | jq -s -c .)
+        echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
 
         # Set COMMIT_LIST
         WC_COMMIT_LIST=""