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

fix: errorlog future-vuls trivy-to-vuls (#1739)

Browse Source 
Co-authored-by: 和田皓翔 <wadahiroka@192.168.0.6>
This commit is contained in:
hiroka-wada
2023-09-22 17:25:57 +09:00
committed by GitHub
parent f6509a5376
commit dea9ed7709
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/future-vuls/pkg/fvuls/fvuls.go
View File

@@ -42,7 +42,7 @@ func NewClient(token string, proxy string) *Client {
func (f Client) UploadToFvuls(serverUUID string, groupID int64, tags []string, scanResultJSON []byte) error {
var scanResult models.ScanResult
if err := json.Unmarshal(scanResultJSON, &scanResult); err != nil {
fmt.Printf("failed to parse json. err: %v\nPerhaps scan has failed. Please check following scan results.\nResult: %s", err, fmt.Sprintf("%s", scanResultJSON))
fmt.Printf("failed to parse json. err: %v\nPerhaps scan has failed. Please check the scan results above or run trivy without pipes.\n", err)
return err
}
scanResult.ServerUUID = serverUUID

3
contrib/trivy/parser/parser.go
View File

@@ -1,8 +1,8 @@
// Package parser ...
package parser
import (
"encoding/json"
"fmt"
v2 "github.com/future-architect/vuls/contrib/trivy/parser/v2"
"github.com/future-architect/vuls/models"
@@ -23,7 +23,6 @@ type Report struct {
func NewParser(vulnJSON []byte) (Parser, error) {
r := Report{}
if err := json.Unmarshal(vulnJSON, &r); err != nil {
fmt.Printf("%s", fmt.Sprintf("%s", vulnJSON))
return nil, xerrors.Errorf("Failed to parse JSON. Please use the latest version of trivy, trivy-to-vuls and future-vuls")
}
switch r.SchemaVersion {