Merge pull request #171 from luismoriguerra/feat/download-url

feat(composer): update download url for Cargo and Composer modules
opensbom-generator · Jun 25, 2021 · 82f2c50 · 82f2c50
2 parents 0e3b862 + 6346380
commit 82f2c50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/internal/modules/cargo/modules.go b/internal/modules/cargo/modules.go
@@ -79,10 +79,11 @@ func convertCargoPackageToModule(dep CargoPackage) models.Module {
 	localPath := convertToLocalPath(dep.ManifestPath)
 
 	module := models.Module{
-		Version:    dep.Version,
-		Name:       dep.Name,
-		Root:       false,
-		PackageURL: formatPackageURL(dep),
+		Version:                 dep.Version,
+		Name:                    dep.Name,
+		Root:                    false,
+		PackageURL:              formatPackageURL(dep),
+		PackageDownloadLocation: dep.Repository,
 		CheckSum: &models.CheckSum{
 			Algorithm: models.HashAlgoSHA1,
 			Value:     readCheckSum(dep.ID),

diff --git a/internal/modules/composer/modules.go b/internal/modules/composer/modules.go
@@ -198,10 +198,11 @@ func (m *composer) getModulesFromComposerLockFile(path string) ([]models.Module,
 func convertLockPackageToModule(dep ComposerLockPackage) models.Module {
 
 	module := models.Module{
-		Version:    normalizePackageVersion(dep.Version),
-		Name:       getName(dep.Name),
-		Root:       false,
-		PackageURL: genUrlFromComposerPackage(dep),
+		Version:                 normalizePackageVersion(dep.Version),
+		Name:                    getName(dep.Name),
+		Root:                    false,
+		PackageURL:              genUrlFromComposerPackage(dep),
+		PackageDownloadLocation: dep.Source.URL,
 		CheckSum: &models.CheckSum{
 			Algorithm: models.HashAlgoSHA1,
 			Value:     getCheckSumValue(dep),