mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2024-12-14 11:57:48 +00:00
Code Activity

Added log message for API call failures (#7834)

Browse source 
* Added error message to deferred loader on API call failure

Signed-off-by: Pradyot Ranjan <99216956+pradyotRanjan@users.noreply.github.com>

* Small change in error message

Signed-off-by: Pradyot Ranjan <99216956+pradyotRanjan@users.noreply.github.com>

---------

Signed-off-by: Pradyot Ranjan <99216956+pradyotRanjan@users.noreply.github.com>
Co-authored-by: Pradyot Ranjan <99216956+pradyotRanjan@users.noreply.github.com>
Co-authored-by: Chip Zoller <chipzoller@gmail.com>
Co-authored-by: shuting <shuting@nirmata.com>
Co-authored-by: Jim Bugwadia <jim@nirmata.com>
This commit is contained in:
Pradyot Ranjan 2023-07-19 14:45:08 +05:30 committed by GitHub
parent 1fff5ba767
commit d18a27d189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/engine/context/deferred.go
View file

@ -2,15 +2,18 @@ package context
import (
"regexp"
"github.com/go-logr/logr"
)
type deferredLoader struct {
name string
matcher regexp.Regexp
loader Loader
logger logr.Logger
}
func NewDeferredLoader(name string, loader Loader) (DeferredLoader, error) {
func NewDeferredLoader(name string, loader Loader, logger logr.Logger) (DeferredLoader, error) {
// match on ASCII word boundaries except do not allow starting with a `.`
// this allows `x` to match `x.y` but not `y.x` or `y.x.z`
matcher, err := regexp.Compile(`(?:\A|\z|\s|[^.0-9A-Za-z])` + name + `\b`)
@ -22,6 +25,7 @@ func NewDeferredLoader(name string, loader Loader) (DeferredLoader, error) {
name: name,
matcher: *matcher,
loader: loader,
logger: logger,
}, nil
}
@ -34,7 +38,10 @@ func (dl *deferredLoader) HasLoaded() bool {
}
func (dl *deferredLoader) LoadData() error {
return dl.loader.LoadData()
if err := dl.loader.LoadData(); err != nil {
dl.logger.Error(err, "failed to load data", "name", dl.name)
}
return nil
}
func (d *deferredLoader) Matches(query string) bool {

2
pkg/engine/context/deferred_test.go
View file

@ -174,7 +174,7 @@ func addDeferredWithQuery(ctx *context, name string, value interface{}, query st
query: query,
}
d, err := NewDeferredLoader(name, loader)
d, err := NewDeferredLoader(name, loader, logger)
if err != nil {
return loader, err
}

16
pkg/engine/factories/contextloaderfactory.go
View file

@ -84,31 +84,31 @@ func (l *contextLoader) newLoader(
) (enginecontext.DeferredLoader, error) {
if entry.ConfigMap != nil {
if l.cmResolver != nil {
l := loaders.NewConfigMapLoader(ctx, l.logger, entry, l.cmResolver, jsonContext)
return enginecontext.NewDeferredLoader(entry.Name, l)
ldr := loaders.NewConfigMapLoader(ctx, l.logger, entry, l.cmResolver, jsonContext)
return enginecontext.NewDeferredLoader(entry.Name, ldr, l.logger)
} else {
l.logger.Info("disabled loading of ConfigMap context entry %s", entry.Name)
return nil, nil
}
} else if entry.APICall != nil {
if client != nil {
l := loaders.NewAPILoader(ctx, l.logger, entry, jsonContext, jp, client)
return enginecontext.NewDeferredLoader(entry.Name, l)
ldr := loaders.NewAPILoader(ctx, l.logger, entry, jsonContext, jp, client)
return enginecontext.NewDeferredLoader(entry.Name, ldr, l.logger)
} else {
l.logger.Info("disabled loading of APICall context entry %s", entry.Name)
return nil, nil
}
} else if entry.ImageRegistry != nil {
if rclientFactory != nil {
l := loaders.NewImageDataLoader(ctx, l.logger, entry, jsonContext, jp, rclientFactory)
return enginecontext.NewDeferredLoader(entry.Name, l)
ldr := loaders.NewImageDataLoader(ctx, l.logger, entry, jsonContext, jp, rclientFactory)
return enginecontext.NewDeferredLoader(entry.Name, ldr, l.logger)
} else {
l.logger.Info("disabled loading of ImageRegistry context entry %s", entry.Name)
return nil, nil
}
} else if entry.Variable != nil {
l := loaders.NewVariableLoader(l.logger, entry, jsonContext, jp)
return enginecontext.NewDeferredLoader(entry.Name, l)
ldr := loaders.NewVariableLoader(l.logger, entry, jsonContext, jp)
return enginecontext.NewDeferredLoader(entry.Name, ldr, l.logger)
}
return nil, fmt.Errorf("missing ConfigMap|APICall|ImageRegistry|Variable in context entry %s", entry.Name)
}