diff --git a/internal/formats/spdx22json/to_format_model.go b/internal/formats/spdx22json/to_format_model.go index 60ffb5a96..905cba5b5 100644 --- a/internal/formats/spdx22json/to_format_model.go +++ b/internal/formats/spdx22json/to_format_model.go @@ -129,7 +129,7 @@ func toPackages(catalog *pkg.Catalog, relationships []artifact.Relationship) []m func fileIDsForPackage(packageSpdxID string, relationships []artifact.Relationship) (fileIDs []string) { for _, relationship := range relationships { - if relationship.Type != artifact.PackageOfRelationship { + if relationship.Type != artifact.ContainsRelationship { continue } @@ -252,8 +252,8 @@ func toRelationships(relationships []artifact.Relationship) (result []model.Rela func lookupRelationship(ty artifact.RelationshipType) (bool, model.RelationshipType, string) { switch ty { - case artifact.PackageOfRelationship: - return true, model.PackageOfRelationship, "" + case artifact.ContainsRelationship: + return true, model.ContainsRelationship, "" case artifact.OwnershipByFileOverlapRelationship: return true, model.OtherRelationship, fmt.Sprintf("%s: indicates that the parent package claims ownership of a child package since the parent metadata indicates overlap with a location that a cataloger found the child package by", ty) } diff --git a/syft/artifact/relationship.go b/syft/artifact/relationship.go index a46c85b1f..921e475a1 100644 --- a/syft/artifact/relationship.go +++ b/syft/artifact/relationship.go @@ -7,9 +7,8 @@ const ( // has been completed. OwnershipByFileOverlapRelationship RelationshipType = "ownership-by-file-overlap" - // PackageOfRelationship (supports any-to-package linkages) is a proxy for the SPDX 2.2 PACKAGE_OF - // relationship which is defined as: "to be used when artifact X is used as a package as part of package Y" - PackageOfRelationship RelationshipType = "package-of" + // ContainsRelationship (supports any-to-any linkages) is a proxy for the SPDX 2.2 CONTAINS relationship. + ContainsRelationship RelationshipType = "contains" ) type RelationshipType string diff --git a/syft/pkg/cataloger/catalog.go b/syft/pkg/cataloger/catalog.go index bd14bb328..a78784056 100644 --- a/syft/pkg/cataloger/catalog.go +++ b/syft/pkg/cataloger/catalog.go @@ -119,9 +119,9 @@ func packageFileOwnershipRelationships(p pkg.Package, resolver source.FilePathRe for _, l := range locations { relationships = append(relationships, artifact.Relationship{ - From: l.Coordinates, - To: p, - Type: artifact.PackageOfRelationship, + From: p, + To: l.Coordinates, + Type: artifact.ContainsRelationship, }) } }