Add support for package supplier in SBOM

LaurentGoderre · LaurentGoderre · commit 5a86c34c5a3e · 2023-12-08T14:55:47.000-05:00
diff --git a/scripts/template-helper-functions.jq b/scripts/template-helper-functions.jq
@@ -25,12 +25,9 @@ def sbom:
 						referenceLocator: ("pkg:generic/" + .name + "@" + .version + "?" + (.params | [to_entries[] | .key + "=" + .value] | join("\u0026")))
 					}
 				],
-				licenseDeclared: (if .licenses | length > 0 then
-					(.licenses | join(" AND "))
-				else
-					"NOASSERTION"
-				end)
 			}
+			+ if .licenses then { licenseDeclared: (.licenses | join(" AND ")) } else {} end
+			+ if .supplier then { supplier: .supplier } else {} end
 		]
 	}
 ;

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,9 @@ def sbom:`
`25`	`25`	`referenceLocator: ("pkg:generic/" + .name + "@" + .version + "?" + (.params \| [to_entries[] \| .key + "=" + .value] \| join("\u0026")))`
`26`	`26`	`}`
`27`	`27`	`],`
`28`		`- licenseDeclared: (if .licenses \| length > 0 then`
`29`		`- (.licenses \| join(" AND "))`
`30`		`- else`
`31`		`- "NOASSERTION"`
`32`		`- end)`
`33`	`28`	`}`
	`29`	`+ + if .licenses then { licenseDeclared: (.licenses \| join(" AND ")) } else {} end`
	`30`	`+ + if .supplier then { supplier: .supplier } else {} end`
`34`	`31`	`]`
`35`	`32`	`}`
`36`	`33`	`;`