Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: assertion compiler cache #509

Merged
merged 1 commit into from
Sep 22, 2024
Merged

fix: assertion compiler cache #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/json-engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ func New() engine.Engine[Request, Response] {
resource any
bindings jpbinding.Bindings
}
compiler := matching.Compiler{
Compilers: compilers.DefaultCompiler,
}
compiler := matching.NewCompiler(compilers.DefaultCompiler, 256)
ruleEngine := builder.
Function(func(ctx context.Context, r ruleRequest) []RuleResponse {
bindings := r.bindings.Register("$rule", jpbinding.NewBinding(r.rule))
Expand Down Expand Up @@ -159,7 +157,7 @@ func New() engine.Engine[Request, Response] {
}
}
}
violations, err := matching.MatchAssert(nil, r.rule.Assert, r.resource, bindings, compiler, defaultCompiler)
violations, err := matching.Assert(nil, r.rule.Assert, r.resource, bindings, compiler, defaultCompiler)
if err != nil {
return []RuleResponse{{
Rule: r.rule,
Expand Down
12 changes: 7 additions & 5 deletions pkg/matching/compiler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
"github.com/kyverno/kyverno-json/pkg/core/compilers"
)

type _compilers = compilers.Compilers

type Compiler struct {
compilers.Compilers
_compilers
*freelru.SyncedLRU[string, func() (assertion.Assertion, error)]
}

Expand All @@ -21,7 +23,7 @@

func NewCompiler(compiler compilers.Compilers, cacheSize uint32) Compiler {
out := Compiler{
Compilers: compiler,
_compilers: compiler,
}
if cache, err := freelru.NewSynced[string, func() (assertion.Assertion, error)](cacheSize, hashStringXXHASH); err == nil {
out.SyncedLRU = cache
Expand All @@ -30,13 +32,13 @@
}

func (c Compiler) CompileAssertion(hash string, value any, defaultCompiler string) (assertion.Assertion, error) {
if c.SyncedLRU == nil {
return assertion.Parse(value, c.Compilers, defaultCompiler)
if c.SyncedLRU == nil || hash == "" {
return assertion.Parse(value, c._compilers, defaultCompiler)

Check warning on line 36 in pkg/matching/compiler.go

View check run for this annotation

Codecov / codecov/patch

pkg/matching/compiler.go#L36 

Added line #L36 was not covered by tests
}
entry, _ := c.SyncedLRU.Get(hash)
if entry == nil {
entry = sync.OnceValues(func() (assertion.Assertion, error) {
return assertion.Parse(value, c.Compilers, defaultCompiler)
return assertion.Parse(value, c._compilers, defaultCompiler)
})
c.SyncedLRU.Add(hash, entry)
}
Expand Down
80 changes: 34 additions & 46 deletions pkg/matching/match.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,22 @@
return strings.Join(lines, "\n")
}

func MatchAssert(path *field.Path, assert v1alpha1.Assert, actual any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) ([]Result, error) {
if assert.Compiler != nil {
defaultCompiler = string(*assert.Compiler)
func Assert(path *field.Path, in v1alpha1.Assert, actual any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) ([]Result, error) {
if in.Compiler != nil {
defaultCompiler = string(*in.Compiler)

Check warning on line 41 in pkg/matching/match.go

View check run for this annotation

Codecov / codecov/patch

pkg/matching/match.go#L41 

Added line #L41 was not covered by tests
}
if len(assert.Any) == 0 && len(assert.All) == 0 {
return nil, field.Invalid(path, assert, "an empty assert is not valid")
if len(in.Any) == 0 && len(in.All) == 0 {
return nil, field.Invalid(path, in, "an empty assert is not valid")

Check warning on line 44 in pkg/matching/match.go

View check run for this annotation

Codecov / codecov/patch

pkg/matching/match.go#L44 

Added line #L44 was not covered by tests
} else {
if len(assert.Any) != 0 {
if len(in.Any) != 0 {
var fails []Result
path := path.Child("any")
for i, assertion := range assert.Any {
for i, assertion := range in.Any {
defaultCompiler := defaultCompiler
if assertion.Compiler != nil {
defaultCompiler = string(*assertion.Compiler)
}
path := path.Index(i).Child("check")
parsed, err := assertion.Check.Compile(compiler.CompileAssertion, defaultCompiler)
if err != nil {
return fails, err
}
checkFails, err := parsed.Assert(path, actual, bindings)
checkFails, err := assert(path.Index(i).Child("check"), assertion.Check, actual, bindings, compiler, defaultCompiler)
if err != nil {
return fails, err
}
Expand All @@ -76,20 +71,15 @@
return fails, nil
}
}
if len(assert.All) != 0 {
if len(in.All) != 0 {
var fails []Result
path := path.Child("all")
for i, assertion := range assert.All {
for i, assertion := range in.All {
defaultCompiler := defaultCompiler
if assertion.Compiler != nil {
defaultCompiler = string(*assertion.Compiler)
}
path := path.Index(i).Child("check")
parsed, err := assertion.Check.Compile(compiler.CompileAssertion, defaultCompiler)
if err != nil {
return fails, err
}
checkFails, err := parsed.Assert(path, actual, bindings)
checkFails, err := assert(path.Index(i).Child("check"), assertion.Check, actual, bindings, compiler, defaultCompiler)
if err != nil {
return fails, err
}
Expand All @@ -109,23 +99,23 @@
}
}

func Match(path *field.Path, match *v1alpha1.Match, actual any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
if match.Compiler != nil {
defaultCompiler = string(*match.Compiler)
func Match(path *field.Path, in *v1alpha1.Match, actual any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
if in.Compiler != nil {
defaultCompiler = string(*in.Compiler)

Check warning on line 104 in pkg/matching/match.go

View check run for this annotation

Codecov / codecov/patch

pkg/matching/match.go#L104 

Added line #L104 was not covered by tests
}
if match == nil || (len(match.Any) == 0 && len(match.All) == 0) {
return nil, field.Invalid(path, match, "an empty match is not valid")
if in == nil || (len(in.Any) == 0 && len(in.All) == 0) {
return nil, field.Invalid(path, in, "an empty match is not valid")

Check warning on line 107 in pkg/matching/match.go

View check run for this annotation

Codecov / codecov/patch

pkg/matching/match.go#L107 

Added line #L107 was not covered by tests
} else {
var errs field.ErrorList
if len(match.Any) != 0 {
_errs, err := MatchAny(path.Child("any"), match.Any, actual, bindings, compiler, defaultCompiler)
if len(in.Any) != 0 {
_errs, err := matchAny(path.Child("any"), in.Any, actual, bindings, compiler, defaultCompiler)
if err != nil {
return errs, err
}
errs = append(errs, _errs...)
}
if len(match.All) != 0 {
_errs, err := MatchAll(path.Child("all"), match.All, actual, bindings, compiler, defaultCompiler)
if len(in.All) != 0 {
_errs, err := matchAll(path.Child("all"), in.All, actual, bindings, compiler, defaultCompiler)
if err != nil {
return errs, err
}
Expand All @@ -135,15 +125,10 @@
}
}

func MatchAny(path *field.Path, assertions []v1alpha1.AssertionTree, actual any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
func matchAny(path *field.Path, in []v1alpha1.AssertionTree, value any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
var errs field.ErrorList
for i, assertion := range assertions {
path := path.Index(i)
assertion, err := assertion.Compile(compiler.CompileAssertion, defaultCompiler)
if err != nil {
return errs, err
}
_errs, err := assertion.Assert(path, actual, bindings)
for i, assertion := range in {
_errs, err := assert(path.Index(i), assertion, value, bindings, compiler, defaultCompiler)
if err != nil {
return errs, err
}
Expand All @@ -155,19 +140,22 @@
return errs, nil
}

func MatchAll(path *field.Path, assertions []v1alpha1.AssertionTree, actual any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
func matchAll(path *field.Path, in []v1alpha1.AssertionTree, value any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
var errs field.ErrorList
for i, assertion := range assertions {
path := path.Index(i)
assertion, err := assertion.Compile(compiler.CompileAssertion, defaultCompiler)
if err != nil {
return errs, err
}
_errs, err := assertion.Assert(path, actual, bindings)
for i, assertion := range in {
_errs, err := assert(path.Index(i), assertion, value, bindings, compiler, defaultCompiler)
if err != nil {
return errs, err
}
errs = append(errs, _errs...)
}
return errs, nil
}

func assert(path *field.Path, assertion v1alpha1.AssertionTree, value any, bindings binding.Bindings, compiler Compiler, defaultCompiler string) (field.ErrorList, error) {
check, err := assertion.Compile(compiler.CompileAssertion, defaultCompiler)
if err != nil {
return nil, err
}

Check warning on line 159 in pkg/matching/match.go

View check run for this annotation

Codecov / codecov/patch

pkg/matching/match.go#L158-L159 

Added lines #L158 - L159 were not covered by tests
return check.Assert(path, value, bindings)
}