admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #17370 from Homebrew/sbom_all_bottles_fix

Browse Source
This commit is contained in:
Carlo Cabrera 2024-05-27 00:00:14 +08:00 committed by GitHub
commit a91c758086
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/sbom.rb
View File

@ -293,9 +293,13 @@ class SBOM
] + runtime_dependency_declaration + compiler_declarations + bottle ] + runtime_dependency_declaration + compiler_declarations + bottle
end end
sig { returns(T::Array[T::Hash[Symbol, T.any(T::Boolean, String, T::Array[T::Hash[Symbol, String]])]]) } sig {
def full_spdx_runtime_dependencies params(bottling: T::Boolean).returns(T::Array[T::Hash[Symbol,
return [] unless @runtime_dependencies.present? T.any(T::Boolean, String,
T::Array[T::Hash[Symbol, String]])]])
}
def full_spdx_runtime_dependencies(bottling:)
return [] if @runtime_dependencies.blank?
@runtime_dependencies.compact.filter_map do |dependency| @runtime_dependencies.compact.filter_map do |dependency|
next unless dependency.present? next unless dependency.present?
@ -306,7 +310,7 @@ class SBOM
# Only set bottle URL if the dependency is the same version as the formula/bottle. # Only set bottle URL if the dependency is the same version as the formula/bottle.
bottle_url = bottle_info["url"] if dependency["pkg_version"] == dependency["formula_pkg_version"] bottle_url = bottle_info["url"] if dependency["pkg_version"] == dependency["formula_pkg_version"]
{ dependency_json = {
SPDXID: "SPDXRef-Package-SPDXRef-#{dependency["name"].tr("/", "-")}-#{dependency["pkg_version"]}", SPDXID: "SPDXRef-Package-SPDXRef-#{dependency["name"].tr("/", "-")}-#{dependency["pkg_version"]}",
name: dependency["name"], name: dependency["name"],
versionInfo: dependency["pkg_version"], versionInfo: dependency["pkg_version"],
@ -329,12 +333,17 @@ class SBOM
}, },
], ],
} }
if bottling
dependency_json.delete(:downloadLocation)
dependency_json.delete(:checksums)
end
dependency_json
end end
end end
sig { params(bottling: T::Boolean).returns(T::Hash[Symbol, T.any(String, T::Array[T::Hash[Symbol, String]])]) } sig { params(bottling: T::Boolean).returns(T::Hash[Symbol, T.any(String, T::Array[T::Hash[Symbol, String]])]) }
def to_spdx_sbom(bottling:) def to_spdx_sbom(bottling:)
runtime_full = full_spdx_runtime_dependencies runtime_full = full_spdx_runtime_dependencies(bottling:)
compiler_info = { compiler_info = {
"SPDXRef-Compiler" => { "SPDXRef-Compiler" => {