Skip to content

fix: place root component only in metadata.component #386

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

Merged
ruromero merged 2 commits into from
Mar 30, 2026
Merged

fix: place root component only in metadata.component #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e993302
fix: place root component only in metadata.component, not in componen…
ruromero Mar 30, 2026
f1635f4
chore: add missing EOF
ruromero Mar 30, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
with:
language: java
repo-url: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
commit-sha: ${{ github.event.pull_request.head.sha || github.sha }}
commit-sha: ${{ github.event.pull_request.head.sha || github.sha }}
17 changes: 10 additions & 7 deletions src/main/java/io/github/guacsec/trustifyda/sbom/CycloneDXSbom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ public Sbom addRoot(PackageURL rootRef, String license) {
}
}
bom.getMetadata().setComponent(rootComponent);
bom.getComponents().add(rootComponent);
bom.getDependencies().add(newDependency(rootRef));
return this;
}
Expand Down Expand Up @@ -266,13 +265,12 @@ public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, String s)
if (s != null) {
scope = Component.Scope.valueOf(s.toUpperCase());
}
String rootCoordinates = root != null ? root.getCoordinates() : null;
Component srcComp = newComponent(sourceRef, scope);
boolean isRootSource = srcComp.getBomRef().equals(rootCoordinates);
Dependency srcDep;
if (bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(srcComp.getBomRef()))) {
bom.addComponent(srcComp);
srcDep = newDependency(sourceRef);
bom.addDependency(srcDep);
} else {
if (isRootSource
|| bom.getComponents().stream().anyMatch(c -> c.getBomRef().equals(srcComp.getBomRef()))) {
Optional<Dependency> existingDep =
bom.getDependencies().stream()
.filter(d -> d.getRef().equals(srcComp.getBomRef()))
Expand All @@ -283,13 +281,18 @@ public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, String s)
srcDep = newDependency(sourceRef);
bom.addDependency(srcDep);
}
} else {
bom.addComponent(srcComp);
srcDep = newDependency(sourceRef);
bom.addDependency(srcDep);
}
Dependency targetDep = newDependency(targetRef);
srcDep.addDependency(targetDep);
if (bom.getDependencies().stream().noneMatch(d -> d.getRef().equals(targetDep.getRef()))) {
bom.addDependency(targetDep);
}
if (bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(targetDep.getRef()))) {
if (!targetDep.getRef().equals(rootCoordinates)
&& bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(targetDep.getRef()))) {
bom.addComponent(newComponent(targetRef, scope));
}
return this;
Expand Down
8 changes: 0 additions & 8 deletions src/test/resources/msc/golang/expected_sbom_ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:golang/github.com/sample/demo-app@v0.0.0",
"group" : "github.com/sample",
"name" : "demo-app",
"version" : "v0.0.0",
"purl" : "pkg:golang/github.com/sample/demo-app@v0.0.0"
},
{
"type" : "library",
"bom-ref" : "pkg:golang/github.com/gin-gonic/gin@v1.6.0",
Expand Down
8 changes: 0 additions & 8 deletions src/test/resources/msc/golang/mvs_logic/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0",
"group": "github.com/rhecosystemappeng/saasi",
"name": "deployer",
"version": "v0.0.0",
"purl": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/cloud.google.com/go@v0.52.0",
Expand Down
8 changes: 0 additions & 8 deletions ...sources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_component_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:golang/golang.org/x/example@v0.0.0",
"group" : "golang.org/x",
"name" : "example",
"version" : "v0.0.0",
"purl" : "pkg:golang/golang.org/x/example@v0.0.0"
},
{
"type" : "library",
"bom-ref" : "pkg:golang/github.com/spf13/cobra@v0.0.5",
Expand Down
8 changes: 0 additions & 8 deletions ...t/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/golang.org/x/example@v0.0.0",
"group": "golang.org/x",
"name": "example",
"version": "v0.0.0",
"purl": "pkg:golang/golang.org/x/example@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/spf13/viper@v1.3.2",
Expand Down
8 changes: 0 additions & 8 deletions ...est/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_component_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0",
"group" : "github.com/rhecosystemappeng/saasi",
"name" : "deployer",
"version" : "v0.0.0",
"purl" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0"
},
{
"type" : "library",
"bom-ref" : "pkg:golang/github.com/davecgh/go-spew@v1.1.1",
Expand Down
8 changes: 0 additions & 8 deletions src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0",
"group": "github.com/rhecosystemappeng/saasi",
"name": "deployer",
"version": "v0.0.0",
"purl": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/stretchr/testify@v1.8.3",
Expand Down
7 changes: 0 additions & 7 deletions src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_component_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:golang/rhda-test@v0.0.0",
"name" : "rhda-test",
"version" : "v0.0.0",
"purl" : "pkg:golang/rhda-test@v0.0.0"
},
{
"type" : "library",
"bom-ref" : "pkg:golang/github.com/emicklei/go-restful/v3@v3.0.0",
Expand Down
7 changes: 0 additions & 7 deletions src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/rhda-test@v0.0.0",
"name": "rhda-test",
"version": "v0.0.0",
"purl": "pkg:golang/rhda-test@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/json-iterator/go@v1.1.9",
Expand Down
8 changes: 0 additions & 8 deletions ...sources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_component_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0",
"group": "github.com/devfile-samples",
"name": "devfile-sample-go-basic",
"version": "v0.0.0",
"purl": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/miekg/dns@v1.1.12",
Expand Down
8 changes: 0 additions & 8 deletions ...t/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0",
"group": "github.com/devfile-samples",
"name": "devfile-sample-go-basic",
"version": "v0.0.0",
"purl": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/ipfs/go-verifcid@v0.0.1",
Expand Down
8 changes: 0 additions & 8 deletions ...t/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_component_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0",
"group" : "github.com/rhecosystemappeng/saasi",
"name" : "deployer",
"version" : "v0.0.0",
"purl" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0"
},
{
"type" : "library",
"bom-ref" : "pkg:golang/github.com/davecgh/go-spew@v1.1.1",
Expand Down
8 changes: 0 additions & 8 deletions src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0",
"group": "github.com/rhecosystemappeng/saasi",
"name": "deployer",
"version": "v0.0.0",
"purl": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/stretchr/testify@v1.8.3",
Expand Down
8 changes: 0 additions & 8 deletions ..._manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_component_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0",
"group" : "github.com/devfile-samples",
"name" : "devfile-sample-go-basic",
"version" : "v0.0.0",
"purl" : "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0"
},
{
"type" : "library",
"bom-ref" : "pkg:golang/github.com/gin-gonic/gin@v1.6.0",
Expand Down
8 changes: 0 additions & 8 deletions .../tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_stack_analysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components": [
{
"type": "application",
"bom-ref": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0",
"group": "github.com/devfile-samples",
"name": "devfile-sample-go-basic",
"version": "v0.0.0",
"purl": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0"
},
{
"type": "library",
"bom-ref": "pkg:golang/github.com/ipfs/go-verifcid@v0.0.1",
Expand Down
8 changes: 0 additions & 8 deletions ...nifests/gradle-groovy/deps_with_duplicate_different_versions/expected_component_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/log4j/log4j@1.2.17",
Expand Down
8 changes: 0 additions & 8 deletions ...t_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_stack_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/log4j/log4j@1.2.17",
Expand Down
8 changes: 0 additions & 8 deletions ...s/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_component_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/log4j/log4j@1.2.17",
Expand Down
8 changes: 0 additions & 8 deletions ...urces/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_stack_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/log4j/log4j@1.2.17",
Expand Down
8 changes: 0 additions & 8 deletions ..._manifests/gradle-groovy/deps_with_ignore_full_specification/expected_component_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final",
Expand Down
8 changes: 0 additions & 8 deletions .../tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_stack_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final",
Expand Down
8 changes: 0 additions & 8 deletions ...es/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_component_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final",
Expand Down
8 changes: 0 additions & 8 deletions ...ources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_stack_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final",
Expand Down
8 changes: 0 additions & 8 deletions ...urces/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_component_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
}
},
"components" : [
{
"type" : "application",
"bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT",
"group" : "org.acme.dbaas",
"name" : "postgresql-orm-quarkus",
"version" : "1.0.0-SNAPSHOT",
"purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final",
Expand Down
Loading
Loading