Use constraints library from api with simplified CEL library

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/go-bindata/go-bindata/v3 v3.1.3
 	github.com/go-logr/logr v0.4.0
 	github.com/golang/mock v1.5.0
-	github.com/google/cel-go v0.9.0
 	github.com/google/go-cmp v0.5.6
 	github.com/googleapis/gnostic v0.5.5
 	github.com/itchyny/gojq v0.11.0
@@ -39,7 +38,6 @@ require (
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20210825183410-e898025ed96a
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
-	google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2
 	google.golang.org/grpc v1.40.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.6.1

pkg/controller/registry/resolver/cache/predicates.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/blang/semver/v4"
 
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/constraints"
+	"github.com/operator-framework/api/pkg/constraints"
 	opregistry "github.com/operator-framework/operator-registry/pkg/registry"
 )
 
@@ -357,13 +357,13 @@ func CountingPredicate(p Predicate, n *int) Predicate {
 	return countingPredicate{p: p, n: n}
 }
 
-type evaluatorPredicate struct {
-	evaluator constraints.Evaluator
-	rule      string
-	message   string
+type celPredicate struct {
+	program constraints.CelProgram
+	rule    string
+	message string
 }
 
-func (ep *evaluatorPredicate) Test(entry *Entry) bool {
+func (cp *celPredicate) Test(entry *Entry) bool {
 	props := make([]map[string]interface{}, len(entry.Properties))
 	for i, p := range entry.Properties {
 		var v interface{}
@@ -376,21 +376,21 @@ func (ep *evaluatorPredicate) Test(entry *Entry) bool {
 		}
 	}
 
-	ok, err := ep.evaluator.Evaluate(map[string]interface{}{"properties": props})
+	ok, err := cp.program.Evaluate(map[string]interface{}{"properties": props})
 	if err != nil {
 		return false
 	}
 	return ok
 }
 
-func EvaluatorPredicate(provider constraints.EvaluatorProvider, rule string, message string) (Predicate, error) {
-	eval, err := provider.Evaluator(rule)
+func CreateCelPredicate(env *constraints.CelEnvironment, rule string, message string) (Predicate, error) {
+	prog, err := env.Validate(rule)
 	if err != nil {
 		return nil, err
 	}
-	return &evaluatorPredicate{evaluator: eval, rule: rule, message: message}, nil
+	return &celPredicate{program: prog, rule: rule, message: message}, nil
 }
 
-func (ep *evaluatorPredicate) String() string {
-	return fmt.Sprintf("with constraint: %q and message: %q", ep.rule, ep.message)
+func (cp *celPredicate) String() string {
+	return fmt.Sprintf("with constraint: %q and message: %q", cp.rule, cp.message)
 }

pkg/controller/registry/resolver/constraints/cel.go

@@ -15,7 +15,6 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	v1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache"
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/constraints"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/projection"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/solver"
 	"github.com/operator-framework/operator-registry/pkg/api"
@@ -352,17 +351,13 @@ func (r *SatResolver) getBundleInstallables(preferredNamespace string, bundleSta
 				continue
 			}
 
-			var val struct {
-				Message string           `json:"message"`
-				Cel     *constraints.Cel `json:"cel"`
-			}
-
+			var val constraints.Constraint
 			if err := json.Unmarshal([]byte(prop.Value), &val); err != nil {
 				errs = append(errs, err)
 				continue
 			}
 
-			pred, err := cache.EvaluatorPredicate(r.evaluatorProvider, val.Cel.Rule, val.Message)
+			pred, err := cache.CreateCelPredicate(r.celEnv, val.Cel.Rule, val.Message)
 			if err != nil {
 				errs = append(errs, err)
 				continue

pkg/controller/registry/resolver/resolver.go

@@ -21,7 +21,6 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	listersv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache"
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/constraints"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/solver"
 	"github.com/operator-framework/operator-registry/pkg/api"
 	opregistry "github.com/operator-framework/operator-registry/pkg/registry"
@@ -2483,8 +2482,8 @@ func TestSolveOperators_GenericConstraint(t *testing.T) {
 				cache: cache.New(cache.StaticSourceProvider{
 					catalog: tt.catalog,
 				}),
-				log:               logrus.New(),
-				evaluatorProvider: constraints.NewCelEvaluatorProvider(),
+				log:    logrus.New(),
+				celEnv: constraints.NewCelEnvironment(),
 			}
 
 			operators, err = satResolver.SolveOperators([]string{namespace}, nil, tt.subs)

pkg/controller/registry/resolver/resolver_test.go

@@ -290,7 +290,6 @@ github.com/golang/protobuf/ptypes/wrappers
 # github.com/google/btree v1.0.1
 github.com/google/btree
 # github.com/google/cel-go v0.9.0
-## explicit
 github.com/google/cel-go/cel
 github.com/google/cel-go/checker
 github.com/google/cel-go/checker/decls
@@ -857,7 +856,6 @@ google.golang.org/appengine/internal/remote_api
 google.golang.org/appengine/internal/urlfetch
 google.golang.org/appengine/urlfetch
 # google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2
-## explicit
 google.golang.org/genproto/googleapis/api/annotations
 google.golang.org/genproto/googleapis/api/expr/v1alpha1
 google.golang.org/genproto/googleapis/api/httpbody