mirror of
https://github.com/aquasecurity/kube-bench.git
synced 2024-12-19 05:08:07 +00:00
Merge pull request #218 from yoavAqua/bugfix-log-warnings-instead-of-print
Bugfix: Logging warning instead of printing
This commit is contained in:
commit
da09e6513a
18
cmd/util.go
18
cmd/util.go
@ -33,20 +33,6 @@ func init() {
|
|||||||
statFunc = os.Stat
|
statFunc = os.Stat
|
||||||
}
|
}
|
||||||
|
|
||||||
func printlnWarn(msg string) {
|
|
||||||
fmt.Fprintf(os.Stderr, "[%s] %s\n",
|
|
||||||
colors[check.WARN].Sprintf("%s", check.WARN),
|
|
||||||
msg,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func sprintlnWarn(msg string) string {
|
|
||||||
return fmt.Sprintf("[%s] %s",
|
|
||||||
colors[check.WARN].Sprintf("%s", check.WARN),
|
|
||||||
msg,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func exitWithError(err error) {
|
func exitWithError(err error) {
|
||||||
fmt.Fprintf(os.Stderr, "\n%v\n", err)
|
fmt.Fprintf(os.Stderr, "\n%v\n", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@ -336,7 +322,7 @@ func getVersionFromKubectlOutput(s string) string {
|
|||||||
serverVersionRe := regexp.MustCompile(`Server Version: v(\d+.\d+)`)
|
serverVersionRe := regexp.MustCompile(`Server Version: v(\d+.\d+)`)
|
||||||
subs := serverVersionRe.FindStringSubmatch(s)
|
subs := serverVersionRe.FindStringSubmatch(s)
|
||||||
if len(subs) < 2 {
|
if len(subs) < 2 {
|
||||||
printlnWarn(fmt.Sprintf("Unable to get kubectl version, using default version: %s", defaultKubeVersion))
|
glog.V(1).Info(fmt.Sprintf("Unable to get Kubernetes version from kubectl, using default version: %s", defaultKubeVersion))
|
||||||
return defaultKubeVersion
|
return defaultKubeVersion
|
||||||
}
|
}
|
||||||
return subs[1]
|
return subs[1]
|
||||||
@ -346,7 +332,7 @@ func getVersionFromKubeletOutput(s string) string {
|
|||||||
serverVersionRe := regexp.MustCompile(`Kubernetes v(\d+.\d+)`)
|
serverVersionRe := regexp.MustCompile(`Kubernetes v(\d+.\d+)`)
|
||||||
subs := serverVersionRe.FindStringSubmatch(s)
|
subs := serverVersionRe.FindStringSubmatch(s)
|
||||||
if len(subs) < 2 {
|
if len(subs) < 2 {
|
||||||
printlnWarn(fmt.Sprintf("Unable to get kubelet version, using default version: %s", defaultKubeVersion))
|
glog.V(1).Info(fmt.Sprintf("Unable to get Kubernetes version from kubelet, using default version: %s", defaultKubeVersion))
|
||||||
return defaultKubeVersion
|
return defaultKubeVersion
|
||||||
}
|
}
|
||||||
return subs[1]
|
return subs[1]
|
||||||
|
Loading…
Reference in New Issue
Block a user