From 5d4bd2e94ea052d50ddbfeb5ff11b77463260450 Mon Sep 17 00:00:00 2001 From: Matthias Bertschy Date: Tue, 18 Feb 2025 11:38:47 +0100 Subject: [PATCH] removing enable/disable colors, as not compatible with all loggers Signed-off-by: Matthias Bertschy --- cmd/root.go | 2 -- cmd/rootutils.go | 5 +---- core/cautils/rootinfo.go | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 8e6b383c..4bb15c0c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -85,8 +85,6 @@ func getRootCmd(ks meta.IKubescape) *cobra.Command { rootCmd.PersistentFlags().StringVarP(&rootInfo.Logger, "logger", "l", helpers.InfoLevel.String(), fmt.Sprintf("Logger level. Supported: %s [$KS_LOGGER]", strings.Join(helpers.SupportedLevels(), "/"))) rootCmd.PersistentFlags().StringVar(&rootInfo.CacheDir, "cache-dir", getter.DefaultLocalStore, "Cache directory [$KS_CACHE_DIR]") - rootCmd.PersistentFlags().BoolVarP(&rootInfo.DisableColor, "disable-color", "", false, "Disable color output for logging") - rootCmd.PersistentFlags().BoolVarP(&rootInfo.EnableColor, "enable-color", "", false, "Force enable color output for logging") rootCmd.PersistentFlags().StringVarP(&rootInfo.KubeContext, "kube-context", "", "", "Kube context. Default will use the current-context") // Supported commands diff --git a/cmd/rootutils.go b/cmd/rootutils.go index 6c026bdc..1d0acdac 100644 --- a/cmd/rootutils.go +++ b/cmd/rootutils.go @@ -18,9 +18,6 @@ import ( ) func initLogger() { - logger.DisableColor(rootInfo.DisableColor) - logger.EnableColor(rootInfo.EnableColor) - if rootInfo.LoggerName == "" { if l := os.Getenv("KS_LOGGER_NAME"); l != "" { rootInfo.LoggerName = l @@ -34,8 +31,8 @@ func initLogger() { } logger.InitLogger(rootInfo.LoggerName) - } + func initLoggerLevel() { if rootInfo.Logger == helpers.InfoLevel.String() { } else if l := os.Getenv("KS_LOGGER"); l != "" { diff --git a/core/cautils/rootinfo.go b/core/cautils/rootinfo.go index 611056e6..aabf06b7 100644 --- a/core/cautils/rootinfo.go +++ b/core/cautils/rootinfo.go @@ -10,8 +10,6 @@ type RootInfo struct { Logger string // logger level LoggerName string // logger name ("pretty"/"zap"/"none") CacheDir string // cached dir - DisableColor bool // Disable Color - EnableColor bool // Force enable Color DiscoveryServerURL string // Discovery Server URL (See https://github.com/kubescape/backend/tree/main/pkg/servicediscovery) KubeContext string // context name }