Skip to content

Check also nested components in multiple component versions check #427

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

Open
andreas-hilti wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check also nested components in multiple component versions check #427

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
15 changes: 14 additions & 1 deletion src/CycloneDX.Utils/MultipleComponentVersions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,20 @@ public static Dictionary<string, List<Component>> MultipleComponentVersions(Bom

var componentCache = new Dictionary<string, List<Component>>();

foreach (var component in bom.Components)
var toVisit = new List<Component>(bom.Components.Reverse<Component>());

while (toVisit.Count > 0)
{
var component = toVisit.Last();
toVisit.RemoveAt(toVisit.Count - 1);
if (component.Components != null)
{
foreach (var subComponent in component.Components.Reverse<Component>())
{
toVisit.Add(subComponent);
}
}

var componentIdentifier = ComponentAnalysisIdentifier(component);
if (!componentCache.ContainsKey(componentIdentifier))
{
Expand All @@ -46,6 +58,7 @@ public static Dictionary<string, List<Component>> MultipleComponentVersions(Bom
componentCache[componentIdentifier].Add(component);
}


foreach (var componentEntry in componentCache)
{
if (componentEntry.Value.Count > 1)
Expand Down
38 changes: 38 additions & 0 deletions tests/CycloneDX.Utils.Tests/MultipleComponentVersionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,43 @@ public void MultipleComponentVersionTest()

Assert.Equal(2, result["component"].Count);
}

[Fact]
public void MultipleNestedComponentVersionTest()
{
var bom = new Bom
{
Components = new List<Component>
{
new Component
{
Name = "ComponentA",
Version = "1",
BomRef = "ComponentA@1"
},
new Component
{
Name = "ComponentB",
Version = "1",
BomRef = "ComponentB@1",
Components = new List<Component>
{
new Component
{
Name = "ComponentA",
Version = "2",
BomRef = "ComponentA@2"
}
}
}
},
};

var result = CycloneDXUtils.MultipleComponentVersions(bom);

Assert.Equal(2, result["ComponentA"].Count);
Assert.Equal("1", result["ComponentA"][0].Version);
Assert.Equal("2", result["ComponentA"][1].Version);
}
}
}