Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions cargo-sbom/src/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ pub fn build<'a>(metadata: &'a Metadata) -> Result<Graph<'a>, Error> {

let to = graph.nodes[&dep.pkg];
for kind in kinds {
// skip dev dependencies
if kind == DependencyKind::Development || kind == DependencyKind::Build
{
continue;
}

graph.graph.add_edge(from, to, kind);
}
}
Expand Down
42 changes: 34 additions & 8 deletions cargo-sbom/src/util/spdx/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,40 @@ pub fn convert(
edges.for_each(|e| {
let source = &graph.graph[e.source()];
let target = &graph.graph[e.target()];
relationships.insert(HashableSpdxItemRelationships(
serde_spdx::spdx::v_2_3::SpdxItemRelationshipsBuilder::default()
.spdx_element_id(generate_project_id(source))
.related_spdx_element(generate_project_id(target))
.relationship_type("DEPENDS_ON")
.build()
.unwrap(),
));
let source_project_id = generate_project_id(source);
let target_project_id = generate_project_id(target);

let relationship = match e.weight() {
cargo_metadata::DependencyKind::Normal => Some(
serde_spdx::spdx::v_2_3::SpdxItemRelationshipsBuilder::default()
.spdx_element_id(source_project_id)
.related_spdx_element(target_project_id)
.relationship_type("DEPENDS_ON")
.build()
.unwrap(),
),
cargo_metadata::DependencyKind::Build => Some(
serde_spdx::spdx::v_2_3::SpdxItemRelationshipsBuilder::default()
.spdx_element_id(target_project_id)
.related_spdx_element(source_project_id)
.relationship_type("BUILD_TOOL_OF")
.build()
.unwrap(),
),
cargo_metadata::DependencyKind::Development => Some(
serde_spdx::spdx::v_2_3::SpdxItemRelationshipsBuilder::default()
.spdx_element_id(target_project_id)
.related_spdx_element(source_project_id)
.relationship_type("DEV_DEPENDENCY_OF")
.build()
.unwrap(),
),
cargo_metadata::DependencyKind::Unknown => None,
};

if let Some(relationship) = relationship {
relationships.insert(HashableSpdxItemRelationships(relationship));
}
});
}

Expand Down
27 changes: 26 additions & 1 deletion examples/cargo-binary/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions examples/cargo-binary/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ edition = "2021"

[dependencies]
clap = { version = "4.3.11", features = ["derive"] }

[dev-dependencies]
approx = "0.5.1"
Loading