fix: store policiy and vap in different response fields (#495)

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

backend/pkg/engine/models/convert.go

@@ -3,6 +3,7 @@ package models
 import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	engineapi "github.com/kyverno/kyverno/pkg/engine/api"
+	"k8s.io/api/admissionregistration/v1alpha1"
 	"sigs.k8s.io/yaml"
 )
 
@@ -31,10 +32,14 @@ func ConvertResponse(in engineapi.EngineResponse) Response {
 	out := Response{
 		OriginalResource: string(resource),
 		Resource:         in.Resource,
-		Policy:           in.Policy().GetPolicy().(kyvernov1.PolicyInterface),
 		NamespaceLabels:  in.NamespaceLabels(),
 		PatchedResource:  string(patchedResource),
 	}
+	if in.Policy().GetType() == engineapi.KyvernoPolicyType {
+		out.Policy = in.Policy().MetaObject().(kyvernov1.PolicyInterface)
+	} else {
+		out.ValidatingAdmissionPolicy = in.Policy().MetaObject().(*v1alpha1.ValidatingAdmissionPolicy)
+	}
 	for _, ruleresponse := range in.PolicyResponse.Rules {
 		out.PolicyResponse.Rules = append(out.PolicyResponse.Rules, convertRuleResponse(ruleresponse))
 	}

backend/pkg/engine/models/response.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
+	"k8s.io/api/admissionregistration/v1alpha1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -12,6 +13,8 @@ type Response struct {
 	Resource unstructured.Unstructured `json:"resource"`
 	// Policy is the original policy
 	Policy kyvernov1.PolicyInterface `json:"policy"`
+	// ValidatingAdmissionPolicy is the original policy
+	ValidatingAdmissionPolicy *v1alpha1.ValidatingAdmissionPolicy `json:"validatingAdmissionPolicy"`
 	// namespaceLabels given by policy context
 	NamespaceLabels map[string]string `json:"namespaceLabels"`
 	// PatchedResource is the resource patched with the engine action changes