fix: use correct folder uid to update permissions

grafana · Jul 4, 2024 · 9855012 · 9855012
1 parent 58f6a0c
commit 9855012
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/controllers/grafanafolder_controller.go b/controllers/grafanafolder_controller.go
@@ -389,7 +389,12 @@ func (r *GrafanaFolderReconciler) onFolderCreated(ctx context.Context, grafana *
 			return fmt.Errorf("failed to unmarshal spec.permissions: %w", err)
 		}
 
-		_, err = grafanaClient.FolderPermissions.UpdateFolderPermissions(uid, &permissions) //nolint
+		targetUID := uid
+		if exists {
+			targetUID = remoteUID
+		}
+
+		_, err = grafanaClient.FolderPermissions.UpdateFolderPermissions(targetUID, &permissions) //nolint
 		if err != nil {
 			return fmt.Errorf("failed to update folder permissions: %w", err)
 		}