use PolicyContext with engine.Generate (#483)

pkg/engine/generation.go

@@ -14,7 +14,11 @@ import (
 )
 
 //Generate apply generation rules on a resource
-func Generate(client *client.Client, policy kyverno.ClusterPolicy, ns unstructured.Unstructured) (response EngineResponse) {
+func Generate(policyContext PolicyContext) (response EngineResponse) {
+	policy := policyContext.Policy
+	ns := policyContext.NewResource
+	client := policyContext.Client
+
 	startTime := time.Now()
 	// policy information
 	func() {

pkg/engine/policyContext.go

@@ -1,6 +1,7 @@
 package engine
 
 import (
+	client "github.com/nirmata/kyverno/pkg/dclient"
 	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -15,6 +16,8 @@ type PolicyContext struct {
 	// old Resource - Update operations
 	OldResource   unstructured.Unstructured
 	AdmissionInfo RequestInfo
+	// Dynamic client - used by generate
+	Client *client.Client
 }
 
 // RequestInfo contains permission info carried in an admission request

pkg/namespace/generation.go

@@ -221,7 +221,12 @@ func applyPolicy(client *client.Client, resource unstructured.Unstructured, p ky
 	defer func() {
 		glog.V(4).Infof("Finished applying %s on resource %s/%s/%s (%v)", p.Name, resource.GetKind(), resource.GetNamespace(), resource.GetName(), time.Since(startTime))
 	}()
-	engineResponse := engine.Generate(client, p, resource)
+	policyContext := engine.PolicyContext{
+		NewResource: resource,
+		Policy:      p,
+		Client:      client,
+	}
+	engineResponse := engine.Generate(policyContext)
 	// gather stats
 	gatherStat(p.Name, engineResponse.PolicyResponse)
 	//send stats

pkg/testrunner/scenario.go

@@ -172,7 +172,13 @@ func runTestCase(t *testing.T, tc scaseT) bool {
 		if err := createNamespace(client, resource); err != nil {
 			t.Error(err)
 		} else {
-			er = engine.Generate(client, *policy, *resource)
+			policyContext := engine.PolicyContext{
+				NewResource: *resource,
+				Policy:      *policy,
+				Client:      client,
+			}
+
+			er = engine.Generate(policyContext)
 			t.Log(("---Generation---"))
 			validateResponse(t, er.PolicyResponse, tc.Expected.Generation.PolicyResponse)
 			validateGeneratedResources(t, client, *policy, tc.Expected.Generation.GeneratedResources)