Skip to content

Vers Support #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maennchen wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Vers Support #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .credo.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
{Credo.Check.Readability.AliasOrder, []},
{Credo.Check.Readability.FunctionNames, []},
{Credo.Check.Readability.LargeNumbers, []},
{Credo.Check.Readability.MaxLineLength, [priority: :low, max_length: 120]},
{Credo.Check.Readability.ModuleAttributeNames, []},
{Credo.Check.Readability.ModuleDoc, []},
{Credo.Check.Readability.ModuleNames, []},
Expand Down Expand Up @@ -157,6 +156,9 @@
{Credo.Check.Warning.MixEnv, []},
{Credo.Check.Refactor.MapInto, []},

# Done by formatter
{Credo.Check.Readability.MaxLineLength, [priority: :low, max_length: 120]},

#
# Custom checks can be created using `mix credo.gen.check`.
#
Expand Down
13 changes: 13 additions & 0 deletions lib/sbom/cyclonedx.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,23 @@ defmodule SBoM.CycloneDX do
|> to_string()
|> SBoM.CPE.hex(component[:version] || "", component[:source_url])

version_range =
case component[:version_requirement] do
nil ->
nil

range ->
case Version.Requirement.Vers.to_vers(range, "hex") do
{:ok, vers} -> vers
:error -> nil
end
end

bom_struct(:Component, schema_version,
type: :CLASSIFICATION_LIBRARY,
name: name,
version: component_version(component, schema_version),
versionRange: version_range,
purl: to_string(component.package_url),
scope: dependency_scope(component),
hashes: hashes,
Expand Down
15 changes: 14 additions & 1 deletion lib/sbom/scm/hex/scm.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,24 @@ defmodule SBoM.SCM.Hex.SCM do
^repository_url -> %{"repository_url" => repository_url}
end

{version, qualifiers} =
case version do
nil ->
case {Version.parse(requirement), Version.Requirement.Vers.to_vers(requirement, "hex")} do
{{:ok, %Version{} = ver}, _vers} -> {to_string(ver), qualifiers}
{:error, {:ok, vers}} -> {nil, Map.put(qualifiers, "vers", vers)}
{:error, :error} -> {nil, qualifiers}
end

version ->
{version, qualifiers}
end

Purl.new!(%Purl{
type: "hex",
namespace: hex_namespace(opts[:repo]),
name: opts |> Keyword.fetch!(:hex) |> to_string(),
version: version || requirement,
version: version,
qualifiers: qualifiers
})
end
Expand Down
Loading
Loading