[jsonpath] fix wrong output when using jsonpath

Fix range loop when using jsonpath

Without patch:

kubectl get -n openshift-oauth-apiserver po -o jsonpath='{range .items[?(.status.phase=="Running")]}{.metadata.name}{" is Running\n"}'
apiserver-7d9cc97649-79c2x is Running
apiserver-7d9cc97649-lgks6 is Running
apiserver-7d9cc97649-qgkxn is Running
 is Running

With patch:

kubectl get -n openshift-oauth-apiserver po -o jsonpath='{range .items[?(.status.phase=="Running")]}{.metadata.name}{" is Running\n"}'
apiserver-7d9cc97649-79c2x is Running
apiserver-7d9cc97649-lgks6 is Running
apiserver-7d9cc97649-qgkxn is Running

Kubernetes-commit: 39cfe232325d66bcdbc935af7aaf7022562e7010
This commit is contained in:
Robin Černín 2021-01-14 19:53:59 +10:00 committed by Kubernetes Publisher
parent 9a82c6a51a
commit b6d16d4e18
2 changed files with 61 additions and 0 deletions

View File

@ -132,6 +132,9 @@ func (j *JSONPath) FindResults(data interface{}) ([][]reflect.Value, error) {
} }
continue continue
} }
if len(results) == 0 {
break
}
fullResult = append(fullResult, results) fullResult = append(fullResult, results)
} }
return fullResult, nil return fullResult, nil

View File

@ -760,6 +760,64 @@ func TestNegativeIndex(t *testing.T) {
) )
} }
func TestRunningPodsJSONPathOutput(t *testing.T) {
var input = []byte(`{
"kind": "List",
"items": [
{
"kind": "Pod",
"metadata": {
"name": "pod1"
},
"status": {
"phase": "Running"
}
},
{
"kind": "Pod",
"metadata": {
"name": "pod2"
},
"status": {
"phase": "Running"
}
},
{
"kind": "Pod",
"metadata": {
"name": "pod3"
},
"status": {
"phase": "Running"
}
},
{
"resourceVersion": "",
"selfLink": ""
}
]
}`)
var data interface{}
err := json.Unmarshal(input, &data)
if err != nil {
t.Fatal(err)
}
testJSONPath(
[]jsonpathTest{
{
"when range is used in a certain way in script, additional line is printed",
`{range .items[?(.status.phase=="Running")]}{.metadata.name}{" is Running\n"}`,
data,
"pod1 is Running\npod2 is Running\npod3 is Running\n",
false, // expect no error
},
},
true, // allow missing keys
t,
)
}
func TestStep(t *testing.T) { func TestStep(t *testing.T) {
var input = []byte( var input = []byte(
`{ `{