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

Escape special characters in jsonpath field names.

Browse Source 
Example: `{.items[*].metadata.labels.kubernetes\.io/hostname}`

[Resolves #31984]
This commit is contained in:
Joshua Carp 2016-10-02 23:54:13 -04:00
parent 475f6c5ef6
commit be3f556b77
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/util/jsonpath/jsonpath_test.go
View File

@ -206,7 +206,12 @@ func TestKubernetes(t *testing.T) {
"items":[ "items":[
{ {
"kind":"None", "kind":"None",
"metadata":{"name":"127.0.0.1"}, "metadata":{
"name":"127.0.0.1",
"labels":{
"kubernetes.io/hostname":"127.0.0.1"
}
},
"status":{ "status":{
"capacity":{"cpu":"4"}, "capacity":{"cpu":"4"},
"addresses":[{"type": "LegacyHostIP", "address":"127.0.0.1"}] "addresses":[{"type": "LegacyHostIP", "address":"127.0.0.1"}]
@ -214,7 +219,12 @@ func TestKubernetes(t *testing.T) {
}, },
{ {
"kind":"None", "kind":"None",
"metadata":{"name":"127.0.0.2"}, "metadata":{
"name":"127.0.0.2",
"labels":{
"kubernetes.io/hostname":"127.0.0.2"
}
},
"status":{ "status":{
"capacity":{"cpu":"8"}, "capacity":{"cpu":"8"},
"addresses":[ "addresses":[
@ -254,6 +264,8 @@ func TestKubernetes(t *testing.T) {
{"range nodes capacity", `{range .items[*]}[{.metadata.name}, {.status.capacity}] {end}`, nodesData, {"range nodes capacity", `{range .items[*]}[{.metadata.name}, {.status.capacity}] {end}`, nodesData,
"[127.0.0.1, map[cpu:4]] [127.0.0.2, map[cpu:8]] "}, "[127.0.0.1, map[cpu:4]] [127.0.0.2, map[cpu:8]] "},
{"user password", `{.users[?(@.name=="e2e")].user.password}`, &nodesData, "secret"}, {"user password", `{.users[?(@.name=="e2e")].user.password}`, &nodesData, "secret"},
{"hostname", `{.items[0].metadata.labels.kubernetes\.io/hostname}`, &nodesData, "127.0.0.1"},
{"hostname filter", `{.items[?(@.metadata.labels.kubernetes\.io/hostname=="127.0.0.1")].kind}`, &nodesData, "None"},
} }
testJSONPath(nodesTests, t) testJSONPath(nodesTests, t)

12
pkg/util/jsonpath/parser.go
View File

@ -382,19 +382,21 @@ Loop:
// parseField scans a field until a terminator // parseField scans a field until a terminator
func (p *Parser) parseField(cur *ListNode) error { func (p *Parser) parseField(cur *ListNode) error {
p.consumeText() p.consumeText()
var r rune Loop:
for { for {
r = p.next() switch r := p.next(); {
if isTerminator(r) { case r == '\\':
p.next()
case isTerminator(r):
p.backup() p.backup()
break break Loop
} }
} }
value := p.consumeText() value := p.consumeText()
if value == "*" { if value == "*" {
cur.append(newWildcard()) cur.append(newWildcard())
} else { } else {
cur.append(newField(value)) cur.append(newField(strings.Replace(value, "\\", "", -1)))
} }
return p.parseInsideAction(cur) return p.parseInsideAction(cur)
} }