Skip to content

Slight refactor of scbctl #2682

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
J12934 merged 3 commits into from
Sep 30, 2024
Merged

Slight refactor of scbctl #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80f408b
[nits] modify buildTree func
ddddddO Sep 27, 2024
1e1ac14
replace map to slice
ddddddO Sep 27, 2024
e910103
add name on CONTRIBUTORS.md
ddddddO Sep 28, 2024
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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ Committing with `git commit -s` will add the sign-off at the end of the commit m
- Tobias Stenby Brixen <kind.job1347@fastmail.com>
- Eline Henriksen <mains.moon.0x@icloud.com>
- Michael Kruggel <michael.kruggel@defenseunicorns.com>
- Ochi Daiki <lbfdeatq@gmail.com>
21 changes: 12 additions & 9 deletions scbctl/cmd/cascading.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,21 @@ const (
func buildTree(scans []v1.Scan) *gtree.Node {
root := gtree.NewRoot("Scans")

scanMap := make(map[string]*v1.Scan)
for i := range scans {
scanMap[scans[i].Name] = &scans[i]
}
uniq := make(map[string]struct{})
uniqScans := []*v1.Scan{}
for _, scan := range scans {
scanMap[scan.Name] = &scan
if _, ok := uniq[scan.Name]; ok {
continue
}

uniqScans = append(uniqScans, &scan)
uniq[scan.Name] = struct{}{}
}

for _, scan := range scans {
if isInitialScan(&scan) {
scanNode := root.Add(scan.Name)
buildScanSubtree(scanNode, &scan, scanMap)
buildScanSubtree(scanNode, &scan, uniqScans)
}
}

Expand All @@ -78,11 +81,11 @@ func isInitialScan(scan *v1.Scan) bool {
return scan.Annotations[ParentScanAnnotation] == ""
}

func buildScanSubtree(node *gtree.Node, scan *v1.Scan, scanMap map[string]*v1.Scan) {
for _, childScan := range scanMap {
func buildScanSubtree(node *gtree.Node, scan *v1.Scan, uniqScans []*v1.Scan) {
for _, childScan := range uniqScans {
if isCascadedFrom(childScan, scan) {
childNode := node.Add(childScan.Name)
buildScanSubtree(childNode, childScan, scanMap)
buildScanSubtree(childNode, childScan, uniqScans)
}
}
}
Expand Down