diff --git a/clihandler/clidownload.go b/clihandler/clidownload.go index 74778552..35c1fdf9 100644 --- a/clihandler/clidownload.go +++ b/clihandler/clidownload.go @@ -8,6 +8,8 @@ import ( "github.com/armosec/armoapi-go/armotypes" "github.com/armosec/kubescape/cautils" "github.com/armosec/kubescape/cautils/getter" + "github.com/armosec/kubescape/cautils/logger" + "github.com/armosec/kubescape/cautils/logger/helpers" ) var downloadFunc = map[string]func(*cautils.DownloadInfo) error{ @@ -67,7 +69,7 @@ func downloadArtifacts(downloadInfo *cautils.DownloadInfo) error { } for artifact := range artifacts { if err := downloadArtifact(&cautils.DownloadInfo{Target: artifact, Path: downloadInfo.Path, FileName: fmt.Sprintf("%s.json", artifact)}, artifacts); err != nil { - fmt.Printf("error downloading %s, error: %s", artifact, err) + logger.L().Error("error downloading", helpers.String("artifact", artifact), helpers.Error(err)) } } return nil @@ -88,7 +90,7 @@ func downloadConfigInputs(downloadInfo *cautils.DownloadInfo) error { if err != nil { return err } - fmt.Printf("'%s' downloaded successfully and saved at: '%s'\n", downloadInfo.Target, filepath.Join(downloadInfo.Path, downloadInfo.FileName)) + logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("path", filepath.Join(downloadInfo.Path, downloadInfo.FileName))) return nil } @@ -111,7 +113,7 @@ func downloadExceptions(downloadInfo *cautils.DownloadInfo) error { if err != nil { return err } - fmt.Printf("'%s' downloaded successfully and saved at: '%s'\n", downloadInfo.Target, filepath.Join(downloadInfo.Path, downloadInfo.FileName)) + logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("path", filepath.Join(downloadInfo.Path, downloadInfo.FileName))) return nil } @@ -131,7 +133,7 @@ func downloadFramework(downloadInfo *cautils.DownloadInfo) error { if err != nil { return err } - fmt.Printf("'%s': '%s' downloaded successfully and saved at: '%s'\n", downloadInfo.Target, fw.Name, filepath.Join(downloadInfo.Path, (strings.ToLower(fw.Name)+".json"))) + logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("name", fw.Name), helpers.String("path", filepath.Join(downloadInfo.Path, downloadInfo.FileName))) } // return fmt.Errorf("missing framework name") } else { @@ -146,7 +148,7 @@ func downloadFramework(downloadInfo *cautils.DownloadInfo) error { if err != nil { return err } - fmt.Printf("'%s' downloaded successfully and saved at: '%s'\n", downloadInfo.Target, filepath.Join(downloadInfo.Path, downloadInfo.FileName)) + logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("name", framework.Name), helpers.String("path", filepath.Join(downloadInfo.Path, downloadInfo.FileName))) } return nil } @@ -171,6 +173,6 @@ func downloadControl(downloadInfo *cautils.DownloadInfo) error { if err != nil { return err } - fmt.Printf("'%s' downloaded successfully and saved at: '%s'\n", downloadInfo.Target, filepath.Join(downloadInfo.Path, downloadInfo.FileName)) + logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("name", downloadInfo.Name), helpers.String("path", filepath.Join(downloadInfo.Path, downloadInfo.FileName))) return nil } diff --git a/clihandler/cliview.go b/clihandler/cliview.go index bd76ecb7..116ea87e 100644 --- a/clihandler/cliview.go +++ b/clihandler/cliview.go @@ -1,9 +1,12 @@ package clihandler -import "fmt" +import ( + "fmt" + "os" +) func CliView() error { tenant := getTenantConfig("", "", getKubernetesApi()) // change k8sinterface - fmt.Printf("%s\n", tenant.GetConfigObj().Config()) + fmt.Fprintf(os.Stderr, "%s\n", tenant.GetConfigObj().Config()) return nil } diff --git a/clihandler/cmd/cluster_get.go b/clihandler/cmd/cluster_get.go index d135172b..ced5e239 100644 --- a/clihandler/cmd/cluster_get.go +++ b/clihandler/cmd/cluster_get.go @@ -36,8 +36,7 @@ var getCmd = &cobra.Command{ val, err := clusterConfig.GetValueByKeyFromConfigMap(key) if err != nil { if err.Error() == "value does not exist." { - fmt.Printf("Could net get value from configmap, reason: %s\n", err) - return nil + return fmt.Errorf("failed to get value from configmap, reason: %s", err.Error()) } return err } diff --git a/clihandler/cmd/local_get.go b/clihandler/cmd/local_get.go index d3bde11b..19203605 100644 --- a/clihandler/cmd/local_get.go +++ b/clihandler/cmd/local_get.go @@ -31,8 +31,7 @@ var localGetCmd = &cobra.Command{ val, err := cautils.GetValueFromConfigJson(key) if err != nil { if err.Error() == "value does not exist." { - fmt.Printf("Could net get value from: %s, reason: %s\n", cautils.ConfigFileFullPath(), err) - return nil + return fmt.Errorf("failed to get value from: %s, reason: %s", cautils.ConfigFileFullPath(), err.Error()) } return err } diff --git a/clihandler/initcli.go b/clihandler/initcli.go index 768b95da..784a1c9e 100644 --- a/clihandler/initcli.go +++ b/clihandler/initcli.go @@ -177,8 +177,8 @@ func askUserForHostSensor() bool { if ssss, err := os.Stdin.Stat(); err == nil { // fmt.Printf("Found stdin type: %s\n", ssss.Mode().Type()) if ssss.Mode().Type()&(fs.ModeDevice|fs.ModeCharDevice) > 0 { //has TTY - fmt.Printf("Would you like to scan K8s nodes? [y/N]. This is required to collect valuable data for certain controls\n") - fmt.Printf("Use --enable-host-scan flag to suppress this message\n") + fmt.Fprintf(os.Stderr, "Would you like to scan K8s nodes? [y/N]. This is required to collect valuable data for certain controls\n") + fmt.Fprintf(os.Stderr, "Use --enable-host-scan flag to suppress this message\n") var b []byte = make([]byte, 1) if n, err := os.Stdin.Read(b); err == nil { if n > 0 && len(b) > 0 && (b[0] == 'y' || b[0] == 'Y') { diff --git a/hostsensorutils/hostsensordeploy.go b/hostsensorutils/hostsensordeploy.go index 380737b1..ac32fe72 100644 --- a/hostsensorutils/hostsensordeploy.go +++ b/hostsensorutils/hostsensordeploy.go @@ -161,7 +161,7 @@ func (hsh *HostSensorHandler) populatePodNamesToNodeNames() { LabelSelector: fmt.Sprintf("name=%s", hsh.DaemonSet.Spec.Template.Labels["name"]), }) if err != nil { - fmt.Printf("Failed to watch over daemonset pods") + logger.L().Error("failed to watch over daemonset pods", helpers.Error(err)) } for eve := range watchRes.ResultChan() { pod, ok := eve.Object.(*corev1.Pod) diff --git a/hostsensorutils/hostsensorgetfrompod.go b/hostsensorutils/hostsensorgetfrompod.go index b68996fe..4ee7d168 100644 --- a/hostsensorutils/hostsensorgetfrompod.go +++ b/hostsensorutils/hostsensorgetfrompod.go @@ -8,6 +8,7 @@ import ( "github.com/armosec/k8s-interface/k8sinterface" "github.com/armosec/kubescape/cautils" "github.com/armosec/kubescape/cautils/logger" + "github.com/armosec/kubescape/cautils/logger/helpers" "github.com/armosec/opa-utils/objectsenvelopes/hostsensor" "sigs.k8s.io/yaml" ) @@ -72,7 +73,7 @@ func (hsh *HostSensorHandler) sendAllPodsHTTPGETRequest(path, requestKind string defer wg.Done() resBytes, err := hsh.HTTPGetToPod(podName, path) if err != nil { - fmt.Printf("In sendAllPodsHTTPGETRequest failed to get data '%s' from pod '%s': %v", path, podName, err) + logger.L().Error("failed to get data", helpers.String("path", path), helpers.String("pos", path), helpers.Error(err)) } else { resLock.Lock() defer resLock.Unlock() @@ -142,7 +143,7 @@ func (hsh *HostSensorHandler) GetKubeletConfigurations() ([]hostsensor.HostSenso for resIdx := range res { jsonBytes, err := yaml.YAMLToJSON(res[resIdx].Data) if err != nil { - fmt.Printf("In GetKubeletConfigurations failed to YAMLToJSON: %v;\n%v", err, res[resIdx]) + logger.L().Error("failed to convert kubelet configurations from yaml to json", helpers.Error(err)) continue } res[resIdx].SetData(jsonBytes) diff --git a/resourcehandler/repositoryscanner.go b/resourcehandler/repositoryscanner.go index f4f7901c..80f27b48 100644 --- a/resourcehandler/repositoryscanner.go +++ b/resourcehandler/repositoryscanner.go @@ -127,7 +127,6 @@ func (g *GitHubRepository) setTree() error { err = json.Unmarshal([]byte(body), &tree) if err != nil { return fmt.Errorf("failed to unmarshal response body from '%s', reason: %s", g.treeAPI(), err.Error()) - // fmt.Printf("failed to unmarshal response body from '%s', reason: %s", urlCommand, err.Error()) // return nil } g.tree = tree