Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lint (#700)

Browse Source 
* adjust GNUmakefile by using ... wildcard

go command excludes vendored packages from ... wildcard Go1.9 or later

* fix vet warnings

* fmt
This commit is contained in:
Masayuki Matsuki
2018-08-26 21:22:37 +09:00
committed by Kota Kanbe
parent ea800e04bc
commit d785fc2a54
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
GNUmakefile
View File

@@ -15,7 +15,7 @@
clean
SRCS = $(shell git ls-files '*.go')
PKGS = ./. ./cache ./commands ./config ./models ./oval ./report ./scan ./util
PKGS = $(shell go list ./...)
VERSION := $(shell git describe --tags --abbrev=0)
REVISION := $(shell git rev-parse --short HEAD)
LDFLAGS := -X 'main.version=$(VERSION)' \
@@ -40,11 +40,11 @@ install: main.go dep pretest
lint:
@ go get -v github.com/golang/lint/golint
$(foreach file,$(SRCS),golint $(file) || exit;)
golint $(PKGS)
vet:
# @-go get -v golang.org/x/tools/cmd/vet
echo $(PKGS) | xargs go vet || exit;
go vet ./... || exit;
fmt:
gofmt -s -w $(SRCS)
@@ -58,7 +58,7 @@ test: pretest
go install
echo $(PKGS) | xargs go test -cover -v || exit;
unused :
unused:
$(foreach pkg,$(PKGS),unused $(pkg);)
cov:

6
oval/redhat.go
View File

@@ -94,8 +94,8 @@ var kernelRelatedPackNames = map[string]bool{
"kernel-tools": true,
"kernel-tools-libs": true,
"kernel-tools-libs-devel": true,
"perf": true,
"python-perf": true,
"perf": true,
"python-perf": true,
}
func (o RedHatBase) update(r *models.ScanResult, defPacks defPacks) {
@@ -114,7 +114,7 @@ func (o RedHatBase) update(r *models.ScanResult, defPacks defPacks) {
cveContents := vinfo.CveContents
if v, ok := vinfo.CveContents[ctype]; ok {
if v.LastModified.After(ovalContent.LastModified) {
util.Log.Debugf("%s, OvalID: %s ignroed: ",
util.Log.Debugf("%s, OvalID: %d ignroed: ",
cve.CveID, defPacks.def.ID)
continue
} else {

2
oval/util.go
View File

@@ -68,7 +68,7 @@ func (e *ovalResult) upsert(def ovalmodels.Definition, packName string, notFixed
}
}
e.entries = append(e.entries, defPacks{
def: def,
def: def,
actuallyAffectedPackNames: map[string]bool{packName: notFixedYet},
})

2
scan/debian.go
View File

@@ -760,7 +760,7 @@ func (o *debian) getCveIDsFromChangelog(
// Only logging the error.
o.log.Warnf("Failed to find the version in changelog: %s-%s", name, ver)
o.log.Debugf("Changelog of : %s-%s", name, ver, changelog)
o.log.Debugf("Changelog of : %s-%s-%s", name, ver, changelog)
// If the version is not in changelog, return entire changelog to put into cache
pack := o.Packages[name]

2
scan/freebsd.go
View File

@@ -279,7 +279,7 @@ func (o *bsd) parsePkgVersion(stdout string) models.Packages {
NewVersion: candidate,
}
case ">":
o.log.Warn("The installed version of the %s is newer than the current version. *This situation can arise with an out of date index file, or when testing new ports.*", name)
o.log.Warnf("The installed version of the %s is newer than the current version. *This situation can arise with an out of date index file, or when testing new ports.*", name)
packs[name] = models.Package{
Name: name,
Version: ver,

10
scan/redhat.go
View File

@@ -57,7 +57,7 @@ func detectRedhat(c config.ServerInfo) (itsMe bool, red osTypeInterface) {
if r := exec(c, "ls /etc/fedora-release", noSudo); r.isSuccess() {
red.setDistro(config.Fedora, "unknown")
util.Log.Warn("Fedora not tested yet: %s", r)
util.Log.Warnf("Fedora not tested yet: %s", r)
return true, red
}
@@ -68,7 +68,7 @@ func detectRedhat(c config.ServerInfo) (itsMe bool, red osTypeInterface) {
re := regexp.MustCompile(`(.*) release (\d[\d\.]*)`)
result := re.FindStringSubmatch(strings.TrimSpace(r.Stdout))
if len(result) != 3 {
util.Log.Warn("Failed to parse Oracle Linux version: %s", r)
util.Log.Warnf("Failed to parse Oracle Linux version: %s", r)
return true, red
}
@@ -85,7 +85,7 @@ func detectRedhat(c config.ServerInfo) (itsMe bool, red osTypeInterface) {
re := regexp.MustCompile(`(.*) release (\d[\d\.]*)`)
result := re.FindStringSubmatch(strings.TrimSpace(r.Stdout))
if len(result) != 3 {
util.Log.Warn("Failed to parse CentOS version: %s", r)
util.Log.Warnf("Failed to parse CentOS version: %s", r)
return true, red
}
@@ -95,7 +95,7 @@ func detectRedhat(c config.ServerInfo) (itsMe bool, red osTypeInterface) {
red.setDistro(config.CentOS, release)
return true, red
default:
util.Log.Warn("Failed to parse CentOS: %s", r)
util.Log.Warnf("Failed to parse CentOS: %s", r)
}
}
}
@@ -109,7 +109,7 @@ func detectRedhat(c config.ServerInfo) (itsMe bool, red osTypeInterface) {
re := regexp.MustCompile(`(.*) release (\d[\d\.]*)`)
result := re.FindStringSubmatch(strings.TrimSpace(r.Stdout))
if len(result) != 3 {
util.Log.Warn("Failed to parse RedHat/CentOS version: %s", r)
util.Log.Warnf("Failed to parse RedHat/CentOS version: %s", r)
return true, red
}

6
scan/suse.go
View File

@@ -67,7 +67,7 @@ func detectSUSE(c config.ServerInfo) (bool, osTypeInterface) {
return true, s
}
}
util.Log.Warn("Failed to parse SUSE Linux version: %s", r)
util.Log.Warnf("Failed to parse SUSE Linux version: %s", r)
return true, s
}
}
@@ -85,14 +85,14 @@ func (o *suse) parseOSRelease(content string) (name string, ver string) {
} else if strings.Contains(content, `NAME="SLES_SAP"`) {
name = config.SUSEEnterpriseServer
} else {
util.Log.Warn("Failed to parse SUSE edition: %s", content)
util.Log.Warnf("Failed to parse SUSE edition: %s", content)
return "unknown", "unknown"
}
re := regexp.MustCompile(`VERSION_ID=\"(.+)\"`)
result := re.FindStringSubmatch(strings.TrimSpace(content))
if len(result) != 2 {
util.Log.Warn("Failed to parse SUSE Linux version: %s", content)
util.Log.Warnf("Failed to parse SUSE Linux version: %s", content)
return "unknown", "unknown"
}
return name, result[1]

2
scan/utils.go
View File

@@ -46,7 +46,7 @@ func isRunningKernel(pack models.Package, family string, kernel models.Kernel) (
return false, false
default:
util.Log.Warnf("Reboot required is not implemented yet: %s, %s", family, kernel)
util.Log.Warnf("Reboot required is not implemented yet: %s, %v", family, kernel)
}
return false, false
}

2
util/util.go
View File

@@ -34,7 +34,7 @@ func GenWorkers(num int) chan<- func() {
defer func() {
if p := recover(); p != nil {
log := NewCustomLogger(config.ServerInfo{})
log.Debugf("Panic: %s")
log.Debugf("Panic: %s", p)
}
}()
for f := range tasks {