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

feat(report) : Differences between vulnerability patched items (#1157)

Browse Source 
* add plusDiff() and minusDiff()
* add plusDiff minusDiff test

Co-authored-by: Kota Kanbe <kotakanbe@gmail.com>
This commit is contained in:
kazuminn
2021-02-10 06:55:48 +09:00
committed by GitHub
parent 1c4f231572
commit 4c04acbd9e
11 changed files with 499 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
report/localfile.go
View File

@@ -31,13 +31,10 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) {
path := filepath.Join(w.CurrentDir, r.ReportFileName())
if c.Conf.FormatJSON {
var p string
if c.Conf.Diff {
p := path + ".json"
if c.Conf.DiffPlus || c.Conf.DiffMinus {
p = path + "_diff.json"
} else {
p = path + ".json"
}
var b []byte
if b, err = json.MarshalIndent(r, "", " "); err != nil {
return xerrors.Errorf("Failed to Marshal to JSON: %w", err)
@@ -48,13 +45,10 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) {
}
if c.Conf.FormatList {
var p string
if c.Conf.Diff {
p := path + "_short.txt"
if c.Conf.DiffPlus || c.Conf.DiffMinus {
p = path + "_short_diff.txt"
} else {
p = path + "_short.txt"
}
if err := writeFile(
p, []byte(formatList(r)), 0600); err != nil {
return xerrors.Errorf(
@@ -63,11 +57,9 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) {
}
if c.Conf.FormatFullText {
var p string
if c.Conf.Diff {
p := path + "_full.txt"
if c.Conf.DiffPlus || c.Conf.DiffMinus {
p = path + "_full_diff.txt"
} else {
p = path + "_full.txt"
}
if err := writeFile(
@@ -78,9 +70,9 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) {
}
if c.Conf.FormatCsvList {
p := path + "_short.csv"
if c.Conf.Diff {
p = path + "_short_diff.csv"
p := path + ".csv"
if c.Conf.DiffPlus || c.Conf.DiffMinus {
p = path + "_diff.csv"
}
if err := formatCsvList(r, p); err != nil {
return xerrors.Errorf("Failed to write CSV: %s, %w", p, err)