diff --git a/build.py b/build.py index f035cd4a..786edc1c 100644 --- a/build.py +++ b/build.py @@ -5,10 +5,6 @@ import platform import subprocess BASE_GETTER_CONST = "github.com/armosec/kubescape/v2/core/cautils/getter" -BE_SERVER_CONST = BASE_GETTER_CONST + ".ArmoBEURL" -ER_SERVER_CONST = BASE_GETTER_CONST + ".ArmoERURL" -WEBSITE_CONST = BASE_GETTER_CONST + ".ArmoFEURL" -AUTH_SERVER_CONST = BASE_GETTER_CONST + ".armoAUTHURL" def check_status(status, msg): if status != 0: @@ -41,10 +37,6 @@ def main(): package_name = get_package_name() build_url = "github.com/armosec/kubescape/v2/core/cautils.BuildNumber" release_version = os.getenv("RELEASE") - armo_be_server = os.getenv("ArmoBEServer") - armo_er_server = os.getenv("ArmoERServer") - armo_website = os.getenv("ArmoWebsite") - armo_auth_server = os.getenv("ArmoAuthServer") client_var = "github.com/armosec/kubescape/v2/core/cautils.Client" client_name = os.getenv("CLIENT") @@ -64,14 +56,6 @@ def main(): ldflags += " -X {}={}".format(build_url, release_version) if client_name: ldflags += " -X {}={}".format(client_var, client_name) - if armo_be_server: - ldflags += " -X {}={}".format(BE_SERVER_CONST, armo_be_server) - if armo_er_server: - ldflags += " -X {}={}".format(ER_SERVER_CONST, armo_er_server) - if armo_website: - ldflags += " -X {}={}".format(WEBSITE_CONST, armo_website) - if armo_auth_server: - ldflags += " -X {}={}".format(AUTH_SERVER_CONST, armo_auth_server) build_command = ["go", "build", "-tags=static", "-o", ks_file, "-ldflags" ,ldflags] diff --git a/cmd/config/delete.go b/cmd/config/delete.go index 6f30070a..ded9f1a7 100644 --- a/cmd/config/delete.go +++ b/cmd/config/delete.go @@ -1,9 +1,9 @@ package config import ( - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/meta" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/set.go b/cmd/config/set.go index 48b2bf65..83a10023 100644 --- a/cmd/config/set.go +++ b/cmd/config/set.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/meta" metav1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/view.go b/cmd/config/view.go index 0a789d77..f8322c34 100644 --- a/cmd/config/view.go +++ b/cmd/config/view.go @@ -3,9 +3,9 @@ package config import ( "os" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/meta" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/delete/exceptions.go b/cmd/delete/exceptions.go index c75a9ff6..2efb518a 100644 --- a/cmd/delete/exceptions.go +++ b/cmd/delete/exceptions.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/meta" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/download/download.go b/cmd/download/download.go index cfa9880a..2114c3cb 100644 --- a/cmd/download/download.go +++ b/cmd/download/download.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/core" "github.com/armosec/kubescape/v2/core/meta" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/list/list.go b/cmd/list/list.go index ac2f8007..2798d6e9 100644 --- a/cmd/list/list.go +++ b/cmd/list/list.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/core" "github.com/armosec/kubescape/v2/core/meta" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index ea4051cf..11e906f3 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -14,10 +14,10 @@ import ( "github.com/armosec/kubescape/v2/cmd/version" "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/core" "github.com/armosec/kubescape/v2/core/meta" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" "github.com/spf13/cobra" ) diff --git a/cmd/rootutils.go b/cmd/rootutils.go index 596deb2c..4cec8c4e 100644 --- a/cmd/rootutils.go +++ b/cmd/rootutils.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" "github.com/mattn/go-isatty" ) diff --git a/cmd/scan/control.go b/cmd/scan/control.go index aadff5e4..fb9b84a9 100644 --- a/cmd/scan/control.go +++ b/cmd/scan/control.go @@ -9,9 +9,10 @@ import ( apisv1 "github.com/armosec/opa-utils/httpserver/apis/v1" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/meta" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/enescakir/emoji" "github.com/spf13/cobra" ) diff --git a/cmd/scan/framework.go b/cmd/scan/framework.go index 1b54281a..00399c0f 100644 --- a/cmd/scan/framework.go +++ b/cmd/scan/framework.go @@ -9,9 +9,10 @@ import ( apisv1 "github.com/armosec/opa-utils/httpserver/apis/v1" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/meta" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/enescakir/emoji" "github.com/spf13/cobra" ) diff --git a/cmd/submit/exceptions.go b/cmd/submit/exceptions.go index b54073bd..e441b491 100644 --- a/cmd/submit/exceptions.go +++ b/cmd/submit/exceptions.go @@ -3,9 +3,9 @@ package submit import ( "fmt" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/meta" metav1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" "github.com/spf13/cobra" ) diff --git a/cmd/submit/rbac.go b/cmd/submit/rbac.go index e5d17f76..0d002f28 100644 --- a/cmd/submit/rbac.go +++ b/cmd/submit/rbac.go @@ -4,11 +4,11 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/meta" "github.com/armosec/kubescape/v2/core/meta/cliinterfaces" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" reporterv1 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter/v1" diff --git a/cmd/submit/results.go b/cmd/submit/results.go index 47c587f3..1451f43e 100644 --- a/cmd/submit/results.go +++ b/cmd/submit/results.go @@ -7,14 +7,14 @@ import ( "time" "github.com/armosec/k8s-interface/workloadinterface" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/meta" "github.com/armosec/kubescape/v2/core/meta/cliinterfaces" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter" reporterv1 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter/v1" reporterv2 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter/v2" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" "github.com/armosec/opa-utils/reporthandling" "github.com/google/uuid" diff --git a/core/cautils/customerloader.go b/core/cautils/customerloader.go index d6eb4b60..b46fdd1b 100644 --- a/core/cautils/customerloader.go +++ b/core/cautils/customerloader.go @@ -11,7 +11,7 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" + logger "github.com/dwertent/go-logger" corev1 "k8s.io/api/core/v1" ) diff --git a/core/cautils/fileutils.go b/core/cautils/fileutils.go index 392884d2..7079a4c7 100644 --- a/core/cautils/fileutils.go +++ b/core/cautils/fileutils.go @@ -9,11 +9,12 @@ import ( "strings" "github.com/armosec/k8s-interface/workloadinterface" + "github.com/dwertent/go-logger/helpers" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/objectsenvelopes" "github.com/armosec/opa-utils/objectsenvelopes/localworkload" + logger "github.com/dwertent/go-logger" + "gopkg.in/yaml.v2" ) diff --git a/core/cautils/getter/armoapi.go b/core/cautils/getter/armoapi.go index 82e8a04d..af55d3fe 100644 --- a/core/cautils/getter/armoapi.go +++ b/core/cautils/getter/armoapi.go @@ -10,9 +10,9 @@ import ( "time" "github.com/armosec/armoapi-go/armotypes" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/reporthandling" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) // ======================================================================================================================= diff --git a/core/cautils/helmchart.go b/core/cautils/helmchart.go index 8b39e611..61abc3b5 100644 --- a/core/cautils/helmchart.go +++ b/core/cautils/helmchart.go @@ -5,9 +5,10 @@ import ( "strings" "github.com/armosec/k8s-interface/workloadinterface" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/objectsenvelopes/localworkload" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + helmchart "helm.sh/helm/v3/pkg/chart" helmloader "helm.sh/helm/v3/pkg/chart/loader" helmchartutil "helm.sh/helm/v3/pkg/chartutil" diff --git a/core/cautils/logger/helpers/datastructures.go b/core/cautils/logger/helpers/datastructures.go deleted file mode 100644 index 85ea7e4c..00000000 --- a/core/cautils/logger/helpers/datastructures.go +++ /dev/null @@ -1,31 +0,0 @@ -package helpers - -import "time" - -type StringObj struct { - key string - value string -} - -type ErrorObj struct { - key string - value error -} - -type IntObj struct { - key string - value int -} - -type InterfaceObj struct { - key string - value interface{} -} - -func Error(e error) *ErrorObj { return &ErrorObj{key: "error", value: e} } -func Int(k string, v int) *IntObj { return &IntObj{key: k, value: v} } -func String(k, v string) *StringObj { return &StringObj{key: k, value: v} } -func Interface(k string, v interface{}) *InterfaceObj { return &InterfaceObj{key: k, value: v} } -func Time() *StringObj { - return &StringObj{key: "time", value: time.Now().Format("2006-01-02 15:04:05")} -} diff --git a/core/cautils/logger/helpers/level.go b/core/cautils/logger/helpers/level.go deleted file mode 100644 index c4d46730..00000000 --- a/core/cautils/logger/helpers/level.go +++ /dev/null @@ -1,69 +0,0 @@ -package helpers - -import ( - "strings" -) - -type Level int8 - -const ( - UnknownLevel Level = iota - -1 - DebugLevel - InfoLevel //default - SuccessLevel - WarningLevel - ErrorLevel - FatalLevel - - _defaultLevel = InfoLevel - _minLevel = DebugLevel - _maxLevel = FatalLevel -) - -func ToLevel(level string) Level { - switch strings.ToLower(level) { - case "debug": - return DebugLevel - case "info": - return InfoLevel - case "success": - return SuccessLevel - case "warning", "warn": - return WarningLevel - case "error": - return ErrorLevel - case "fatal": - return FatalLevel - default: - return UnknownLevel - } -} -func (l Level) String() string { - switch l { - case DebugLevel: - return "debug" - case InfoLevel: - return "info" - case SuccessLevel: - return "success" - case WarningLevel: - return "warning" - case ErrorLevel: - return "error" - case FatalLevel: - return "fatal" - } - return "" -} - -func (l Level) Skip(l2 Level) bool { - return l < l2 -} - -func SupportedLevels() []string { - levels := []string{} - for i := _minLevel; i <= _maxLevel; i++ { - levels = append(levels, i.String()) - } - return levels -} diff --git a/core/cautils/logger/helpers/methods.go b/core/cautils/logger/helpers/methods.go deleted file mode 100644 index 347e86f1..00000000 --- a/core/cautils/logger/helpers/methods.go +++ /dev/null @@ -1,62 +0,0 @@ -package helpers - -type IDetails interface { - Key() string - Value() interface{} -} - -// ====================================================================================== -// ============================== String ================================================ -// ====================================================================================== - -// Key -func (s *StringObj) Key() string { - return s.key -} - -// Value -func (s *StringObj) Value() interface{} { - return s.value -} - -// ====================================================================================== -// =============================== Error ================================================ -// ====================================================================================== - -// Key -func (s *ErrorObj) Key() string { - return s.key -} - -// Value -func (s *ErrorObj) Value() interface{} { - return s.value -} - -// ====================================================================================== -// ================================= Int ================================================ -// ====================================================================================== - -// Key -func (s *IntObj) Key() string { - return s.key -} - -// Value -func (s *IntObj) Value() interface{} { - return s.value -} - -// ====================================================================================== -// =========================== Interface ================================================ -// ====================================================================================== - -// Key -func (s *InterfaceObj) Key() string { - return s.key -} - -// Value -func (s *InterfaceObj) Value() interface{} { - return s.value -} diff --git a/core/cautils/logger/methods.go b/core/cautils/logger/methods.go deleted file mode 100644 index 9a3bf3c0..00000000 --- a/core/cautils/logger/methods.go +++ /dev/null @@ -1,81 +0,0 @@ -package logger - -import ( - "os" - "strings" - - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" - "github.com/armosec/kubescape/v2/core/cautils/logger/nonelogger" - "github.com/armosec/kubescape/v2/core/cautils/logger/prettylogger" - "github.com/armosec/kubescape/v2/core/cautils/logger/zaplogger" -) - -type ILogger interface { - Fatal(msg string, details ...helpers.IDetails) // print log and exit 1 - Error(msg string, details ...helpers.IDetails) - Success(msg string, details ...helpers.IDetails) - Warning(msg string, details ...helpers.IDetails) - Info(msg string, details ...helpers.IDetails) - Debug(msg string, details ...helpers.IDetails) - - SetLevel(level string) error - GetLevel() string - - SetWriter(w *os.File) - GetWriter() *os.File - - LoggerName() string -} - -var l ILogger - -// Return initialized logger. If logger not initialized, will call InitializeLogger() with the default value -func L() ILogger { - if l == nil { - InitDefaultLogger() - } - return l -} - -/* InitLogger initialize desired logger - -Use: -InitLogger("") - -Supported logger names (call ListLoggersNames() for listing supported loggers) -- "zap": Logger from package "go.uber.org/zap" -- "pretty", "colorful": Human friendly colorful logger -- "none", "mock", "empty", "ignore": Logger will not print anything - -Default: -- "pretty" - -e.g. -InitLogger("none") -> will initialize the mock logger - -*/ -func InitLogger(loggerName string) { - - switch strings.ToLower(loggerName) { - case zaplogger.LoggerName: - l = zaplogger.NewZapLogger() - case prettylogger.LoggerName, "colorful": - l = prettylogger.NewPrettyLogger() - case nonelogger.LoggerName, "mock", "empty", "ignore": - l = nonelogger.NewNoneLogger() - default: - InitDefaultLogger() - } -} - -func InitDefaultLogger() { - l = prettylogger.NewPrettyLogger() -} - -func DisableColor(flag bool) { - prettylogger.DisableColor(flag) -} - -func ListLoggersNames() []string { - return []string{prettylogger.LoggerName, zaplogger.LoggerName, nonelogger.LoggerName} -} diff --git a/core/cautils/logger/nonelogger/logger.go b/core/cautils/logger/nonelogger/logger.go deleted file mode 100644 index 2c17e332..00000000 --- a/core/cautils/logger/nonelogger/logger.go +++ /dev/null @@ -1,28 +0,0 @@ -package nonelogger - -import ( - "os" - - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" -) - -const LoggerName string = "none" - -type NoneLogger struct { -} - -func NewNoneLogger() *NoneLogger { - return &NoneLogger{} -} - -func (nl *NoneLogger) GetLevel() string { return "" } -func (nl *NoneLogger) LoggerName() string { return LoggerName } -func (nl *NoneLogger) SetWriter(w *os.File) {} -func (nl *NoneLogger) GetWriter() *os.File { return nil } -func (nl *NoneLogger) SetLevel(level string) error { return nil } -func (nl *NoneLogger) Fatal(msg string, details ...helpers.IDetails) {} -func (nl *NoneLogger) Error(msg string, details ...helpers.IDetails) {} -func (nl *NoneLogger) Warning(msg string, details ...helpers.IDetails) {} -func (nl *NoneLogger) Success(msg string, details ...helpers.IDetails) {} -func (nl *NoneLogger) Info(msg string, details ...helpers.IDetails) {} -func (nl *NoneLogger) Debug(msg string, details ...helpers.IDetails) {} diff --git a/core/cautils/logger/prettylogger/colors.go b/core/cautils/logger/prettylogger/colors.go deleted file mode 100644 index cb1936dd..00000000 --- a/core/cautils/logger/prettylogger/colors.go +++ /dev/null @@ -1,37 +0,0 @@ -package prettylogger - -import ( - "io" - - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" - "github.com/fatih/color" -) - -var prefixError = color.New(color.Bold, color.FgHiRed).FprintfFunc() -var prefixWarning = color.New(color.Bold, color.FgHiYellow).FprintfFunc() -var prefixInfo = color.New(color.Bold, color.FgCyan).FprintfFunc() -var prefixSuccess = color.New(color.Bold, color.FgHiGreen).FprintfFunc() -var prefixDebug = color.New(color.Bold, color.FgWhite).FprintfFunc() -var message = color.New().FprintfFunc() - -func prefix(l helpers.Level) func(w io.Writer, format string, a ...interface{}) { - switch l { - case helpers.DebugLevel: - return prefixDebug - case helpers.InfoLevel: - return prefixInfo - case helpers.SuccessLevel: - return prefixSuccess - case helpers.WarningLevel: - return prefixWarning - case helpers.ErrorLevel, helpers.FatalLevel: - return prefixError - } - return message -} - -func DisableColor(flag bool) { - if flag { - color.NoColor = true - } -} diff --git a/core/cautils/logger/prettylogger/logger.go b/core/cautils/logger/prettylogger/logger.go deleted file mode 100644 index f86a8d14..00000000 --- a/core/cautils/logger/prettylogger/logger.go +++ /dev/null @@ -1,82 +0,0 @@ -package prettylogger - -import ( - "fmt" - "os" - "sync" - - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" -) - -const LoggerName string = "pretty" - -type PrettyLogger struct { - writer *os.File - level helpers.Level - mutex sync.Mutex -} - -func NewPrettyLogger() *PrettyLogger { - - return &PrettyLogger{ - writer: os.Stderr, // default to stderr - level: helpers.InfoLevel, - mutex: sync.Mutex{}, - } -} - -func (pl *PrettyLogger) GetLevel() string { return pl.level.String() } -func (pl *PrettyLogger) SetWriter(w *os.File) { pl.writer = w } -func (pl *PrettyLogger) GetWriter() *os.File { return pl.writer } -func (pl *PrettyLogger) LoggerName() string { return LoggerName } - -func (pl *PrettyLogger) SetLevel(level string) error { - pl.level = helpers.ToLevel(level) - if pl.level == helpers.UnknownLevel { - return fmt.Errorf("level '%s' unknown", level) - } - return nil -} -func (pl *PrettyLogger) Fatal(msg string, details ...helpers.IDetails) { - pl.print(helpers.FatalLevel, msg, details...) - os.Exit(1) -} -func (pl *PrettyLogger) Error(msg string, details ...helpers.IDetails) { - pl.print(helpers.ErrorLevel, msg, details...) -} -func (pl *PrettyLogger) Warning(msg string, details ...helpers.IDetails) { - pl.print(helpers.WarningLevel, msg, details...) -} -func (pl *PrettyLogger) Info(msg string, details ...helpers.IDetails) { - pl.print(helpers.InfoLevel, msg, details...) -} -func (pl *PrettyLogger) Debug(msg string, details ...helpers.IDetails) { - pl.print(helpers.DebugLevel, msg, details...) -} -func (pl *PrettyLogger) Success(msg string, details ...helpers.IDetails) { - pl.print(helpers.SuccessLevel, msg, details...) -} - -func (pl *PrettyLogger) print(level helpers.Level, msg string, details ...helpers.IDetails) { - if !level.Skip(pl.level) { - pl.mutex.Lock() - prefix(level)(pl.writer, "[%s] ", level.String()) - if d := detailsToString(details); d != "" { - msg = fmt.Sprintf("%s. %s", msg, d) - } - message(pl.writer, fmt.Sprintf("%s\n", msg)) - pl.mutex.Unlock() - } - -} - -func detailsToString(details []helpers.IDetails) string { - s := "" - for i := range details { - s += fmt.Sprintf("%s: %v", details[i].Key(), details[i].Value()) - if i < len(details)-1 { - s += "; " - } - } - return s -} diff --git a/core/cautils/logger/zaplogger/logger.go b/core/cautils/logger/zaplogger/logger.go deleted file mode 100644 index 199c7038..00000000 --- a/core/cautils/logger/zaplogger/logger.go +++ /dev/null @@ -1,79 +0,0 @@ -package zaplogger - -import ( - "os" - - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -const LoggerName string = "zap" - -type ZapLogger struct { - zapL *zap.Logger - cfg zap.Config -} - -func NewZapLogger() *ZapLogger { - ec := zap.NewProductionEncoderConfig() - ec.EncodeTime = zapcore.RFC3339TimeEncoder - cfg := zap.NewProductionConfig() - cfg.DisableCaller = true - cfg.DisableStacktrace = true - cfg.Encoding = "json" - cfg.EncoderConfig = ec - - zapLogger, err := cfg.Build() - if err != nil { - panic(err) - } - return &ZapLogger{ - zapL: zapLogger, - cfg: cfg, - } -} - -func (zl *ZapLogger) GetLevel() string { return zl.cfg.Level.Level().String() } -func (zl *ZapLogger) SetWriter(w *os.File) {} -func (zl *ZapLogger) GetWriter() *os.File { return nil } -func (zl *ZapLogger) LoggerName() string { return LoggerName } -func (zl *ZapLogger) SetLevel(level string) error { - l := zapcore.Level(1) - err := l.Set(level) - if err == nil { - zl.cfg.Level.SetLevel(l) - } - return err -} -func (zl *ZapLogger) Fatal(msg string, details ...helpers.IDetails) { - zl.zapL.Fatal(msg, detailsToZapFields(details)...) -} - -func (zl *ZapLogger) Error(msg string, details ...helpers.IDetails) { - zl.zapL.Error(msg, detailsToZapFields(details)...) -} - -func (zl *ZapLogger) Warning(msg string, details ...helpers.IDetails) { - zl.zapL.Warn(msg, detailsToZapFields(details)...) -} - -func (zl *ZapLogger) Success(msg string, details ...helpers.IDetails) { - zl.zapL.Info(msg, detailsToZapFields(details)...) -} - -func (zl *ZapLogger) Info(msg string, details ...helpers.IDetails) { - zl.zapL.Info(msg, detailsToZapFields(details)...) -} - -func (zl *ZapLogger) Debug(msg string, details ...helpers.IDetails) { - zl.zapL.Debug(msg, detailsToZapFields(details)...) -} - -func detailsToZapFields(details []helpers.IDetails) []zapcore.Field { - zapFields := []zapcore.Field{} - for i := range details { - zapFields = append(zapFields, zap.Any(details[i].Key(), details[i].Value())) - } - return zapFields -} diff --git a/core/cautils/scaninfo.go b/core/cautils/scaninfo.go index 0b761b4a..449b8dfe 100644 --- a/core/cautils/scaninfo.go +++ b/core/cautils/scaninfo.go @@ -14,10 +14,11 @@ import ( giturl "github.com/armosec/go-git-url" "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/reporthandling" reporthandlingv2 "github.com/armosec/opa-utils/reporthandling/v2" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/google/uuid" ) diff --git a/core/cautils/versioncheck.go b/core/cautils/versioncheck.go index d3fe30df..23fc193b 100644 --- a/core/cautils/versioncheck.go +++ b/core/cautils/versioncheck.go @@ -7,9 +7,10 @@ import ( "os" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/utils-go/boolutils" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "golang.org/x/mod/semver" ) diff --git a/core/core/delete.go b/core/core/delete.go index 0b055133..34db60cf 100644 --- a/core/core/delete.go +++ b/core/core/delete.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" v1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) func (ks *Kubescape) DeleteExceptions(delExceptions *v1.DeleteExceptions) error { diff --git a/core/core/download.go b/core/core/download.go index 90826fcb..69013fc9 100644 --- a/core/core/download.go +++ b/core/core/download.go @@ -8,9 +8,9 @@ import ( "github.com/armosec/armoapi-go/armotypes" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" metav1 "github.com/armosec/kubescape/v2/core/meta/datastructures/v1" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) var downloadFunc = map[string]func(*metav1.DownloadInfo) error{ diff --git a/core/core/initutils.go b/core/core/initutils.go index c6179ec0..51bd360f 100644 --- a/core/core/initutils.go +++ b/core/core/initutils.go @@ -6,12 +6,13 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/hostsensorutils" "github.com/armosec/kubescape/v2/core/pkg/resourcehandler" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter" reporterv2 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter/v2" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/google/uuid" "github.com/armosec/rbac-utils/rbacscanner" diff --git a/core/core/scan.go b/core/core/scan.go index bdce5c41..7c0589d2 100644 --- a/core/core/scan.go +++ b/core/core/scan.go @@ -9,8 +9,6 @@ import ( "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/hostsensorutils" "github.com/armosec/kubescape/v2/core/pkg/opaprocessor" "github.com/armosec/kubescape/v2/core/pkg/policyhandler" @@ -18,6 +16,8 @@ import ( "github.com/armosec/kubescape/v2/core/pkg/resultshandling" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" "github.com/armosec/opa-utils/resources" ) diff --git a/core/core/submit.go b/core/core/submit.go index db28b8be..f0526002 100644 --- a/core/core/submit.go +++ b/core/core/submit.go @@ -3,9 +3,9 @@ package core import ( "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/meta/cliinterfaces" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) func (ks *Kubescape) Submit(submitInterfaces cliinterfaces.SubmitInterfaces) error { diff --git a/core/pkg/hostsensorutils/hostsensordeploy.go b/core/pkg/hostsensorutils/hostsensordeploy.go index 06030f0f..598b87ab 100644 --- a/core/pkg/hostsensorutils/hostsensordeploy.go +++ b/core/pkg/hostsensorutils/hostsensordeploy.go @@ -11,8 +11,9 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/core/pkg/hostsensorutils/hostsensorgetfrompod.go b/core/pkg/hostsensorutils/hostsensorgetfrompod.go index 396689b8..0f8c0ebf 100644 --- a/core/pkg/hostsensorutils/hostsensorgetfrompod.go +++ b/core/pkg/hostsensorutils/hostsensorgetfrompod.go @@ -6,10 +6,11 @@ import ( "sync" "github.com/armosec/k8s-interface/k8sinterface" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/objectsenvelopes/hostsensor" "github.com/armosec/opa-utils/reporthandling/apis" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "sigs.k8s.io/yaml" ) diff --git a/core/pkg/hostsensorutils/hostsensorworkerpool.go b/core/pkg/hostsensorutils/hostsensorworkerpool.go index af6e1b7b..522d28e9 100644 --- a/core/pkg/hostsensorutils/hostsensorworkerpool.go +++ b/core/pkg/hostsensorutils/hostsensorworkerpool.go @@ -3,9 +3,9 @@ package hostsensorutils import ( "sync" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/objectsenvelopes/hostsensor" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) const noOfWorkers int = 10 diff --git a/core/pkg/opaprocessor/processorhandler.go b/core/pkg/opaprocessor/processorhandler.go index 8c87e3f6..e45f47bf 100644 --- a/core/pkg/opaprocessor/processorhandler.go +++ b/core/pkg/opaprocessor/processorhandler.go @@ -7,13 +7,14 @@ import ( "github.com/armosec/armoapi-go/armotypes" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/score" "github.com/armosec/opa-utils/objectsenvelopes" "github.com/armosec/opa-utils/reporthandling" "github.com/armosec/opa-utils/reporthandling/apis" "github.com/armosec/opa-utils/reporthandling/results/v1/resourcesresults" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/open-policy-agent/opa/storage" "github.com/armosec/k8s-interface/workloadinterface" diff --git a/core/pkg/opaprocessor/processorhandlerutils.go b/core/pkg/opaprocessor/processorhandlerutils.go index 8526bded..50338b27 100644 --- a/core/pkg/opaprocessor/processorhandlerutils.go +++ b/core/pkg/opaprocessor/processorhandlerutils.go @@ -2,7 +2,7 @@ package opaprocessor import ( "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" + logger "github.com/dwertent/go-logger" "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/k8s-interface/workloadinterface" diff --git a/core/pkg/policyhandler/handlepullpolicies.go b/core/pkg/policyhandler/handlepullpolicies.go index 8b98a798..433a8edc 100644 --- a/core/pkg/policyhandler/handlepullpolicies.go +++ b/core/pkg/policyhandler/handlepullpolicies.go @@ -8,9 +8,9 @@ import ( "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/reporthandling" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) func (policyHandler *PolicyHandler) getPolicies(policyIdentifier []cautils.PolicyIdentifier, policiesAndResources *cautils.OPASessionObj) error { diff --git a/core/pkg/registryadaptors/armosec/v1/civarmoadaptor.go b/core/pkg/registryadaptors/armosec/v1/civarmoadaptor.go index c19489ff..52d75470 100644 --- a/core/pkg/registryadaptors/armosec/v1/civarmoadaptor.go +++ b/core/pkg/registryadaptors/armosec/v1/civarmoadaptor.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/containerscan" "github.com/armosec/kubescape/v2/core/pkg/registryadaptors/registryvulnerabilities" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) func NewArmoAdaptor(armoAPI *getter.ArmoAPI) *ArmoCivAdaptor { diff --git a/core/pkg/resourcehandler/filesloader.go b/core/pkg/resourcehandler/filesloader.go index 9da2c15b..3a99883f 100644 --- a/core/pkg/resourcehandler/filesloader.go +++ b/core/pkg/resourcehandler/filesloader.go @@ -12,8 +12,8 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) // FileResourceHandler handle resources from files and URLs diff --git a/core/pkg/resourcehandler/filesloaderutils.go b/core/pkg/resourcehandler/filesloaderutils.go index d0308e0b..37d74acd 100644 --- a/core/pkg/resourcehandler/filesloaderutils.go +++ b/core/pkg/resourcehandler/filesloaderutils.go @@ -8,9 +8,9 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/reporthandling" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) // Clone git repository diff --git a/core/pkg/resourcehandler/k8sresources.go b/core/pkg/resourcehandler/k8sresources.go index d4811df7..ee8c0e7c 100644 --- a/core/pkg/resourcehandler/k8sresources.go +++ b/core/pkg/resourcehandler/k8sresources.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/hostsensorutils" "github.com/armosec/opa-utils/objectsenvelopes" "github.com/armosec/opa-utils/reporthandling/apis" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" "github.com/armosec/k8s-interface/cloudsupport" "github.com/armosec/k8s-interface/k8sinterface" diff --git a/core/pkg/resourcehandler/registrydata.go b/core/pkg/resourcehandler/registrydata.go index 2aadc770..20f452b0 100644 --- a/core/pkg/resourcehandler/registrydata.go +++ b/core/pkg/resourcehandler/registrydata.go @@ -7,9 +7,9 @@ import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" armosecadaptorv1 "github.com/armosec/kubescape/v2/core/pkg/registryadaptors/armosec/v1" "github.com/armosec/kubescape/v2/core/pkg/registryadaptors/registryvulnerabilities" + logger "github.com/dwertent/go-logger" "github.com/armosec/opa-utils/shared" ) @@ -62,6 +62,10 @@ func (registryAdaptors *RegistryAdaptors) collectImagesVulnerabilities(k8sResour // convert result to IMetadata object metaObjs := vulnerabilitiesToIMetadata(imagesVulnerability) + if len(metaObjs) == 0 { + return fmt.Errorf("no vulnerabilities found for any of the images") + } + // save in resources map for i := range metaObjs { allResources[metaObjs[i].GetID()] = metaObjs[i] diff --git a/core/pkg/resourcehandler/urlloader.go b/core/pkg/resourcehandler/urlloader.go index 7abcf31d..05b82331 100644 --- a/core/pkg/resourcehandler/urlloader.go +++ b/core/pkg/resourcehandler/urlloader.go @@ -4,8 +4,8 @@ import ( giturl "github.com/armosec/go-git-url" "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) func loadResourcesFromUrl(inputPatterns []string) (map[string][]workloadinterface.IMetadata, error) { diff --git a/core/pkg/resultshandling/printer/printresults.go b/core/pkg/resultshandling/printer/printresults.go index 1202736e..a0c2be61 100644 --- a/core/pkg/resultshandling/printer/printresults.go +++ b/core/pkg/resultshandling/printer/printresults.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" + logger "github.com/dwertent/go-logger" ) var INDENT = " " diff --git a/core/pkg/resultshandling/printer/v1/jsonprinter.go b/core/pkg/resultshandling/printer/v1/jsonprinter.go index b3098c08..1a5c6c39 100644 --- a/core/pkg/resultshandling/printer/v1/jsonprinter.go +++ b/core/pkg/resultshandling/printer/v1/jsonprinter.go @@ -6,8 +6,8 @@ import ( "os" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" + logger "github.com/dwertent/go-logger" ) type JsonPrinter struct { diff --git a/core/pkg/resultshandling/printer/v1/prometheusprinter.go b/core/pkg/resultshandling/printer/v1/prometheusprinter.go index d30804e8..2360b550 100644 --- a/core/pkg/resultshandling/printer/v1/prometheusprinter.go +++ b/core/pkg/resultshandling/printer/v1/prometheusprinter.go @@ -6,9 +6,9 @@ import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" "github.com/armosec/opa-utils/reporthandling" + logger "github.com/dwertent/go-logger" ) type PrometheusPrinter struct { diff --git a/core/pkg/resultshandling/printer/v2/htmlprinter.go b/core/pkg/resultshandling/printer/v2/htmlprinter.go index e9ac09f7..c79fd627 100644 --- a/core/pkg/resultshandling/printer/v2/htmlprinter.go +++ b/core/pkg/resultshandling/printer/v2/htmlprinter.go @@ -9,12 +9,12 @@ import ( "strings" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" "github.com/armosec/opa-utils/reporthandling/apis" "github.com/armosec/opa-utils/reporthandling/results/v1/reportsummary" "github.com/armosec/opa-utils/reporthandling/results/v1/resourcesresults" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) const ( diff --git a/core/pkg/resultshandling/printer/v2/jsonprinter.go b/core/pkg/resultshandling/printer/v2/jsonprinter.go index 77b9836b..bb760cf9 100644 --- a/core/pkg/resultshandling/printer/v2/jsonprinter.go +++ b/core/pkg/resultshandling/printer/v2/jsonprinter.go @@ -6,9 +6,9 @@ import ( "os" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) type JsonPrinter struct { diff --git a/core/pkg/resultshandling/printer/v2/junit.go b/core/pkg/resultshandling/printer/v2/junit.go index b04a5483..71ee51b3 100644 --- a/core/pkg/resultshandling/printer/v2/junit.go +++ b/core/pkg/resultshandling/printer/v2/junit.go @@ -9,11 +9,11 @@ import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" "github.com/armosec/opa-utils/reporthandling/results/v1/reportsummary" "github.com/armosec/opa-utils/shared" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) /* diff --git a/core/pkg/resultshandling/printer/v2/pdf.go b/core/pkg/resultshandling/printer/v2/pdf.go index 8877a642..e1c4f511 100644 --- a/core/pkg/resultshandling/printer/v2/pdf.go +++ b/core/pkg/resultshandling/printer/v2/pdf.go @@ -10,10 +10,11 @@ import ( "time" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" "github.com/armosec/opa-utils/reporthandling/results/v1/reportsummary" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/johnfercher/maroto/pkg/color" "github.com/johnfercher/maroto/pkg/consts" "github.com/johnfercher/maroto/pkg/pdf" diff --git a/core/pkg/resultshandling/printer/v2/prometheus.go b/core/pkg/resultshandling/printer/v2/prometheus.go index cedd2bc8..18fd25fc 100644 --- a/core/pkg/resultshandling/printer/v2/prometheus.go +++ b/core/pkg/resultshandling/printer/v2/prometheus.go @@ -6,11 +6,11 @@ import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" "github.com/armosec/opa-utils/reporthandling/results/v1/reportsummary" "github.com/armosec/opa-utils/reporthandling/results/v1/resourcesresults" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) type PrometheusPrinter struct { diff --git a/core/pkg/resultshandling/printer/v2/utils.go b/core/pkg/resultshandling/printer/v2/utils.go index 1c18c60d..b2c9d3f2 100644 --- a/core/pkg/resultshandling/printer/v2/utils.go +++ b/core/pkg/resultshandling/printer/v2/utils.go @@ -3,12 +3,12 @@ package v2 import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/reporthandling" "github.com/armosec/opa-utils/reporthandling/results/v1/reportsummary" "github.com/armosec/opa-utils/reporthandling/results/v1/resourcesresults" reporthandlingv2 "github.com/armosec/opa-utils/reporthandling/v2" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) // finalizeV2Report finalize the results objects by copying data from map to lists diff --git a/core/pkg/resultshandling/reporter/v1/reporteventreceiver.go b/core/pkg/resultshandling/reporter/v1/reporteventreceiver.go index 6b45a01b..850e2d23 100644 --- a/core/pkg/resultshandling/reporter/v1/reporteventreceiver.go +++ b/core/pkg/resultshandling/reporter/v1/reporteventreceiver.go @@ -10,10 +10,11 @@ import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" v2 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter/v2" "github.com/armosec/opa-utils/reporthandling" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/google/uuid" ) diff --git a/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go b/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go index 5e7a4eab..51c86cd6 100644 --- a/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go +++ b/core/pkg/resultshandling/reporter/v2/reporteventreceiver.go @@ -11,11 +11,11 @@ import ( "github.com/armosec/k8s-interface/workloadinterface" "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/opa-utils/reporthandling" "github.com/armosec/opa-utils/reporthandling/results/v1/resourcesresults" reporthandlingv2 "github.com/armosec/opa-utils/reporthandling/v2" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) const MAX_REPORT_SIZE = 2097152 // 2 MB diff --git a/core/pkg/resultshandling/results.go b/core/pkg/resultshandling/results.go index 6d1764e8..2fe409df 100644 --- a/core/pkg/resultshandling/results.go +++ b/core/pkg/resultshandling/results.go @@ -4,13 +4,13 @@ import ( "encoding/json" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer" printerv1 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer/v1" printerv2 "github.com/armosec/kubescape/v2/core/pkg/resultshandling/printer/v2" "github.com/armosec/kubescape/v2/core/pkg/resultshandling/reporter" reporthandlingv2 "github.com/armosec/opa-utils/reporthandling/v2" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) type ResultsHandler struct { diff --git a/go.mod b/go.mod index 9dbe76a6..9cd2931c 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/armosec/utils-go v0.0.7 github.com/armosec/utils-k8s-go v0.0.7 github.com/briandowns/spinner v1.18.1 + github.com/dwertent/go-logger v0.0.2 github.com/enescakir/emoji v1.0.0 github.com/fatih/color v1.13.0 github.com/francoispqt/gojay v1.2.13 @@ -24,7 +25,6 @@ require ( github.com/spf13/cobra v1.5.0 github.com/stretchr/testify v1.8.0 github.com/whilp/git-urls v1.0.0 - go.uber.org/zap v1.21.0 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.9.0 @@ -140,6 +140,7 @@ require ( go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.21.0 // indirect golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 // indirect diff --git a/go.sum b/go.sum index 96b9994e..80772cde 100644 --- a/go.sum +++ b/go.sum @@ -471,6 +471,8 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dwertent/go-logger v0.0.2 h1:ds0llvSj4p9PG7/eK8d7iSHHVq92/GJjRH2QQ2xCMMk= +github.com/dwertent/go-logger v0.0.2/go.mod h1:6q+xZIwVGJNt2XnV98d8Lksf2cUz7qfK7G9wVq3wuVg= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= diff --git a/httphandler/build.py b/httphandler/build.py index b5f01c16..44c74815 100644 --- a/httphandler/build.py +++ b/httphandler/build.py @@ -5,10 +5,6 @@ import platform import subprocess BASE_GETTER_CONST = "github.com/armosec/kubescape/v2/core/cautils/getter" -BE_SERVER_CONST = BASE_GETTER_CONST + ".ArmoBEURL" -ER_SERVER_CONST = BASE_GETTER_CONST + ".ArmoERURL" -WEBSITE_CONST = BASE_GETTER_CONST + ".ArmoFEURL" -AUTH_SERVER_CONST = BASE_GETTER_CONST + ".armoAUTHURL" def checkStatus(status, msg): if status != 0: @@ -42,10 +38,6 @@ def main(): packageName = getPackageName() buildUrl = "github.com/armosec/kubescape/v2/core/cautils.BuildNumber" releaseVersion = os.getenv("RELEASE") - ArmoBEServer = os.getenv("ArmoBEServer") - ArmoERServer = os.getenv("ArmoERServer") - ArmoWebsite = os.getenv("ArmoWebsite") - ArmoAuthServer = os.getenv("ArmoAuthServer") # Create build directory buildDir = getBuildDir() @@ -60,14 +52,6 @@ def main(): ldflags = "-w -s" if releaseVersion: ldflags += " -X {}={}".format(buildUrl, releaseVersion) - if ArmoBEServer: - ldflags += " -X {}={}".format(BE_SERVER_CONST, ArmoBEServer) - if ArmoERServer: - ldflags += " -X {}={}".format(ER_SERVER_CONST, ArmoERServer) - if ArmoWebsite: - ldflags += " -X {}={}".format(WEBSITE_CONST, ArmoWebsite) - if ArmoAuthServer: - ldflags += " -X {}={}".format(AUTH_SERVER_CONST, ArmoAuthServer) build_command = ["go", "build", "-tags=static", "-o", ks_file, "-ldflags" ,ldflags] diff --git a/httphandler/go.mod b/httphandler/go.mod index 51ea45a6..1fceac10 100644 --- a/httphandler/go.mod +++ b/httphandler/go.mod @@ -8,6 +8,7 @@ require ( github.com/armosec/kubescape/v2 v2.0.0-00010101000000-000000000000 github.com/armosec/opa-utils v0.0.160 github.com/armosec/utils-go v0.0.7 + github.com/dwertent/go-logger v0.0.2 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/schema v1.2.0 diff --git a/httphandler/go.sum b/httphandler/go.sum index f5fd0418..bf8fcaac 100644 --- a/httphandler/go.sum +++ b/httphandler/go.sum @@ -471,6 +471,8 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dwertent/go-logger v0.0.2 h1:ds0llvSj4p9PG7/eK8d7iSHHVq92/GJjRH2QQ2xCMMk= +github.com/dwertent/go-logger v0.0.2/go.mod h1:6q+xZIwVGJNt2XnV98d8Lksf2cUz7qfK7G9wVq3wuVg= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= @@ -817,7 +819,6 @@ github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc= github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= @@ -854,7 +855,6 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= diff --git a/httphandler/handlerequests/v1/prometheus.go b/httphandler/handlerequests/v1/prometheus.go index 250da843..ddf171f4 100644 --- a/httphandler/handlerequests/v1/prometheus.go +++ b/httphandler/handlerequests/v1/prometheus.go @@ -7,9 +7,10 @@ import ( "path/filepath" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" utilsapisv1 "github.com/armosec/opa-utils/httpserver/apis/v1" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/google/uuid" ) diff --git a/httphandler/handlerequests/v1/requestparser.go b/httphandler/handlerequests/v1/requestparser.go index 211b8d81..6f46a137 100644 --- a/httphandler/handlerequests/v1/requestparser.go +++ b/httphandler/handlerequests/v1/requestparser.go @@ -8,9 +8,10 @@ import ( "sync" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" utilsmetav1 "github.com/armosec/opa-utils/httpserver/meta/v1" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/gorilla/schema" ) diff --git a/httphandler/handlerequests/v1/requestshandler.go b/httphandler/handlerequests/v1/requestshandler.go index 6233a30c..469932cc 100644 --- a/httphandler/handlerequests/v1/requestshandler.go +++ b/httphandler/handlerequests/v1/requestshandler.go @@ -6,10 +6,12 @@ import ( utilsapisv1 "github.com/armosec/opa-utils/httpserver/apis/v1" utilsmetav1 "github.com/armosec/opa-utils/httpserver/meta/v1" + "github.com/dwertent/go-logger/helpers" + "github.com/gorilla/schema" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" + logger "github.com/dwertent/go-logger" + "github.com/google/uuid" ) diff --git a/httphandler/handlerequests/v1/requestshandlerutils.go b/httphandler/handlerequests/v1/requestshandlerutils.go index 1db56b0b..d7f75915 100644 --- a/httphandler/handlerequests/v1/requestshandlerutils.go +++ b/httphandler/handlerequests/v1/requestshandlerutils.go @@ -9,13 +9,13 @@ import ( "github.com/armosec/kubescape/v2/core/cautils" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" "github.com/armosec/kubescape/v2/core/core" utilsapisv1 "github.com/armosec/opa-utils/httpserver/apis/v1" utilsmetav1 "github.com/armosec/opa-utils/httpserver/meta/v1" reporthandlingv2 "github.com/armosec/opa-utils/reporthandling/v2" "github.com/armosec/utils-go/boolutils" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) // executeScan execute the scan request passed in the channel diff --git a/httphandler/listener/helpers.go b/httphandler/listener/helpers.go index 1d1669c0..00e59ff0 100644 --- a/httphandler/listener/helpers.go +++ b/httphandler/listener/helpers.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" ) // RecoverFunc recover function for http requests diff --git a/httphandler/listener/init.go b/httphandler/listener/init.go index 071a8ac7..0cea1e08 100644 --- a/httphandler/listener/init.go +++ b/httphandler/listener/init.go @@ -4,8 +4,8 @@ import ( "os" "github.com/armosec/kubescape/v2/core/cautils/getter" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/zaplogger" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/zaplogger" ) func initialize() error { diff --git a/httphandler/listener/setup.go b/httphandler/listener/setup.go index 2522da9a..cad7f689 100644 --- a/httphandler/listener/setup.go +++ b/httphandler/listener/setup.go @@ -7,9 +7,10 @@ import ( "os" "github.com/armosec/kubescape/v2/core/cautils" - "github.com/armosec/kubescape/v2/core/cautils/logger" - "github.com/armosec/kubescape/v2/core/cautils/logger/helpers" handlerequestsv1 "github.com/armosec/kubescape/v2/httphandler/handlerequests/v1" + logger "github.com/dwertent/go-logger" + "github.com/dwertent/go-logger/helpers" + "github.com/gorilla/mux" ) diff --git a/httphandler/main.go b/httphandler/main.go index d7f35d0b..08035f2a 100644 --- a/httphandler/main.go +++ b/httphandler/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/armosec/kubescape/v2/core/cautils/logger" "github.com/armosec/kubescape/v2/httphandler/listener" + logger "github.com/dwertent/go-logger" ) func main() { diff --git a/main.go b/main.go index e1298412..66b2225f 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/armosec/kubescape/v2/cmd" - "github.com/armosec/kubescape/v2/core/cautils/logger" + logger "github.com/dwertent/go-logger" ) func main() {