Fix breaks from recent changes (#569)

Author: eranturgeman

utils/formats/snapshotconvertor/githubsnapshotconvertor.go

@@ -16,7 +16,7 @@ const (
 	indirectDependency = "indirect"
 )
 
-func CreateGithubSnapshotFromSbom(bom *cyclonedx.BOM, snapshotVersion int, scanTime time.Time, jobId, jobCorrelator, commitSha, gitRef, detectorName, detectorVersion, detectorUrl string) (*vcsclient.SbomSnapshot, error) {
+func CreateGithubSnapshotFromSbom(bom *cdxutils.FullBOM, snapshotVersion int, scanTime time.Time, jobId, jobCorrelator, commitSha, gitRef, detectorName, detectorVersion, detectorUrl string) (*vcsclient.SbomSnapshot, error) {
 	if bom == nil {
 		return nil, errors.New("received cycloneDX is nil")
 	}
@@ -69,7 +69,7 @@ func CreateGithubSnapshotFromSbom(bom *cyclonedx.BOM, snapshotVersion int, scanT
 		resolvedDependencies := make(map[string]*vcsclient.ResolvedDependency)
 		for _, component := range componentsList {
 			var relationship string
-			bomRelationship := cdxutils.GetComponentRelation(bom, component.BOMRef, false)
+			bomRelationship := cdxutils.GetComponentRelation(&bom.BOM, component.BOMRef, false)
 			switch bomRelationship {
 			case cdxutils.RootRelation:
 				continue

utils/formats/snapshotconvertor/githubsnapshotconvertor_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/CycloneDX/cyclonedx-go"
 	"github.com/jfrog/froggit-go/vcsclient"
+	"github.com/jfrog/jfrog-cli-security/utils/formats/cdxutils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -226,7 +227,7 @@ func TestCreateGithubSnapshotFromSbom(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-			var bom *cyclonedx.BOM
+			var bom *cdxutils.FullBOM
 			if test.components == nil {
 				bom = nil
 			} else {
@@ -264,15 +265,16 @@ func TestCreateGithubSnapshotFromSbom(t *testing.T) {
 }
 
 // createTestBOM creates a test BOM with the specified components and dependencies
-func createTestBOM(components []cyclonedx.Component, dependencies []cyclonedx.Dependency) *cyclonedx.BOM {
-	bom := cyclonedx.NewBOM()
+func createTestBOM(components []cyclonedx.Component, dependencies []cyclonedx.Dependency) *cdxutils.FullBOM {
+	innerBom := cyclonedx.NewBOM()
 	if len(components) > 0 {
-		bom.Components = &components
+		innerBom.Components = &components
 	}
 	if len(dependencies) > 0 {
-		bom.Dependencies = &dependencies
+		innerBom.Dependencies = &dependencies
 	}
-	return bom
+	fullBom := cdxutils.FullBOM{BOM: *innerBom}
+	return &fullBom
 }
 
 // createTestComponent creates a test component with evidence occurrences