diff --git a/internal/formats/spdx22json/to_format_model.go b/internal/formats/spdx22json/to_format_model.go index c21fa5f3f..60ffb5a96 100644 --- a/internal/formats/spdx22json/to_format_model.go +++ b/internal/formats/spdx22json/to_format_model.go @@ -155,16 +155,7 @@ func toFiles(s sbom.SBOM) []model.File { digests = digestsForLocation } - // TODO: these could make it into the document - //var classifications []file.Classification - //if classificationsForLocation, exists := artifacts.FileClassifications[coordinates]; exists { - // classifications = classificationsForLocation - //} - // - //var contents string - //if contentsForLocation, exists := artifacts.FileContents[coordinates]; exists { - // contents = contentsForLocation - //} + // TODO: add file classifications (?) and content as a snippet var comment string if coordinates.FileSystemID != "" { diff --git a/syft/pkg/cataloger/catalog.go b/syft/pkg/cataloger/catalog.go index 9d7c1da65..bd14bb328 100644 --- a/syft/pkg/cataloger/catalog.go +++ b/syft/pkg/cataloger/catalog.go @@ -113,9 +113,9 @@ func packageFileOwnershipRelationships(p pkg.Package, resolver source.FilePathRe return nil, fmt.Errorf("unable to find path for path=%q: %w", path, err) } - //if len(locations) == 0 { + // if len(locations) == 0 { // // TODO: this is notable, we should at least log it(?)... however, ideally there is something in the SBOM about this - //} + // } for _, l := range locations { relationships = append(relationships, artifact.Relationship{ diff --git a/test/integration/package_ownership_relationship_test.go b/test/integration/package_ownership_relationship_test.go index 2166bd9b7..fbb0a3996 100644 --- a/test/integration/package_ownership_relationship_test.go +++ b/test/integration/package_ownership_relationship_test.go @@ -24,7 +24,7 @@ func TestPackageOwnershipRelationships(t *testing.T) { t.Run(test.fixture, func(t *testing.T) { sbom, _ := catalogFixtureImage(t, test.fixture) - p := syftjson.Format().Presenter(sbom) + p := syftjson.Format().Presenter(sbom, nil) if p == nil { t.Fatal("unable to get presenter") }