diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c48e0834..cb211f92 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,9 @@ - + + + - { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.go.format.on.save.advertiser.fired": "true", + "RunOnceActivity.go.formatter.settings.were.checked": "true", + "RunOnceActivity.go.migrated.go.modules.settings": "true", + "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true", + "RunOnceActivity.go.vendoring.notification.had.been.shown": "true", + "RunOnceActivity.go.watchers.conflict.with.on.save.actions.check.performed": "true", + "WebServerToolWindowFactoryState": "false", + "go.import.settings.migrated": "true", + "last_opened_file_path": "/Users/kartikdevtron.ai/go/src/github.com/devtron-labs/image-scanner" } -}]]> +} @@ -106,37 +110,37 @@ file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 366 + 368 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 226 + 228 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 372 + 374 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 373 + 375 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 387 + 389 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 212 + 214 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 211 + 213 @@ -146,12 +150,12 @@ file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 201 + 203 file://$PROJECT_DIR$/pkg/clairService/ClairService.go - 202 + 204 diff --git a/internal/logger/logger.go b/internal/logger/logger.go index ed6b1a33..3b006a1f 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -1,24 +1,40 @@ package logger import ( + "fmt" + "github.com/caarlos0/env" "go.uber.org/zap" + "go.uber.org/zap/zapcore" "net/http" ) -func NewSugardLogger() *zap.SugaredLogger { - l, err := zap.NewProduction() +type LogConfig struct { + Level int `env:"LOG_LEVEL" envDefault:"0"` // default info +} + +func InitLogger() (*zap.SugaredLogger, error) { + cfg := &LogConfig{} + err := env.Parse(cfg) if err != nil { - panic("failed to create the default logger: " + err.Error()) + fmt.Println("failed to parse logger env config: " + err.Error()) + return nil, err } - //l, err := zap.NewDevelopment() - /*l, err := zap.NewProduction() + + config := zap.NewProductionConfig() + config.Level = zap.NewAtomicLevelAt(zapcore.Level(cfg.Level)) + l, err := config.Build() if err != nil { - panic("failed to create the default logger: " + err.Error()) + fmt.Println("failed to create the default logger: " + err.Error()) + return nil, err } - Logger := l.Sugar()*/ - return l.Sugar() + logger := l.Sugar() + return logger, nil +} + +func NewSugardLogger() (*zap.SugaredLogger, error) { + return InitLogger() } func NewHttpClient() *http.Client { return http.DefaultClient -} \ No newline at end of file +} diff --git a/pkg/clairService/ClairService.go b/pkg/clairService/ClairService.go index ae398770..6f00021f 100644 --- a/pkg/clairService/ClairService.go +++ b/pkg/clairService/ClairService.go @@ -148,6 +148,7 @@ func (impl *ClairServiceImpl) ScanImage(scanEvent *common.ScanEvent) (*common.Sc } func (impl *ClairServiceImpl) GetVulnerabilityReportFromClair(scanEvent *common.ScanEvent) (*claircore.VulnerabilityReport, error) { + impl.logger.Infow("received vulnerability report creation request", "scanEvent", scanEvent) //get manifest from image manifest, err := impl.CreateClairManifest(scanEvent) if err != nil { @@ -155,7 +156,7 @@ func (impl *ClairServiceImpl) GetVulnerabilityReportFromClair(scanEvent *common. return nil, err } //end get manifest - + impl.logger.Debugw("created clair manifest", "scanEvent", scanEvent, "manifest", manifest) //checking if index report exists for this manifest hash; if it does, no need of creating index report exists, err := impl.CheckIfIndexReportExistsForManifestHash(manifest.Hash) if err != nil { @@ -168,6 +169,7 @@ func (impl *ClairServiceImpl) GetVulnerabilityReportFromClair(scanEvent *common. impl.logger.Errorw("error in creating clair index report", "err", err, "manifest", manifest) return nil, err } + impl.logger.Debugw("created index report from manifest", "manifest", manifest) } } else if !exists { //index report do not exist, creating index report for manifest @@ -176,6 +178,7 @@ func (impl *ClairServiceImpl) GetVulnerabilityReportFromClair(scanEvent *common. impl.logger.Errorw("error in creating clair index report", "err", err, "manifest", manifest) return nil, err } + impl.logger.Debugw("created index report from manifest", "manifest", manifest) } //index report created, now getting vulnerability report diff --git a/wire_gen.go b/wire_gen.go index 49960085..efcb5adb 100644 --- a/wire_gen.go +++ b/wire_gen.go @@ -23,7 +23,10 @@ import ( // Injectors from Wire.go: func InitializeApp() (*App, error) { - sugaredLogger := logger.NewSugardLogger() + sugaredLogger, err := logger.NewSugardLogger() + if err != nil { + return nil, err + } pubSubClient, err := client.NewPubSubClient(sugaredLogger) if err != nil { return nil, err