From f1d3d66da3ea3af673d441f2092a0c9a94909004 Mon Sep 17 00:00:00 2001
From: Jordan Moore <1930631+OneCricketeer@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:58:00 -0500
Subject: [PATCH] fix(banzai/KafkaCluster): Update health.lua (#15962)

fix(banzai/KafkaCluster): Update health.lua (#15962)

Uses ipairs() to correctly iterates over indexed elements

Signed-off-by: Jordan Moore <1930631+OneCricketeer@users.noreply.github.com>
---
 .../KafkaCluster/health.lua                   | 23 ++++++++-----------
 .../KafkaCluster/health_test.yaml             |  2 +-
 .../KafkaCluster/testdata/healthy.yaml        |  6 ++---
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health.lua b/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health.lua
index d24afea652c2a..7422fd4104727 100644
--- a/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health.lua
+++ b/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health.lua
@@ -1,22 +1,17 @@
 local health_status = {}
 if obj.status ~= nil then
   if obj.status.brokersState ~= nil then
-    local counter = 0
-    local brokerReady = 0
-    for i, broker in pairs(obj.status.brokersState) do
-        if (brokerReady <= tonumber(i)) then
-            brokerReady = tonumber(i)+1
-        else
-            brokerReady = brokerReady
-        end
-        if broker.configurationState == "ConfigInSync" and broker.gracefulActionState.cruiseControlState == "GracefulUpscaleSucceeded" then
-          counter = counter + 1
-        end
-        if broker.configurationState == "ConfigInSync" and broker.gracefulActionState.cruiseControlState == "GracefulDownscaleSucceeded" then
-          counter = counter + 1
+    local numberBrokers = 0
+    local healthyBrokers = 0
+    for _, broker in pairs(obj.status.brokersState) do
+      numberBrokers = numberBrokers + 1
+      if broker.configurationState == "ConfigInSync" then
+        if broker.gracefulActionState.cruiseControlState == "GracefulUpscaleSucceeded" or broker.gracefulActionState.cruiseControlState == "GracefulDownscaleSucceeded" then
+          healthyBrokers = healthyBrokers + 1
         end
+      end
     end
-    if counter == brokerReady then
+    if numberBrokers == healthyBrokers then
       if obj.status.cruiseControlTopicStatus == "CruiseControlTopicReady" and obj.status.state == "ClusterRunning" then
         health_status.message = "Kafka Brokers, CruiseControl and cluster are in Healthy State."
         health_status.status = "Healthy"
diff --git a/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health_test.yaml b/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health_test.yaml
index 9446d882d941a..776cc02739326 100644
--- a/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health_test.yaml
+++ b/resource_customizations/kafka.banzaicloud.io/KafkaCluster/health_test.yaml
@@ -14,4 +14,4 @@ tests:
 - healthStatus:
     status: Healthy
     message: "Kafka Brokers, CruiseControl and cluster are in Healthy State."
-  inputPath: testdata/healthy.yaml
+  inputPath: testdata/healthy.yaml
\ No newline at end of file
diff --git a/resource_customizations/kafka.banzaicloud.io/KafkaCluster/testdata/healthy.yaml b/resource_customizations/kafka.banzaicloud.io/KafkaCluster/testdata/healthy.yaml
index 9dd791b9c39fe..44666fd6a83a5 100644
--- a/resource_customizations/kafka.banzaicloud.io/KafkaCluster/testdata/healthy.yaml
+++ b/resource_customizations/kafka.banzaicloud.io/KafkaCluster/testdata/healthy.yaml
@@ -20,21 +20,21 @@ spec: {}
 status:
   alertCount: 0
   brokersState:
-    "0":
+    "101":
       configurationState: ConfigInSync
       gracefulActionState:
         cruiseControlState: GracefulUpscaleSucceeded
         errorMessage: CruiseControl not yet ready
       rackAwarenessState: |
         broker.rack=us-east-1,us-east-1c
-    "1":
+    "102":
       configurationState: ConfigInSync
       gracefulActionState:
         cruiseControlState: GracefulUpscaleSucceeded
         errorMessage: CruiseControl not yet ready
       rackAwarenessState: |
         broker.rack=us-east-1,us-east-1b
-    "2":
+    "103":
       configurationState: ConfigInSync
       gracefulActionState:
         cruiseControlState: GracefulUpscaleSucceeded