From 51b37d5cbf746e48cd30bc486fb1ffd1196b4ceb Mon Sep 17 00:00:00 2001 From: David Wertenteil Date: Thu, 10 Aug 2023 19:15:14 +0300 Subject: [PATCH] Update logs (#1340) * update logger Signed-off-by: David Wertenteil * fixed logger Signed-off-by: David Wertenteil * bump go-logger version Signed-off-by: David Wertenteil --------- Signed-off-by: David Wertenteil --- cmd/scan/image.go | 9 +++------ core/core/scan.go | 18 +++--------------- go.mod | 2 +- go.sum | 4 ++-- httphandler/go.mod | 2 +- httphandler/go.sum | 4 ++-- 6 files changed, 12 insertions(+), 27 deletions(-) diff --git a/cmd/scan/image.go b/cmd/scan/image.go index 6f55483f..37bea651 100644 --- a/cmd/scan/image.go +++ b/cmd/scan/image.go @@ -63,16 +63,13 @@ func getImageCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo, imgScanInfo *im userInput := args[0] - logger.L().Info(fmt.Sprintf("Scanning image: %s", userInput)) - cautils.StartSpinner() + logger.L().Start(fmt.Sprintf("Scanning image: %s", userInput)) scanResults, err := svc.Scan(ctx, userInput, creds) if err != nil { - cautils.StopSpinner() + logger.L().StopError(fmt.Sprintf("Failed to scan image: %s", userInput)) return err } - cautils.StopSpinner() - - logger.L().Success("Image scan completed successfully") + logger.L().StopSuccess(fmt.Sprintf("Successfully scanned image: %s", userInput)) scanInfo.SetScanType(cautils.ScanTypeImage) diff --git a/core/core/scan.go b/core/core/scan.go index e618dc1d..6f093ad0 100644 --- a/core/core/scan.go +++ b/core/core/scan.go @@ -248,28 +248,16 @@ func scanImages(scanType cautils.ScanTypes, scanData *cautils.OPASessionObj, ctx } } - cautils.StartSpinner() - pb := cautils.NewProgressHandler("scanning images...") - pb.Start(len(imagesToScan)) - dbCfg, _ := imagescan.NewDefaultDBConfig() svc := imagescan.NewScanService(dbCfg) - failedImages := []string{} for _, img := range imagesToScan { - pb.ProgressJob(1, "Image: "+img) + logger.L().Start("Scanning", helpers.String("image", img)) if err := scanSingleImage(ctx, img, svc, resultsHandling); err != nil { - failedImages = append(failedImages, img) - logger.L().Ctx(ctx).Debug(fmt.Sprintf("failed to scan image: %s", img), helpers.Error(err)) + logger.L().StopError("failed to scan", helpers.String("image", img), helpers.Error(err)) } + logger.L().StopSuccess("Scanned successfully", helpers.String("image", img)) } - pb.Stop() - defer cautils.StopSpinner() - - if len(failedImages) > 0 { - logger.L().Error("failed to scan some images, the error are available in debug mode", helpers.Int("number", len(failedImages)), helpers.Interface("images", failedImages)) - } - logger.L().Success("Image scan completed successfully") } func scanSingleImage(ctx context.Context, img string, svc imagescan.Service, resultsHandling *resultshandling.ResultsHandler) error { diff --git a/go.mod b/go.mod index 87852146..430533ae 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/jwalton/gchalk v1.3.0 github.com/kubescape/go-git-url v0.0.25 - github.com/kubescape/go-logger v0.0.17 + github.com/kubescape/go-logger v0.0.18 github.com/kubescape/k8s-interface v0.0.136 github.com/kubescape/opa-utils v0.0.261 github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 diff --git a/go.sum b/go.sum index 9be76705..d0837a75 100644 --- a/go.sum +++ b/go.sum @@ -1292,8 +1292,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubescape/go-git-url v0.0.25 h1:i7SSSC1+1m/Dg+4LV3erp0YklnWj1Z0cVlRxCT3Zy/0= github.com/kubescape/go-git-url v0.0.25/go.mod h1:IbVT7Wsxlghsa+YxI5KOx4k9VQJaa3z0kTaQz5D3nKM= -github.com/kubescape/go-logger v0.0.17 h1:TerWH9JnpwDWKNMVk+pE8U76wL07hlo7JXdcMXCWAL4= -github.com/kubescape/go-logger v0.0.17/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= +github.com/kubescape/go-logger v0.0.18 h1:59tYxL623xrPkjgDBU0FheFxjp4JoIuUuX/RJ0MmO1o= +github.com/kubescape/go-logger v0.0.18/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= github.com/kubescape/k8s-interface v0.0.136 h1:/BMuj5ixYA48ODyAQTK2ZLgID+KXU3rQei8eNiXQTcg= github.com/kubescape/k8s-interface v0.0.136/go.mod h1:5sz+5Cjvo98lTbTVDiDA4MmlXxeHSVMW/wR0V3hV4K8= github.com/kubescape/opa-utils v0.0.261 h1:NEASuRRHfbQRf/9wAEdm+7VV+UDg5tr+VgIfsedbdas= diff --git a/httphandler/go.mod b/httphandler/go.mod index e797afcf..501401ab 100644 --- a/httphandler/go.mod +++ b/httphandler/go.mod @@ -10,7 +10,7 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/schema v1.2.0 - github.com/kubescape/go-logger v0.0.17 + github.com/kubescape/go-logger v0.0.18 github.com/kubescape/k8s-interface v0.0.136 github.com/kubescape/kubescape/v2 v2.0.0-00010101000000-000000000000 github.com/kubescape/opa-utils v0.0.261 diff --git a/httphandler/go.sum b/httphandler/go.sum index 896fdb07..01cc9e56 100644 --- a/httphandler/go.sum +++ b/httphandler/go.sum @@ -1296,8 +1296,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubescape/go-git-url v0.0.25 h1:i7SSSC1+1m/Dg+4LV3erp0YklnWj1Z0cVlRxCT3Zy/0= github.com/kubescape/go-git-url v0.0.25/go.mod h1:IbVT7Wsxlghsa+YxI5KOx4k9VQJaa3z0kTaQz5D3nKM= -github.com/kubescape/go-logger v0.0.17 h1:TerWH9JnpwDWKNMVk+pE8U76wL07hlo7JXdcMXCWAL4= -github.com/kubescape/go-logger v0.0.17/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= +github.com/kubescape/go-logger v0.0.18 h1:59tYxL623xrPkjgDBU0FheFxjp4JoIuUuX/RJ0MmO1o= +github.com/kubescape/go-logger v0.0.18/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= github.com/kubescape/k8s-interface v0.0.136 h1:/BMuj5ixYA48ODyAQTK2ZLgID+KXU3rQei8eNiXQTcg= github.com/kubescape/k8s-interface v0.0.136/go.mod h1:5sz+5Cjvo98lTbTVDiDA4MmlXxeHSVMW/wR0V3hV4K8= github.com/kubescape/opa-utils v0.0.261 h1:NEASuRRHfbQRf/9wAEdm+7VV+UDg5tr+VgIfsedbdas=