Return watch errors from helpers (#11)

Signed-off-by: Jakub Scholz <www@scholzj.com>

Author: scholzj

cmd/utils.go

@@ -130,7 +130,7 @@ func waitUntilReady(client strimzi.Interface, name string, namespace string, tim
 
 	watcher, err := client.KafkaV1().Kafkas(namespace).Watch(watchContext, metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String()})
 	if err != nil {
-		panic(err)
+		return false, fmt.Errorf("failed to watch Kafka cluster %s in namespace %s: %w", name, namespace, err)
 	}
 
 	defer watcher.Stop()
@@ -172,7 +172,7 @@ func waitUntilReconciliationPaused(client strimzi.Interface, name string, namesp
 
 	watcher, err := client.KafkaV1().Kafkas(namespace).Watch(watchContext, metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(metav1.ObjectNameField, name).String()})
 	if err != nil {
-		panic(err)
+		return false, fmt.Errorf("failed to watch Kafka cluster %s in namespace %s: %w", name, namespace, err)
 	}
 
 	defer watcher.Stop()

cmd/utils_test.go

@@ -229,6 +229,24 @@ func TestWaitUntilReady_ReturnsErrorOnTimeout(t *testing.T) {
 	}
 }
 
+func TestWaitUntilReady_ReturnsErrorWhenWatchFails(t *testing.T) {
+	strimziClient := strimzifake.NewSimpleClientset()
+	wantErr := errors.New("watch failed")
+
+	strimziClient.PrependWatchReactor("kafkas", func(action k8stesting.Action) (bool, watch.Interface, error) {
+		return true, nil, wantErr
+	})
+
+	_, err := waitUntilReady(strimziClient, "my-cluster", "ns", 10)
+	if err == nil {
+		t.Fatal("expected watch error, got nil")
+	}
+
+	if !errors.Is(err, wantErr) {
+		t.Fatalf("expected %v, got %v", wantErr, err)
+	}
+}
+
 func TestWaitUntilReconciliationPaused_ReturnsTrueWhenPausedEventArrives(t *testing.T) {
 	strimziClient := strimzifake.NewSimpleClientset()
 	fakeWatch := watch.NewFake()
@@ -301,6 +319,24 @@ func TestWaitUntilReconciliationPaused_ReturnsErrorOnTimeout(t *testing.T) {
 	}
 }
 
+func TestWaitUntilReconciliationPaused_ReturnsErrorWhenWatchFails(t *testing.T) {
+	strimziClient := strimzifake.NewSimpleClientset()
+	wantErr := errors.New("watch failed")
+
+	strimziClient.PrependWatchReactor("kafkas", func(action k8stesting.Action) (bool, watch.Interface, error) {
+		return true, nil, wantErr
+	})
+
+	_, err := waitUntilReconciliationPaused(strimziClient, "my-cluster", "ns", 10)
+	if err == nil {
+		t.Fatal("expected watch error, got nil")
+	}
+
+	if !errors.Is(err, wantErr) {
+		t.Fatalf("expected %v, got %v", wantErr, err)
+	}
+}
+
 func TestWaitForPodSetPodsDeletion_ReturnsNilWhenNoPodsExist(t *testing.T) {
 	kube := k8sfake.NewSimpleClientset()