Skip to content
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

Jump to bottom

fix: concurrent map write in trivy analyzer #1222

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix: concurrent map write in trivy analyzer #1222

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2eeb751
fix: concurrent map write in trivy analyzer
michael12312 Jul 19, 2024
ceed247
feat: rename variable in trivyAnalyzer lock
michael12312 Aug 13, 2024
4c71a77
Merge branch 'main' into fix-concurrent-map-write
michael12312 Aug 14, 2024
a5c1241
Merge branch 'main' into fix-concurrent-map-write
michael12312 Aug 26, 2024
f3d7285
Merge branch 'main' into fix-concurrent-map-write
michael12312 Aug 29, 2024
c4f6d22
Merge branch 'main' into fix-concurrent-map-write
michael12312 Sep 3, 2024
4e0e41f
Merge branch 'main' into fix-concurrent-map-write
michael12312 Sep 13, 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
7 changes: 7 additions & 0 deletions pkg/integration/trivy/analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package trivy
import (
"fmt"
"strings"
"sync"

ctrl "sigs.k8s.io/controller-runtime/pkg/client"

Expand All @@ -29,12 +30,16 @@ type TrivyAnalyzer struct {
configAuditReportAnalysis bool
}

var rwMutex sync.RWMutex

func (TrivyAnalyzer) analyzeVulnerabilityReports(a common.Analyzer) ([]common.Result, error) {
// Get all trivy VulnerabilityReports
result := &v1alpha1.VulnerabilityReportList{}

client := a.Client.CtrlClient
rwMutex.Lock()
err := v1alpha1.AddToScheme(client.Scheme())
rwMutex.Unlock()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -94,7 +99,9 @@ func (t TrivyAnalyzer) analyzeConfigAuditReports(a common.Analyzer) ([]common.Re
result := &v1alpha1.ConfigAuditReportList{}

client := a.Client.CtrlClient
rwMutex.Lock()
err := v1alpha1.AddToScheme(client.Scheme())
rwMutex.Unlock()
if err != nil {
return nil, err
}
Expand Down
Loading