From 9646ae5a9efb0eee7ac15577d113699700233017 Mon Sep 17 00:00:00 2001
From: acejilam <acejilam@gmail.com>
Date: Thu, 10 Aug 2023 19:32:47 +0800
Subject: [PATCH] Fix: null jsonpath serialization

Signed-off-by: acejilam <acejilam@gmail.com>
---
 staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go      | 3 +++
 staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go
index 49ecd1465ae..86a3d6dde95 100644
--- a/staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go
+++ b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go
@@ -573,6 +573,9 @@ func (j *JSONPath) evalToText(v reflect.Value) ([]byte, error) {
 	if !ok {
 		return nil, fmt.Errorf("can't print type %s", v.Type())
 	}
+	if iface == nil {
+		return []byte("null"), nil
+	}
 	var buffer bytes.Buffer
 	fmt.Fprint(&buffer, iface)
 	return buffer.Bytes(), nil
diff --git a/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go
index 197e73e84dd..a200a927ed6 100644
--- a/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go
+++ b/staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go
@@ -301,7 +301,8 @@ func TestJSONInput(t *testing.T) {
 		{"id": "i3", "x":  8, "y":  3 },
 		{"id": "i4", "x": -6, "y": -1 },
 		{"id": "i5", "x":  0, "y":  2, "z": 1 },
-		{"id": "i6", "x":  1, "y":  4 }
+		{"id": "i6", "x":  1, "y":  4 },
+		{"id": "i7", "x":  null, "y":  4 }
 	]`)
 	var pointsData interface{}
 	err := json.Unmarshal(pointsJSON, &pointsData)
@@ -311,6 +312,7 @@ func TestJSONInput(t *testing.T) {
 	pointsTests := []jsonpathTest{
 		{"exists filter", "{[?(@.z)].id}", pointsData, "i2 i5", false},
 		{"bracket key", "{[0]['id']}", pointsData, "i1", false},
+		{"nil value", "{[-1]['x']}", pointsData, "null", false},
 	}
 	testJSONPath(pointsTests, false, t)
 }