From 8faebb34c939fa7a583b70393507d4c880b785a7 Mon Sep 17 00:00:00 2001
From: Matheus Moraes <matheusfaria.moraes@gmail.com>
Date: Tue, 12 Mar 2024 13:55:09 -0300
Subject: [PATCH] feat: use lazy map for variables

---
 pkg/validator/activation.go |  2 +-
 pkg/validator/validator.go  | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkg/validator/activation.go b/pkg/validator/activation.go
index 1d84406..548f960 100644
--- a/pkg/validator/activation.go
+++ b/pkg/validator/activation.go
@@ -38,7 +38,7 @@ type activation struct {
 	params        any
 	apiVersions   []string
 	kubeVersion   any
-	variables     map[string]any
+	variables     any
 }
 
 func (a *activation) ResolveName(name string) (any, bool) {
diff --git a/pkg/validator/validator.go b/pkg/validator/validator.go
index 05487b1..0e2e44c 100644
--- a/pkg/validator/validator.go
+++ b/pkg/validator/validator.go
@@ -19,11 +19,12 @@ import (
 
 	"github.com/google/cel-go/cel"
 	"github.com/google/cel-go/common/types"
+	"github.com/google/cel-go/common/types/ref"
+	marvin "github.com/undistro/marvin/pkg/types"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/version"
-
-	marvin "github.com/undistro/marvin/pkg/types"
+	"k8s.io/apiserver/pkg/cel/lazy"
 )
 
 // CELValidator is a Validator that performs CEL expressions
@@ -56,13 +57,11 @@ func (r *CELValidator) Validate(obj unstructured.Unstructured, params any) (bool
 	if err := r.setPodSpecParams(obj, input); err != nil {
 		return false, "", err
 	}
+	lazyMap := lazy.NewMapValue(types.MapType)
 	for _, v := range r.variables {
-		val, _, err := v.program.Eval(input)
-		if err != nil {
-			return false, "", fmt.Errorf("failed to evaluate variable %q: %s", v.name, err)
-		}
-		input.variables[v.name] = val.Value()
+		lazyMap.Append(v.name, callback(v, input))
 	}
+	input.variables = lazyMap
 	for i, prg := range r.programs {
 		out, _, err := prg.Eval(input)
 		if err != nil {
@@ -75,6 +74,16 @@ func (r *CELValidator) Validate(obj unstructured.Unstructured, params any) (bool
 	return true, "", nil
 }
 
+func callback(v compiledVariables, activation any) lazy.GetFieldFunc {
+	return func(_ *lazy.MapValue) ref.Val {
+		val, _, err := v.program.Eval(activation)
+		if err != nil {
+			return types.NewErr("variable %q fails to evaluate: %v", v.name, err)
+		}
+		return val
+	}
+}
+
 func (r *CELValidator) setPodSpecParams(obj unstructured.Unstructured, input *activation) error {
 	if !HasPodSpec(obj) {
 		return nil