From f7be2313334727e13215887c654fc6a960fe9402 Mon Sep 17 00:00:00 2001 From: Octogonapus Date: Tue, 27 Feb 2024 23:17:57 -0500 Subject: [PATCH] Fix cyclonedx marshal test from rebase --- pkg/sbom/cyclonedx/marshal_test.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/sbom/cyclonedx/marshal_test.go b/pkg/sbom/cyclonedx/marshal_test.go index 55dfd284cb09..6e6c21c54111 100644 --- a/pkg/sbom/cyclonedx/marshal_test.go +++ b/pkg/sbom/cyclonedx/marshal_test.go @@ -2,10 +2,11 @@ package cyclonedx_test import ( "context" - "github.com/package-url/packageurl-go" "testing" "time" + "github.com/package-url/packageurl-go" + cdx "github.com/CycloneDX/cyclonedx-go" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" v1 "github.com/google/go-containerregistry/pkg/v1" @@ -2151,11 +2152,14 @@ func TestMarshaler_Marshal(t *testing.T) { Version: 1, Metadata: &cdx.Metadata{ Timestamp: "2021-08-25T12:20:30+00:00", - Tools: &[]cdx.Tool{ - { - Name: "trivy", - Vendor: "aquasecurity", - Version: "dev", + Tools: &cdx.ToolsChoice{ + Components: &[]cdx.Component{ + { + Type: cdx.ComponentTypeApplication, + Name: "trivy", + Group: "aquasecurity", + Version: "dev", + }, }, }, Component: &cdx.Component{