chore: Use "Exists" for a simpler implementation

Author: Baarsgaard

api/v1beta1/grafanacontactpoint_types.go

@@ -77,13 +77,13 @@ type GrafanaContactPointList struct {
 	Items           []GrafanaContactPoint `json:"items"`
 }
 
-func (in *GrafanaContactPointList) Find(namespace string, name string) *GrafanaContactPoint {
+func (in *GrafanaContactPointList) Exists(namespace, name string) bool {
 	for _, contactpoint := range in.Items {
 		if contactpoint.Namespace == namespace && contactpoint.Name == name {
-			return &contactpoint
+			return true
 		}
 	}
-	return nil
+	return false
 }
 
 // Wrapper around CustomUID or default metadata.uid

api/v1beta1/grafanadashboard_types.go

@@ -128,13 +128,13 @@ func (in *GrafanaDashboard) GrafanaContentStatus() *GrafanaContentStatus {
 
 var _ GrafanaContentResource = &GrafanaDashboard{}
 
-func (in *GrafanaDashboardList) Find(namespace string, name string) *GrafanaDashboard {
+func (in *GrafanaDashboardList) Exists(namespace, name string) bool {
 	for _, dashboard := range in.Items {
 		if dashboard.Namespace == namespace && dashboard.Name == name {
-			return &dashboard
+			return true
 		}
 	}
-	return nil
+	return false
 }
 
 func (in *GrafanaDashboard) MatchLabels() *metav1.LabelSelector {

api/v1beta1/grafanadatasource_types.go

@@ -152,13 +152,13 @@ func (in *GrafanaDatasource) CustomUIDOrUID() string {
 	return string(in.UID)
 }
 
-func (in *GrafanaDatasourceList) Find(namespace string, name string) *GrafanaDatasource {
+func (in *GrafanaDatasourceList) Exists(namespace, name string) bool {
 	for _, datasource := range in.Items {
 		if datasource.Namespace == namespace && datasource.Name == name {
-			return &datasource
+			return true
 		}
 	}
-	return nil
+	return false
 }
 
 func (in *GrafanaDatasource) MatchLabels() *metav1.LabelSelector {

api/v1beta1/grafanafolder_types.go

@@ -133,13 +133,13 @@ func init() {
 	SchemeBuilder.Register(&GrafanaFolder{}, &GrafanaFolderList{})
 }
 
-func (in *GrafanaFolderList) Find(namespace string, name string) *GrafanaFolder {
+func (in *GrafanaFolderList) Exists(namespace, name string) bool {
 	for _, folder := range in.Items {
 		if folder.Namespace == namespace && folder.Name == name {
-			return &folder
+			return true
 		}
 	}
-	return nil
+	return false
 }
 
 func (in *GrafanaFolder) Hash() string {

api/v1beta1/grafanalibrarypanel_types.go

@@ -116,13 +116,13 @@ func (in *GrafanaLibraryPanel) GrafanaContentStatus() *GrafanaContentStatus {
 
 var _ GrafanaContentResource = &GrafanaLibraryPanel{}
 
-func (in *GrafanaLibraryPanelList) Find(namespace string, name string) *GrafanaLibraryPanel {
+func (in *GrafanaLibraryPanelList) Exists(namespace, name string) bool {
 	for _, e := range in.Items {
 		if e.Namespace == namespace && e.Name == name {
-			return &e
+			return true
 		}
 	}
-	return nil
+	return false
 }
 
 func init() {

api/v1beta1/namespaced_resource.go

@@ -10,8 +10,8 @@ type NamespacedResource string
 type NamespacedResourceList []NamespacedResource
 
 // +kubebuilder:object:generate=false
-type NamespacedResourceImpl[T interface{}] interface {
-	Find(namespace string, name string) *T
+type NamespacedResourceImpl interface {
+	Exists(namespace string, name string) bool
 }
 
 func (in NamespacedResource) Split() (string, string, string) {

controllers/grafana_controller.go

@@ -135,10 +135,10 @@ func (r *GrafanaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	return ctrl.Result{}, nil
 }
 
-func removeMissingCRs[T interface{}](statusList *grafanav1beta1.NamespacedResourceList, crs grafanav1beta1.NamespacedResourceImpl[T], updateStatus *bool) {
+func removeMissingCRs(statusList *grafanav1beta1.NamespacedResourceList, crs grafanav1beta1.NamespacedResourceImpl, updateStatus *bool) {
 	for _, namespacedCR := range *statusList {
 		namespace, name, _ := namespacedCR.Split()
-		if crs.Find(namespace, name) == nil {
+		if !crs.Exists(namespace, name) {
 			*statusList = statusList.Remove(namespace, name)
 			*updateStatus = true
 		}
@@ -159,35 +159,31 @@ func (r *GrafanaReconciler) syncStatuses(ctx context.Context) error {
 		return nil
 	}
 
-	// folders
+	// Fetch all resources
 	folders := &grafanav1beta1.GrafanaFolderList{}
 	err = r.List(ctx, folders)
 	if err != nil {
 		return err
 	}
 
-	// dashboards
 	dashboards := &grafanav1beta1.GrafanaDashboardList{}
 	err = r.List(ctx, dashboards)
 	if err != nil {
 		return err
 	}
 
-	// library libraryPanels
 	libraryPanels := &grafanav1beta1.GrafanaLibraryPanelList{}
 	err = r.List(ctx, libraryPanels)
 	if err != nil {
 		return err
 	}
 
-	// datasources
 	datasources := &grafanav1beta1.GrafanaDatasourceList{}
 	err = r.List(ctx, datasources)
 	if err != nil {
 		return err
 	}
 
-	// contact points
 	contactPoints := &grafanav1beta1.GrafanaContactPointList{}
 	err = r.List(ctx, contactPoints)
 	if err != nil {