github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

jsonpath: Handle interface{}(nil) as empty array

Browse Source
This commit is contained in:
Clayton Coleman 2015-12-20 01:37:50 -05:00
parent ca69c2e310
commit 9d5df20efe
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/util/jsonpath/jsonpath.go
View File

@ -205,7 +205,7 @@ func (j *JSONPath) evalIdentifier(input []reflect.Value, node *IdentifierNode) (
return results, fmt.Errorf("not in range, nothing to end") return results, fmt.Errorf("not in range, nothing to end")
} }
default: default:
return input, fmt.Errorf("unrecongnized identifier %v", node.Name) return input, fmt.Errorf("unrecognized identifier %v", node.Name)
} }
return results, nil return results, nil
} }
@ -216,7 +216,10 @@ func (j *JSONPath) evalArray(input []reflect.Value, node *ArrayNode) ([]reflect.
for _, value := range input { for _, value := range input {
value, isNil := template.Indirect(value) value, isNil := template.Indirect(value)
if isNil || (value.Kind() != reflect.Array && value.Kind() != reflect.Slice) { if isNil {
continue
}
if value.Kind() != reflect.Array && value.Kind() != reflect.Slice {
return input, fmt.Errorf("%v is not array or slice", value.Type()) return input, fmt.Errorf("%v is not array or slice", value.Type())
} }
params := node.Params params := node.Params
@ -404,7 +407,7 @@ func (j *JSONPath) evalFilter(input []reflect.Value, node *FilterNode) ([]reflec
value, _ = template.Indirect(value) value, _ = template.Indirect(value)
if value.Kind() != reflect.Array && value.Kind() != reflect.Slice { if value.Kind() != reflect.Array && value.Kind() != reflect.Slice {
return input, fmt.Errorf("%v is not array or slice", value) return input, fmt.Errorf("%v is not array or slice and cannot be filtered", value)
} }
for i := 0; i < value.Len(); i++ { for i := 0; i < value.Len(); i++ {
temp := []reflect.Value{value.Index(i)} temp := []reflect.Value{value.Index(i)}