mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

replace annotation match by regexp

Browse source
This commit is contained in:
Shuting Zhao 2019-12-27 12:57:06 -08:00
parent 35adbbe0df
commit f2a0f0e3dc
2 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/engine/overlay.go
View file

@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"reflect"
"regexp"
"strconv"
"strings"
"time"
@ -352,12 +353,7 @@ func processSubtree(overlay interface{}, path string, op string) ([]byte, error)
// explicitly handle boolean type in annotation
// keep the type boolean as it is in any other fields
if strings.Contains(path, "/metadata/annotations") {
if i := strings.Index(patchStr, ":true"); i > 0 {
patchStr = fmt.Sprintf("%s:\"true\"%s", patchStr[:i], patchStr[i+len("true")+1:])
}
if i := strings.Index(patchStr, ":false"); i > 0 {
patchStr = fmt.Sprintf("%s:\"false\"%s", patchStr[:i], patchStr[i+len("false")+1:])
}
patchStr = wrapBoolean(patchStr)
}
// check the patch
@ -476,3 +472,16 @@ func hasNestedAnchors(overlay interface{}) bool {
return false
}
}
func wrapBoolean(patchStr string) string {
reTrue := regexp.MustCompile(`:\s*true\s*`)
if idx := reTrue.FindStringIndex(patchStr); len(idx) != 0 {
return fmt.Sprintf("%s:\"true\"%s", patchStr[:idx[0]], patchStr[idx[1]:])
}
reFalse := regexp.MustCompile(`:\s*false\s*`)
if idx := reFalse.FindStringIndex(patchStr); len(idx) != 0 {
return fmt.Sprintf("%s:\"false\"%s", patchStr[:idx[0]], patchStr[idx[1]:])
}
return patchStr
}

31
pkg/engine/overlay_test.go
View file

@ -1038,5 +1038,36 @@ func TestProcessOverlayPatches_InsertIfNotPresentWithConditions(t *testing.T) {
}
}`)
t.Log(string(doc))
compareJSONAsMap(t, expectedResult, doc)
}
func Test_wrapBoolean(t *testing.T) {
tests := []struct {
test string
expected string
}{
{
test: `{ "op": "add", "path": "/metadata/annotations", "value":{"cluster-autoscaler.kubernetes.io/safe-to-evict":true} }`,
expected: `{ "op": "add", "path": "/metadata/annotations", "value":{"cluster-autoscaler.kubernetes.io/safe-to-evict":"true"} }`,
},
{
test: `{ "op": "add", "path": "/metadata/annotations", "value":{"cluster-autoscaler.kubernetes.io/safe-to-evict": true} }`,
expected: `{ "op": "add", "path": "/metadata/annotations", "value":{"cluster-autoscaler.kubernetes.io/safe-to-evict":"true"} }`,
},
{
test: `{ "op": "add", "path": "/metadata/annotations", "value":{"cluster-autoscaler.kubernetes.io/safe-to-evict": false } }`,
expected: `{ "op": "add", "path": "/metadata/annotations", "value":{"cluster-autoscaler.kubernetes.io/safe-to-evict":"false"} }`,
},
{
test: `{ "op": "add", "path": "/metadata/annotations/cluster-autoscaler.kubernetes.io~1safe-to-evict", "value": false }`,
expected: `{ "op": "add", "path": "/metadata/annotations/cluster-autoscaler.kubernetes.io~1safe-to-evict", "value":"false"}`,
},
}
for _, testcase := range tests {
out := wrapBoolean(testcase.test)
t.Log(out)
assert.Assert(t, testcase.expected == out)
}
}