From f7b3cdcf355dc67d573bf0b4fe953834201b51f3 Mon Sep 17 00:00:00 2001 From: Daniel Grunberger <84905812+Daniel-GrunbergerCA@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:18:40 +0300 Subject: [PATCH] Improve logs (#1349) * use stop-success Signed-off-by: Daniel Grunberger * improve logger Signed-off-by: Daniel Grunberger * RBAC Signed-off-by: Daniel Grunberger --------- Signed-off-by: Daniel Grunberger Co-authored-by: Daniel Grunberger --- cmd/scan/image.go | 4 ++++ core/pkg/resourcehandler/k8sresources.go | 13 +++++++++---- go.mod | 2 +- go.sum | 4 ++-- httphandler/go.mod | 2 +- httphandler/go.sum | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/cmd/scan/image.go b/cmd/scan/image.go index 37bea651..502018a4 100644 --- a/cmd/scan/image.go +++ b/cmd/scan/image.go @@ -5,6 +5,7 @@ import ( "fmt" logger "github.com/kubescape/go-logger" + "github.com/kubescape/go-logger/iconlogger" "github.com/kubescape/kubescape/v2/core/cautils" "github.com/kubescape/kubescape/v2/core/core" "github.com/kubescape/kubescape/v2/core/meta" @@ -53,6 +54,9 @@ func getImageCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo, imgScanInfo *im failOnSeverity := imagescan.ParseSeverity(scanInfo.FailThresholdSeverity) ctx := context.Background() + + logger.InitLogger(iconlogger.LoggerName) + dbCfg, _ := imagescan.NewDefaultDBConfig() svc := imagescan.NewScanService(dbCfg) diff --git a/core/pkg/resourcehandler/k8sresources.go b/core/pkg/resourcehandler/k8sresources.go index ca46be9b..14f3bbf2 100644 --- a/core/pkg/resourcehandler/k8sresources.go +++ b/core/pkg/resourcehandler/k8sresources.go @@ -54,6 +54,7 @@ func NewK8sResourceHandler(k8s *k8sinterface.KubernetesApi, hostSensorHandler ho } func (k8sHandler *K8sResourceHandler) GetResources(ctx context.Context, sessionObj *cautils.OPASessionObj, progressListener opaprocessor.IJobProgressNotificationClient, scanInfo *cautils.ScanInfo) (cautils.K8SResources, map[string]workloadinterface.IMetadata, cautils.ExternalResources, map[string]bool, error) { + logger.L().Start("Accessing Kubernetes objects") var err error globalFieldSelectors := getFieldSelectorFromScanInfo(scanInfo) @@ -91,7 +92,7 @@ func (k8sHandler *K8sResourceHandler) GetResources(ctx context.Context, sessionO metrics.UpdateWorkerNodesCount(ctx, int64(numberOfWorkerNodes)) } - logger.L().Success("Accessed to Kubernetes objects") + logger.L().StopSuccess("Accessed Kubernetes objects") // backswords compatibility - get image vulnerability resources if k8sHandler.registryAdaptors != nil { @@ -209,12 +210,13 @@ func (k8sHandler *K8sResourceHandler) collectCloudResources(ctx context.Context, return fmt.Errorf("failed to get cloud provider, cluster: %s", clusterName) } + logger.L().Start("Downloading cloud resources") + if sessionObj.Metadata != nil && sessionObj.Metadata.ContextMetadata.ClusterContextMetadata != nil { sessionObj.Metadata.ContextMetadata.ClusterContextMetadata.CloudProvider = provider } logger.L().Debug("cloud", helpers.String("cluster", clusterName), helpers.String("clusterName", clusterName), helpers.String("provider", provider)) - logger.L().Info("Downloading cloud resources") for resourceKind, resourceGetter := range cloudResourceGetterMapping { if !cloudResourceRequired(cloudResources, resourceKind) { continue @@ -236,7 +238,7 @@ func (k8sHandler *K8sResourceHandler) collectCloudResources(ctx context.Context, allResources[wl.GetID()] = wl externalResourceMap[fmt.Sprintf("%s/%s", wl.GetApiVersion(), wl.GetKind())] = []string{wl.GetID()} } - logger.L().Success("Downloaded cloud resources") + logger.L().StopSuccess("Downloaded cloud resources") // get api server info resource if cloudResourceRequired(cloudResources, string(cloudsupport.TypeApiServerInfo)) { @@ -414,7 +416,7 @@ func (k8sHandler *K8sResourceHandler) collectHostResources(ctx context.Context, } func (k8sHandler *K8sResourceHandler) collectRbacResources(allResources map[string]workloadinterface.IMetadata) error { - logger.L().Debug("Collecting rbac resources") + logger.L().Start("Collecting RBAC resources") if k8sHandler.rbacObjectsAPI == nil { return nil @@ -426,6 +428,9 @@ func (k8sHandler *K8sResourceHandler) collectRbacResources(allResources map[stri for k, v := range allRbacResources { allResources[k] = v } + + logger.L().StopSuccess("Collected RBAC resources") + return nil } diff --git a/go.mod b/go.mod index ec40dca7..ab51eb9e 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,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.19 + github.com/kubescape/go-logger v0.0.20 github.com/kubescape/k8s-interface v0.0.138 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 e6612fc6..eb1ec1c0 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.19 h1:X1/UVq1bJX+Q4gZ1fW1GiDWgrvu+yiyKJ9upiw0iI4g= -github.com/kubescape/go-logger v0.0.19/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= +github.com/kubescape/go-logger v0.0.20 h1:ZU3T6Za7maCiChdoTrqpD6TI11DGJwd9xU/TFtRlMOI= +github.com/kubescape/go-logger v0.0.20/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= github.com/kubescape/k8s-interface v0.0.138 h1:JjqLExOQiV1iG6jDLVQ/KpPzH8T9U7jQOtpUe5frF2o= github.com/kubescape/k8s-interface v0.0.138/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 f2201b02..4dcb682f 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.19 + github.com/kubescape/go-logger v0.0.20 github.com/kubescape/k8s-interface v0.0.138 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 096471e0..94635f8f 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.19 h1:X1/UVq1bJX+Q4gZ1fW1GiDWgrvu+yiyKJ9upiw0iI4g= -github.com/kubescape/go-logger v0.0.19/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= +github.com/kubescape/go-logger v0.0.20 h1:ZU3T6Za7maCiChdoTrqpD6TI11DGJwd9xU/TFtRlMOI= +github.com/kubescape/go-logger v0.0.20/go.mod h1:BAWhQMYc/gnC5wMtPvc9Z4VXFqykFFMaXaPkq0+txBY= github.com/kubescape/k8s-interface v0.0.138 h1:JjqLExOQiV1iG6jDLVQ/KpPzH8T9U7jQOtpUe5frF2o= github.com/kubescape/k8s-interface v0.0.138/go.mod h1:5sz+5Cjvo98lTbTVDiDA4MmlXxeHSVMW/wR0V3hV4K8= github.com/kubescape/opa-utils v0.0.261 h1:NEASuRRHfbQRf/9wAEdm+7VV+UDg5tr+VgIfsedbdas=