arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #607 from jzelinskie/gofmt

Browse Source 
enforce gofmt in travis
This commit is contained in:
Jimmy Zelinskie 2018-09-06 09:27:28 -04:00 committed by GitHub
commit 4fd86fd518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,7 +1,7 @@
language: go language: go
go: go:
- "1.10" - "1.11"
sudo: required sudo: required
@ -16,6 +16,7 @@ install:
- chmod +x $HOME/.local/bin/prototool - chmod +x $HOME/.local/bin/prototool
script: script:
- diff -u <(echo -n) <(gofmt -l -s $(go list -f '{{.Dir}}') | grep -v '/vendor/')
- prototool format -d api/v3/clairpb/clair.proto - prototool format -d api/v3/clairpb/clair.proto
- prototool lint api/v3/clairpb/clair.proto - prototool lint api/v3/clairpb/clair.proto
- go test $(glide novendor | grep -v contrib) - go test $(glide novendor | grep -v contrib)

4
ext/featurens/driver_test.go
View File

@ -45,8 +45,8 @@ func TestMultipleNamespaceDetector(t *testing.T) {
testData := []MultipleNamespaceTestData{ testData := []MultipleNamespaceTestData{
{ {
ExpectedNamespaces: []database.Namespace{ ExpectedNamespaces: []database.Namespace{
database.Namespace{Name: "debian:8", VersionFormat: "dpkg"}, {Name: "debian:8", VersionFormat: "dpkg"},
database.Namespace{Name: "alpine:v3.3", VersionFormat: "dpkg"}, {Name: "alpine:v3.3", VersionFormat: "dpkg"},
}, },
Files: tarutil.FilesMap{ Files: tarutil.FilesMap{
"etc/os-release": []byte(` "etc/os-release": []byte(`

2
ext/vulnsrc/rhel/rhel.go
View File

@ -372,7 +372,7 @@ func severity(def definition) database.Severity {
case "Critical": case "Critical":
return database.CriticalSeverity return database.CriticalSeverity
default: default:
log.Warning("could not determine vulnerability severity from: %s.", def.Title) log.Warningf("could not determine vulnerability severity from: %s.", def.Title)
return database.UnknownSeverity return database.UnknownSeverity
} }
} }

2
ext/vulnsrc/ubuntu/ubuntu.go
View File

@ -416,7 +416,7 @@ func SeverityFromPriority(priority string) database.Severity {
case "critical": case "critical":
return database.CriticalSeverity return database.CriticalSeverity
default: default:
log.Warning("could not determine a vulnerability severity from: %s", priority) log.Warningf("could not determine a vulnerability severity from: %s", priority)
return database.UnknownSeverity return database.UnknownSeverity
} }
} }