From 8e3aeafb77b9d0da80e280e813052b82cd25bdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?= Date: Fri, 18 Aug 2023 09:50:54 -0600 Subject: [PATCH] Use go-vex merge implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adolfo García Veytia (Puerco) --- grype/vex/openvex/implementation.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/grype/vex/openvex/implementation.go b/grype/vex/openvex/implementation.go index 8285fbe643dc..d24635a93590 100644 --- a/grype/vex/openvex/implementation.go +++ b/grype/vex/openvex/implementation.go @@ -1,7 +1,6 @@ package openvex import ( - "context" "errors" "fmt" "os" @@ -12,7 +11,6 @@ import ( "github.com/anchore/packageurl-go" "github.com/anchore/syft/syft/source" openvex "github.com/openvex/go-vex/pkg/vex" - vexctl "github.com/openvex/vexctl/pkg/ctl" ) type Processor struct{} @@ -24,7 +22,7 @@ func New() *Processor { // ReadVexDocuments reads and merges VEX documents func (ovm *Processor) ReadVexDocuments(docs []string) (interface{}, error) { // Combine all VEX documents into a single VEX document - vexdata, err := vexctl.New().MergeFiles(context.Background(), &vexctl.MergeOptions{}, docs) + vexdata, err := openvex.MergeFiles(docs) if err != nil { return nil, fmt.Errorf("merging vex documents: %w", err) }