From dea9ed77092564a4e71355e6616c0b9a6bd880ff Mon Sep 17 00:00:00 2001 From: hiroka-wada <47963288+wadda0714@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:25:57 +0900 Subject: [PATCH] fix: errorlog future-vuls trivy-to-vuls (#1739) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 和田皓翔 --- contrib/future-vuls/pkg/fvuls/fvuls.go | 2 +- contrib/trivy/parser/parser.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/future-vuls/pkg/fvuls/fvuls.go b/contrib/future-vuls/pkg/fvuls/fvuls.go index 0d133bc1..8be522e0 100644 --- a/contrib/future-vuls/pkg/fvuls/fvuls.go +++ b/contrib/future-vuls/pkg/fvuls/fvuls.go @@ -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 diff --git a/contrib/trivy/parser/parser.go b/contrib/trivy/parser/parser.go index e6936b5c..2fd37d03 100644 --- a/contrib/trivy/parser/parser.go +++ b/contrib/trivy/parser/parser.go @@ -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 {