Cease appending subpackages to document's packages array, fix typo in…

… tag for struct Signed-off-by: Amith K K <amithkumaran@gmail.com>
opensbom-generator · Oct 3, 2021 · b4a9852 · b4a9852
1 parent 5096d75
commit b4a9852
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/pkg/format/format.go b/pkg/format/format.go
@@ -127,7 +127,6 @@ func (f *Format) annotateDocumentWithPackages(modules []models.Module, document
 			if err != nil {
 				return fmt.Errorf("failed to convert submodule %w", err)
 			}
-			document.Packages = append(document.Packages, subPkg)
 			document.Relationships = append(document.Relationships, models.Relationship{
 				SPDXElementID:      pkg.SPDXID,
 				RelatedSPDXElement: subPkg.SPDXID,

diff --git a/pkg/models/spdx.go b/pkg/models/spdx.go
@@ -33,7 +33,7 @@ type Document struct {
 	DocumentNamespace       string                   `json:"namespace,omitempty"`
 	CreationInfo            CreationInfo             `json:"creationInfo,omitempty"`
 	Packages                []Package                `json:"packages,omitempty"`
-	Relationships           []Relationship           `json:"relatioships,omitempty"`
+	Relationships           []Relationship           `json:"relationships,omitempty"`
 	ExtractedLicensingInfos []ExtractedLicensingInfo `json:"hasExtractedLicensingInfos,omitempty"`
 }