chore: Align Dashboard, Datasource and Folder finalize to always DELETE:

Author: Baarsgaard

controllers/dashboard_controller.go

@@ -221,26 +221,22 @@ func (r *GrafanaDashboardReconciler) finalize(ctx context.Context, cr *v1beta1.G
 	log := logf.FromContext(ctx)
 	log.Info("Finalizing GrafanaDashboard")
 
+	uid := content.CustomUIDOrUID(cr, cr.Status.UID)
+
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, cr)
 	if err != nil {
 		return fmt.Errorf("fetching instances: %w", err)
 	}
 
 	for _, grafana := range instances {
-		found, uid := grafana.Status.Dashboards.Find(cr.Namespace, cr.Name)
-		if !found {
-			log.Info("dashboard not found on instance - skipping finalize", "grafana", grafana.Name, "uid", uid)
-			continue
-		}
-
 		grafanaClient, err := client2.NewGeneratedGrafanaClient(ctx, r.Client, &grafana)
 		if err != nil {
 			return fmt.Errorf("creating grafana http client: %w", err)
 		}
 
 		isCleanupInGrafanaRequired := true
 
-		resp, err := grafanaClient.Dashboards.GetDashboardByUID(*uid)
+		resp, err := grafanaClient.Dashboards.GetDashboardByUID(uid)
 		if err != nil {
 			var notFound *dashboards.GetDashboardByUIDNotFound
 			if !errors.As(err, &notFound) {
@@ -256,7 +252,7 @@ func (r *GrafanaDashboardReconciler) finalize(ctx context.Context, cr *v1beta1.G
 				dash = resp.GetPayload()
 			}
 
-			_, err = grafanaClient.Dashboards.DeleteDashboardByUID(*uid) //nolint:errcheck
+			_, err = grafanaClient.Dashboards.DeleteDashboardByUID(uid) //nolint:errcheck
 			if err != nil {
 				var notFound *dashboards.DeleteDashboardByUIDNotFound
 				if !errors.As(err, &notFound) {

controllers/datasource_controller.go

@@ -222,24 +222,20 @@ func (r *GrafanaDatasourceReconciler) finalize(ctx context.Context, cr *v1beta1.
 		return fmt.Errorf("fetching instances: %w", err)
 	}
 
-	for _, grafana := range instances {
-		found, uid := grafana.Status.Datasources.Find(cr.Namespace, cr.Name)
-		if !found {
-			log.Info("datasource not found on instance - skipping finalize", "grafana", grafana.Name, "uid", uid)
-			continue
-		}
+	uid := cr.CustomUIDOrUID()
 
+	for _, grafana := range instances {
 		grafanaClient, err := client2.NewGeneratedGrafanaClient(ctx, r.Client, &grafana)
 		if err != nil {
 			return err
 		}
 
-		_, err = grafanaClient.Datasources.DeleteDataSourceByUID(*uid) // nolint:errcheck
+		_, err = grafanaClient.Datasources.DeleteDataSourceByUID(uid) // nolint:errcheck
 
 		var notFound *datasources.DeleteDataSourceByUIDNotFound
 		if err != nil {
 			if !errors.As(err, &notFound) {
-				return fmt.Errorf("deleting datasource %s: %w", *uid, err)
+				return fmt.Errorf("deleting datasource %s: %w", uid, err)
 			}
 		}
 

controllers/folder_controller.go

@@ -154,6 +154,8 @@ func (r *GrafanaFolderReconciler) finalize(ctx context.Context, folder *grafanav
 	log := logf.FromContext(ctx)
 	log.Info("Finalizing GrafanaFolder")
 
+	uid := folder.CustomUIDOrUID()
+
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, folder)
 	if err != nil {
 		return fmt.Errorf("fetching instances: %w", err)
@@ -163,18 +165,12 @@ func (r *GrafanaFolderReconciler) finalize(ctx context.Context, folder *grafanav
 	params := folders.NewDeleteFolderParams().WithForceDeleteRules(&reftrue)
 
 	for _, grafana := range instances {
-		found, uid := grafana.Status.Folders.Find(folder.Namespace, folder.Name)
-		if !found {
-			log.Info("folder not found on instance - skipping finalize", "grafana", grafana.Name, "uid", uid)
-			continue
-		}
-
 		grafanaClient, err := client2.NewGeneratedGrafanaClient(ctx, r.Client, &grafana)
 		if err != nil {
 			return err
 		}
 
-		_, err = grafanaClient.Folders.DeleteFolder(params.WithFolderUID(*uid)) //nolint
+		_, err = grafanaClient.Folders.DeleteFolder(params.WithFolderUID(uid)) //nolint
 		if err != nil {
 			var notFound *folders.DeleteFolderNotFound
 			if !errors.As(err, &notFound) {