arno/kube-bench
1
0
Fork 0
mirror of https://github.com/aquasecurity/kube-bench.git synced 2024-12-30 02:18:07 +00:00
Code Issues Releases Wiki Activity

Refactor: remove ContinueWithError (#630)

Browse Source 
* Update util.go

Remove Continue with error function

* Update cmd/util.go

Co-authored-by: Liz Rice <liz@lizrice.com>

* Update util.go

* Update util.go

Remove unnecessary ')'

* Update util.go

removed fmt.Fprintf(os.Stderr, "%s: %s", cmd.Args, err) since it wasn't suppose to print.

* Update util.go

* Update .travis.yml

option --no-ri and --no-doc are deprecated we have to use --no-document instead.
https://github.com/rubygems/heroku-buildpack-bundler2/pull/1#issuecomment-451654992

Co-authored-by: Liz Rice <liz@lizrice.com>
This commit is contained in:
yoavrotems 2020-08-10 12:12:57 +03:00 committed by GitHub
parent 6684979741
commit 4b9453bb83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/util.go
View File

@ -48,18 +48,6 @@ func exitWithError(err error) {
os.Exit(1) os.Exit(1)
} }
func continueWithError(err error, msg string) string {
if err != nil {
glog.V(2).Info(err)
}
if msg != "" {
fmt.Fprintf(os.Stderr, "%s\n", msg)
}
return ""
}
func cleanIDs(list string) map[string]bool { func cleanIDs(list string) map[string]bool {
list = strings.Trim(list, ",") list = strings.Trim(list, ",")
ids := strings.Split(list, ",") ids := strings.Split(list, ",")
@ -82,7 +70,7 @@ func ps(proc string) string {
cmd := exec.Command("/bin/ps", "-C", proc, "-o", "cmd", "--no-headers") cmd := exec.Command("/bin/ps", "-C", proc, "-o", "cmd", "--no-headers")
out, err := cmd.Output() out, err := cmd.Output()
if err != nil { if err != nil {
continueWithError(fmt.Errorf("%s: %s", cmd.Args, err), "") glog.V(2).Info(fmt.Errorf("%s: %s", cmd.Args, err))
} }
glog.V(2).Info(fmt.Sprintf("ps - returning: %q", string(out))) glog.V(2).Info(fmt.Sprintf("ps - returning: %q", string(out)))
@ -325,7 +313,7 @@ func getKubeVersionFromKubectl() string {
cmd := exec.Command("kubectl", "version", "--short") cmd := exec.Command("kubectl", "version", "--short")
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
continueWithError(fmt.Errorf("%s", out), "") glog.V(2).Info(err)
} }
return getVersionFromKubectlOutput(string(out)) return getVersionFromKubectlOutput(string(out))
@ -336,7 +324,7 @@ func getKubeVersionFromKubelet() string {
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
continueWithError(fmt.Errorf("%s", out), "") glog.V(2).Info(err)
} }
return getVersionFromKubeletOutput(string(out)) return getVersionFromKubeletOutput(string(out))