etcdctl: fix json output

Signed-off-by: Kirill Trifonov <[email protected]>

Author: kstrifonoff

etcdctl/ctlv3/command/printer_json.go

@@ -18,10 +18,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"strconv"
-	"strings"
+	"slices"
 
-	clientv3 "go.etcd.io/etcd/client/v3"
+	v3 "go.etcd.io/etcd/client/v3"
 )
 
 type jsonPrinter struct {
@@ -36,65 +35,65 @@ func newJSONPrinter(isHex bool) printer {
 	}
 }
 
-func (p *jsonPrinter) EndpointHealth(r []epHealth) { printJSON(r) }
-func (p *jsonPrinter) EndpointStatus(r []epStatus) { printJSON(r) }
-func (p *jsonPrinter) EndpointHashKV(r []epHashKV) { printJSON(r) }
+func (p *jsonPrinter) EndpointHealth(r []epHealth) { p.printJSON(r) }
+func (p *jsonPrinter) EndpointStatus(r []epStatus) { p.printJSON(r) }
+func (p *jsonPrinter) EndpointHashKV(r []epHashKV) { p.printJSON(r) }
 
-func (p *jsonPrinter) MemberList(r clientv3.MemberListResponse) {
-	if p.isHex {
-		printMemberListWithHexJSON(r)
-	} else {
-		printJSON(r)
+func (p *jsonPrinter) MemberAdd(r v3.MemberAddResponse)   { p.printJSON(r) }
+func (p *jsonPrinter) MemberList(r v3.MemberListResponse) { p.printJSON(r) }
+
+func printJSON(v any) {
+	b, err := json.Marshal(v)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		return
 	}
+	fmt.Println(string(b))
 }
 
-func printJSON(v any) {
+func (p *jsonPrinter) printJSON(v any) {
 	b, err := json.Marshal(v)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		return
 	}
+
+	if !p.isHex {
+		fmt.Println(string(b))
+		return
+	}
+
+	var data any
+	if err := json.Unmarshal(b, &data); err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		return
+	}
+
+	convertFieldsToHex(data)
+	b, err = json.Marshal(data)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		return
+	}
 	fmt.Println(string(b))
 }
 
-func printMemberListWithHexJSON(r clientv3.MemberListResponse) {
-	var buffer strings.Builder
-	var b []byte
-	buffer.WriteString("{\"header\":{\"cluster_id\":\"")
-	b = strconv.AppendUint(nil, r.Header.ClusterId, 16)
-	buffer.Write(b)
-	buffer.WriteString("\",\"member_id\":\"")
-	b = strconv.AppendUint(nil, r.Header.MemberId, 16)
-	buffer.Write(b)
-	buffer.WriteString("\",\"raft_term\":")
-	b = strconv.AppendUint(nil, r.Header.RaftTerm, 10)
-	buffer.Write(b)
-	buffer.WriteByte('}')
-	for i := 0; i < len(r.Members); i++ {
-		if i == 0 {
-			buffer.WriteString(",\"members\":[{\"ID\":\"")
-		} else {
-			buffer.WriteString(",{\"ID\":\"")
-		}
-		b = strconv.AppendUint(nil, r.Members[i].ID, 16)
-		buffer.Write(b)
-		buffer.WriteString("\",\"name\":\"" + r.Members[i].Name + "\"," + "\"peerURLs\":")
-		b, err := json.Marshal(r.Members[i].PeerURLs)
-		if err != nil {
-			return
-		}
-		buffer.Write(b)
-		buffer.WriteString(",\"clientURLs\":")
-		b, err = json.Marshal(r.Members[i].ClientURLs)
-		if err != nil {
-			return
+func convertFieldsToHex(data any) {
+	keysToConvert := []string{"cluster_id", "member_id", "ID", "leader"}
+
+	switch v := data.(type) {
+	case map[string]any:
+		for key, val := range v {
+			if slices.Contains(keysToConvert, key) {
+				if num, ok := val.(float64); ok {
+					v[key] = fmt.Sprintf("%x", uint64(num))
+				}
+			}
+			convertFieldsToHex(val)
 		}
-		buffer.Write(b)
-		buffer.WriteByte('}')
-		if i == len(r.Members)-1 {
-			buffer.WriteString("]")
+	case []any:
+		for _, item := range v {
+			convertFieldsToHex(item)
 		}
 	}
-	buffer.WriteString("}")
-	fmt.Println(buffer.String())
 }