From f0d3f36f6d56bd76248590c0b841dffb7769a2ee Mon Sep 17 00:00:00 2001 From: Matthis <99146727+matthisholleville@users.noreply.github.com> Date: Wed, 17 May 2023 10:36:47 +0200 Subject: [PATCH] fix: use coreAnalyzer if there are no filters selected and no active_filters (#432) Signed-off-by: Matthis Holleville --- pkg/analysis/analysis.go | 6 +++--- pkg/analyzer/analyzer.go | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkg/analysis/analysis.go b/pkg/analysis/analysis.go index 1d82f1d3eb..4ac295fd41 100644 --- a/pkg/analysis/analysis.go +++ b/pkg/analysis/analysis.go @@ -128,7 +128,7 @@ func NewAnalysis(backend string, language string, filters []string, namespace st func (a *Analysis) RunAnalysis() { activeFilters := viper.GetStringSlice("active_filters") - analyzerMap := analyzer.GetAnalyzerMap() + coreAnalyzerMap, analyzerMap := analyzer.GetAnalyzerMap() analyzerConfig := common.Analyzer{ Client: a.Client, @@ -138,11 +138,11 @@ func (a *Analysis) RunAnalysis() { } semaphore := make(chan struct{}, a.MaxConcurrency) - // if there are no filters selected and no active_filters then run all of them + // if there are no filters selected and no active_filters then run coreAnalyzer if len(a.Filters) == 0 && len(activeFilters) == 0 { var wg sync.WaitGroup var mutex sync.Mutex - for _, analyzer := range analyzerMap { + for _, analyzer := range coreAnalyzerMap { wg.Add(1) semaphore <- struct{}{} go func(analyzer common.IAnalyzer, wg *sync.WaitGroup, semaphore chan struct{}) { diff --git a/pkg/analyzer/analyzer.go b/pkg/analyzer/analyzer.go index 750c5dae6a..a275bb02ca 100644 --- a/pkg/analyzer/analyzer.go +++ b/pkg/analyzer/analyzer.go @@ -78,18 +78,20 @@ func ListFilters() ([]string, []string, []string) { return coreKeys, additionalKeys, integrationAnalyzers } -func GetAnalyzerMap() map[string]common.IAnalyzer { +func GetAnalyzerMap() (map[string]common.IAnalyzer, map[string]common.IAnalyzer) { - mergedMap := make(map[string]common.IAnalyzer) + coreAnalyzer := make(map[string]common.IAnalyzer) + mergedAnalyzerMap := make(map[string]common.IAnalyzer) // add core analyzer for key, value := range coreAnalyzerMap { - mergedMap[key] = value + coreAnalyzer[key] = value + mergedAnalyzerMap[key] = value } // add additional analyzer for key, value := range additionalAnalyzerMap { - mergedMap[key] = value + mergedAnalyzerMap[key] = value } integrationProvider := integration.NewIntegration() @@ -106,9 +108,9 @@ func GetAnalyzerMap() map[string]common.IAnalyzer { fmt.Println(color.RedString(err.Error())) os.Exit(1) } - in.AddAnalyzer(&mergedMap) + in.AddAnalyzer(&mergedAnalyzerMap) } } - return mergedMap + return coreAnalyzer, mergedAnalyzerMap }