chore: Use identifier returned from Find

Author: Baarsgaard

controllers/alertrulegroup_controller.go

@@ -309,9 +309,9 @@ func (r *GrafanaAlertRuleGroupReconciler) finalize(ctx context.Context, group *g
 	}
 
 	for _, instance := range instances {
-		found, _ := instance.Status.AlertRuleGroups.Find(group.Namespace, group.Name)
+		found, groupName := instance.Status.AlertRuleGroups.Find(group.Namespace, group.Name)
 		if !found {
-			log.Info("alertrulegroup not found on instance - skipping finalize", "grafana", instance.Name, "name", group.GroupName())
+			log.Info("alertrulegroup not found on instance - skipping finalize", "grafana", instance.Name, "name", groupName)
 			continue
 		}
 
@@ -322,7 +322,7 @@ func (r *GrafanaAlertRuleGroupReconciler) finalize(ctx context.Context, group *g
 				return fmt.Errorf("building grafana client: %w", err)
 			}
 
-			_, err = cl.Provisioning.DeleteAlertRuleGroup(group.GroupName(), folderUID) //nolint:errcheck
+			_, err = cl.Provisioning.DeleteAlertRuleGroup(*groupName, folderUID) //nolint:errcheck
 			if err != nil {
 				var notFound *provisioning.DeleteAlertRuleGroupNotFound
 				if !errors.As(err, &notFound) {

controllers/librarypanel_controller.go

@@ -239,15 +239,13 @@ func (r *GrafanaLibraryPanelReconciler) finalize(ctx context.Context, libraryPan
 	log := logf.FromContext(ctx)
 	log.Info("Finalizing GrafanaLibraryPanel")
 
-	uid := content.CustomUIDOrUID(libraryPanel, libraryPanel.Status.UID)
-
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, libraryPanel)
 	if err != nil {
 		return fmt.Errorf("fetching instances: %w", err)
 	}
 
 	for _, instance := range instances {
-		found, _ := instance.Status.LibraryPanels.Find(libraryPanel.Namespace, libraryPanel.Name)
+		found, uid := instance.Status.LibraryPanels.Find(libraryPanel.Namespace, libraryPanel.Name)
 		if !found {
 			log.Info("librarypanel not found on instance - skipping finalize", "grafana", instance.Name, "uid", uid)
 			continue
@@ -260,7 +258,7 @@ func (r *GrafanaLibraryPanelReconciler) finalize(ctx context.Context, libraryPan
 
 		isCleanupInGrafanaRequired := true
 
-		resp, err := grafanaClient.LibraryElements.GetLibraryElementConnections(uid)
+		resp, err := grafanaClient.LibraryElements.GetLibraryElementConnections(*uid)
 		if err != nil {
 			var notFound *library_elements.GetLibraryElementConnectionsNotFound
 			if !errors.As(err, &notFound) {
@@ -273,10 +271,10 @@ func (r *GrafanaLibraryPanelReconciler) finalize(ctx context.Context, libraryPan
 		// Skip cleanup in instances
 		if isCleanupInGrafanaRequired {
 			if len(resp.Payload.Result) > 0 {
-				return fmt.Errorf("library panel %s/%s/%s on instance %s/%s has existing connections", libraryPanel.Namespace, libraryPanel.Name, uid, instance.Namespace, instance.Name) //nolint
+				return fmt.Errorf("library panel %s/%s/%s on instance %s/%s has existing connections", libraryPanel.Namespace, libraryPanel.Name, *uid, instance.Namespace, instance.Name) //nolint
 			}
 
-			_, err = grafanaClient.LibraryElements.DeleteLibraryElementByUID(uid) //nolint:errcheck
+			_, err = grafanaClient.LibraryElements.DeleteLibraryElementByUID(*uid) //nolint:errcheck
 			if err != nil {
 				var notFound *library_elements.DeleteLibraryElementByUIDNotFound
 				if !errors.As(err, &notFound) {