chore: Make checks more idiomatic

grafana · Jan 4, 2025 · 7d1bdbf · 7d1bdbf
1 parent 54040ec
commit 7d1bdbf
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/controllers/controller_shared.go b/controllers/controller_shared.go
@@ -84,10 +84,14 @@ func GetScopedMatchingInstances(log logr.Logger, ctx context.Context, k8sClient
 
 	var list v1beta1.GrafanaList
 	err := k8sClient.List(ctx, &list, opts...)
-	if err != nil || len(list.Items) == 0 {
+	if err != nil {
 		return []v1beta1.Grafana{}, err
 	}
 
+	if len(list.Items) == 0 {
+		return []v1beta1.Grafana{}, nil
+	}
+
 	selectedList := []v1beta1.Grafana{}
 	var unready_instances []string
 	for _, instance := range list.Items {
@@ -124,10 +128,14 @@ func GetAllMatchingInstances(ctx context.Context, k8sClient client.Client, cr v1
 
 	var list v1beta1.GrafanaList
 	err := k8sClient.List(ctx, &list, client.MatchingLabels(instanceSelector.MatchLabels))
-	if err != nil || len(list.Items) == 0 {
+	if err != nil {
 		return []v1beta1.Grafana{}, err
 	}
 
+	if len(list.Items) == 0 {
+		return []v1beta1.Grafana{}, nil
+	}
+
 	selectedList := []v1beta1.Grafana{}
 	for _, instance := range list.Items {
 		// Matches all instances when MatchExpressions is undefined