From f25818925134db9ec837ef46d9fbf0b1fb6d2360 Mon Sep 17 00:00:00 2001
From: Andrii Sultanov <andrii.sultanov@cloud.com>
Date: Tue, 3 Sep 2024 13:12:10 +0100
Subject: [PATCH] CP-32625: xenops-cli - replace handwritten JSON prettifier
 with yojson

Previously, the output of `xenops-cli diagnostics` was ill-formed JSON,
as keys weren't quoted strings and objects weren't separated by commas.
Just use yojson.prettify instead.

Before:
```
$ xenops-cli diagnostics
{
    vm_actions:  {} tasks:  [] updates:  {
        updates:  [] barriers:  []
    } scheduler:  [] workers:  [
        {
            state:  Idle
        } {
            state:  Idle
        } {
            state:  Idle
        }
    ] queues:  []
}
```

After:
```
$ xenops-cli diagnostics
{
  "vm_actions": {},
  "tasks": [],
  "updates": { "updates": [], "barriers": [] },
  "scheduler": [],
  "workers": [
    { "state": "Idle" },
    { "state": "Idle" },
    { "state": "Idle" }
  ],
  "queues": []
}
```

Nothing seems to rely on parsing the output of xenops-cli, so this should be
safe.

Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
---
 ocaml/xenopsd/cli/dune  |  3 +-
 ocaml/xenopsd/cli/xn.ml | 66 ++---------------------------------------
 2 files changed, 5 insertions(+), 64 deletions(-)

diff --git a/ocaml/xenopsd/cli/dune b/ocaml/xenopsd/cli/dune
index 0b2e0f0c2cf..f4cf59242c1 100644
--- a/ocaml/xenopsd/cli/dune
+++ b/ocaml/xenopsd/cli/dune
@@ -8,7 +8,7 @@
   (libraries
       astring
       cmdliner
-      
+
       re
       result
       rpclib.core
@@ -22,6 +22,7 @@
       xapi-idl.xen.interface
       xapi-idl.xen.interface.types
       xapi-stdext-pervasives
+      yojson
   )
   (preprocess (per_module ((pps ppx_deriving_rpc) Common Xn_cfg_types)))
 )
diff --git a/ocaml/xenopsd/cli/xn.ml b/ocaml/xenopsd/cli/xn.ml
index 9658650699f..811b004bdc3 100644
--- a/ocaml/xenopsd/cli/xn.ml
+++ b/ocaml/xenopsd/cli/xn.ml
@@ -701,70 +701,10 @@ let list_compact () =
 let list copts =
   diagnose_error (if copts.Common.verbose then list_verbose else list_compact)
 
-type t = Line of string | Block of t list
-
-let pp x =
-  let open Rpc in
-  let rec to_string_list = function
-    | Line x ->
-        [x]
-    | Block xs ->
-        let xs' = List.map to_string_list xs |> List.concat in
-        List.map (fun x -> "    " ^ x) xs'
-  in
-  let flatten xs =
-    let rec aux line = function
-      | Line x :: xs ->
-          aux (if line <> "" then line ^ " " ^ x else x) xs
-      | Block x :: xs ->
-          (if line <> "" then [Line line] else [])
-          @ [Block (aux "" x)]
-          @ aux "" xs
-      | [] ->
-          if line <> "" then [Line line] else []
-    in
-    aux "" xs
-  in
-  let rec to_t = function
-    | Int32 x ->
-        [Line (Printf.sprintf "%d" (Int32.to_int x))]
-    | Int x ->
-        [Line (Printf.sprintf "%Ld" x)]
-    | Bool x ->
-        [Line (Printf.sprintf "%b" x)]
-    | Float x ->
-        [Line (Printf.sprintf "%g" x)]
-    | String x ->
-        [Line x]
-    | DateTime x ->
-        [Line x]
-    | Enum [] ->
-        [Line "[]"]
-    | Enum xs ->
-        [Line "["; Block (List.concat (List.map to_t xs)); Line "]"]
-    | Dict [] ->
-        [Line "{}"]
-    | Dict xs ->
-        [
-          Line "{"
-        ; Block
-            (List.concat (List.map (fun (s, t) -> Line (s ^ ": ") :: to_t t) xs))
-        ; Line "}"
-        ]
-    | Base64 x ->
-        [Line x]
-    | Null ->
-        []
-  in
-  x
-  |> to_t
-  |> flatten
-  |> List.map to_string_list
-  |> List.concat
-  |> List.iter (Printf.printf "%s\n")
-
 let diagnostics' () =
-  Client.get_diagnostics dbg () |> Jsonrpc.of_string |> pp ;
+  Client.get_diagnostics dbg ()
+  |> Yojson.Safe.prettify ~std:true
+  |> print_endline ;
   `Ok ()
 
 let stat_vm _ id =