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

Updated mutation base due to spec

Browse source
This commit is contained in:
kacejot 2019-05-22 18:28:38 +01:00
parent 9bea87ec75
commit ab31d980b6
3 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/engine/mutation.go
View file

@ -3,7 +3,7 @@ package engine
import (
"log"
kubepolicy "github.com/nirmata/kube-policy/pkg/apis/policy/v1alpha1"
kubepolicy "github.com/nirmata/kyverno/pkg/apis/policy/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

33
pkg/engine/overlay.go
View file

@ -2,11 +2,11 @@ package engine
import (
"encoding/json"
"fmt"
"log"
"reflect"
"strconv"
kubepolicy "github.com/nirmata/kube-policy/pkg/apis/policy/v1alpha1"
kubepolicy "github.com/nirmata/kyverno/pkg/apis/policy/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@ -37,6 +37,12 @@ func ProcessOverlay(policy kubepolicy.Policy, rawResource []byte, gvk metav1.Gro
}
func applyOverlay(resource, overlay interface{}, path string) ([]PatchBytes, error) {
// resource item exists but has different type - replace
// all subtree within this path by overlay
if reflect.TypeOf(resource) != reflect.TypeOf(overlay) {
replaceResource(resource, overlay, path)
}
switch typedOverlay := overlay.(type) {
case map[string]interface{}:
typedResource := resource.(map[string]interface{})
@ -55,23 +61,11 @@ func applyOverlay(resource, overlay interface{}, path string) ([]PatchBytes, err
typedResource := resource.([]interface{})
applyOverlayToArray(typedResource, typedOverlay, path)
case string:
typedResource, ok := resource.(string)
if !ok {
return nil, fmt.Errorf("Expected string, found %T", resource)
}
replaceResource(typedResource, typedOverlay, path)
replaceResource(resource, overlay, path)
case float64:
typedResource, ok := resource.(float64)
if !ok {
return nil, fmt.Errorf("Expected string, found %T", resource)
}
replaceResource(typedResource, typedOverlay, path)
replaceResource(resource, overlay, path)
case int64:
typedResource, ok := resource.(int64)
if !ok {
return nil, fmt.Errorf("Expected string, found %T", resource)
}
replaceResource(typedResource, typedOverlay, path)
replaceResource(resource, overlay, path)
}
return nil, nil
@ -82,7 +76,6 @@ func applyOverlayToArray(resource, overlay []interface{}, path string) {
case map[string]interface{}:
for _, overlayElement := range overlay {
typedOverlay := overlayElement.(map[string]interface{})
anchors := GetAnchorsFromMap(typedOverlay)
if len(anchors) > 0 {
@ -117,7 +110,9 @@ func skipArrayObject(object, anchors map[string]interface{}) bool {
return true
}
return value != pattern
if value != pattern {
return true
}
}
return false

16
pkg/engine/overlay_test.go
View file

@ -1,11 +1,25 @@
package engine
import (
"encoding/json"
"fmt"
"reflect"
"testing"
"gotest.tools/assert"
)
func TestApplyOverlay_BaseCase(t *testing.T) {
assert.Assert(t, true)
resource1Raw := []byte(`{ "dictionary": { "key1": "val1", "key2": "val2", "array": [ 1, 2 ] } }`)
resource2Raw := []byte(`{ "dictionary": "somestring" }`)
var resource1, resource2 interface{}
json.Unmarshal(resource1Raw, &resource1)
json.Unmarshal(resource2Raw, &resource2)
fmt.Printf("First resource type: %v", reflect.TypeOf(resource1))
fmt.Printf("Second resource type: %v", reflect.TypeOf(resource2))
assert.Assert(t, reflect.TypeOf(resource1) == reflect.TypeOf(resource2))
}