github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

revert "fix wrong output when using jsonpath"

Browse Source 
This partially reverts commit 39cfe232325d66bcdbc935af7aaf7022562e7010and PR #98057

the original problem was caused by not using {end} at the end of the range
This commit is contained in:
atiratree 2021-08-05 18:39:43 +02:00
parent 9ff3b7e744
commit 5c3de9f1de
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go
View File

@ -132,9 +132,6 @@ 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

4
staging/src/k8s.io/client-go/util/jsonpath/jsonpath_test.go
View File

@ -806,8 +806,8 @@ func TestRunningPodsJSONPathOutput(t *testing.T) {
testJSONPath( testJSONPath(
[]jsonpathTest{ []jsonpathTest{
{ {
"when range is used in a certain way in script, additional line is printed", "range over pods without selecting the last one",
`{range .items[?(.status.phase=="Running")]}{.metadata.name}{" is Running\n"}`, `{range .items[?(.status.phase=="Running")]}{.metadata.name}{" is Running\n"}{end}`,
data, data,
"pod1 is Running\npod2 is Running\npod3 is Running\n", "pod1 is Running\npod2 is Running\npod3 is Running\n",
false, // expect no error false, // expect no error