Revert "feat: rework errorsList"

This reverts commit 1a3cfa8.

Signed-off-by: Matthis Holleville <matthish29@gmail.com>

cmd/analyze/analyze.go

@@ -51,7 +51,7 @@ var AnalyzeCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		errorsList := config.RunAnalysis()
+		config.RunAnalysis()
 
 		if explain {
 			err := config.GetAIResults(output, anonymize)
@@ -62,7 +62,7 @@ var AnalyzeCmd = &cobra.Command{
 		}
 
 		// print results
-		output, err := config.PrintOutput(output, errorsList)
+		output, err := config.PrintOutput(output)
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)

pkg/analysis/analysis.go

@@ -39,7 +39,7 @@ type Analysis struct {
 	Client         *kubernetes.Client
 	AIClient       ai.IAI
 	Results        []common.Result
-	Errors         []error
+	Errors         []string
 	Namespace      string
 	Cache          cache.ICache
 	Explain        bool
@@ -116,7 +116,7 @@ func NewAnalysis(backend string, language string, filters []string, namespace st
 	}, nil
 }
 
-func (a *Analysis) RunAnalysis() []error {
+func (a *Analysis) RunAnalysis() {
 	activeFilters := viper.GetStringSlice("active_filters")
 
 	analyzerMap := analyzer.GetAnalyzerMap()
@@ -128,7 +128,6 @@ func (a *Analysis) RunAnalysis() []error {
 		AIClient:  a.AIClient,
 	}
 
-	var errorsList []error
 	semaphore := make(chan struct{}, a.MaxConcurrency)
 	// if there are no filters selected and no active_filters then run all of them
 	if len(a.Filters) == 0 && len(activeFilters) == 0 {
@@ -142,7 +141,7 @@ func (a *Analysis) RunAnalysis() []error {
 				results, err := analyzer.Analyze(analyzerConfig)
 				if err != nil {
 					mutex.Lock()
-					errorsList = append(errorsList, fmt.Errorf(fmt.Sprintf("[%s] %s", reflect.TypeOf(analyzer).Name(), err)))
+					a.Errors = append(a.Errors, fmt.Sprintf(fmt.Sprintf("[%s] %s", reflect.TypeOf(analyzer).Name(), err)))
 					mutex.Unlock()
 				}
 				mutex.Lock()
@@ -153,9 +152,7 @@ func (a *Analysis) RunAnalysis() []error {
 
 		}
 		wg.Wait()
-		return errorsList
 	}
-
 	semaphore = make(chan struct{}, a.MaxConcurrency)
 	// if the filters flag is specified
 	if len(a.Filters) != 0 {
@@ -170,7 +167,7 @@ func (a *Analysis) RunAnalysis() []error {
 					results, err := analyzer.Analyze(analyzerConfig)
 					if err != nil {
 						mutex.Lock()
-						errorsList = append(errorsList, fmt.Errorf(fmt.Sprintf("[%s] %s", filter, err)))
+						a.Errors = append(a.Errors, fmt.Sprintf(fmt.Sprintf("[%s] %s", filter, err)))
 						mutex.Unlock()
 					}
 					mutex.Lock()
@@ -179,11 +176,10 @@ func (a *Analysis) RunAnalysis() []error {
 					<-semaphore
 				}(analyzer, filter)
 			} else {
-				errorsList = append(errorsList, fmt.Errorf(fmt.Sprintf("\"%s\" filter does not exist. Please run k8sgpt filters list.", filter)))
+				a.Errors = append(a.Errors, fmt.Sprintf(fmt.Sprintf("\"%s\" filter does not exist. Please run k8sgpt filters list.", filter)))
 			}
 		}
 		wg.Wait()
-		return errorsList
 	}
 
 	var wg sync.WaitGroup
@@ -199,7 +195,7 @@ func (a *Analysis) RunAnalysis() []error {
 				results, err := analyzer.Analyze(analyzerConfig)
 				if err != nil {
 					mutex.Lock()
-					errorsList = append(errorsList, fmt.Errorf("[%s] %s", filter, err))
+					a.Errors = append(a.Errors, fmt.Sprintf("[%s] %s", filter, err))
 					mutex.Unlock()
 				}
 				mutex.Lock()
@@ -210,7 +206,6 @@ func (a *Analysis) RunAnalysis() []error {
 		}
 	}
 	wg.Wait()
-	return errorsList
 }
 
 func (a *Analysis) GetAIResults(output string, anonymize bool) error {

pkg/analysis/analysis_test.go

@@ -35,7 +35,7 @@ func TestAnalysis_NoProblemJsonOutput(t *testing.T) {
 		Results:  []common.Result{},
 	}
 
-	gotJson, err := analysis.PrintOutput("json", []error{})
+	gotJson, err := analysis.PrintOutput("json")
 	if err != nil {
 		t.Error(err)
 	}
@@ -88,7 +88,7 @@ func TestAnalysis_ProblemJsonOutput(t *testing.T) {
 		},
 	}
 
-	gotJson, err := analysis.PrintOutput("json", []error{})
+	gotJson, err := analysis.PrintOutput("json")
 	if err != nil {
 		t.Error(err)
 	}
@@ -149,7 +149,7 @@ func TestAnalysis_MultipleProblemJsonOutput(t *testing.T) {
 		},
 	}
 
-	gotJson, err := analysis.PrintOutput("json", []error{})
+	gotJson, err := analysis.PrintOutput("json")
 	if err != nil {
 		t.Error(err)
 	}

pkg/analysis/output.go

@@ -21,8 +21,7 @@ func getOutputFormats() []string {
 	return formats
 }
 
-func (a *Analysis) PrintOutput(format string, errorsList []error) ([]byte, error) {
-	a.Errors = errorsList
+func (a *Analysis) PrintOutput(format string) ([]byte, error) {
 	outputFunc, ok := outputFormats[format]
 	if !ok {
 		return nil, fmt.Errorf("unsupported output format: %s. Available format %s", format, strings.Join(getOutputFormats(), ","))
@@ -42,15 +41,10 @@ func (a *Analysis) jsonOutput() ([]byte, error) {
 		status = StateOK
 	}
 
-	errorMessages := make([]string, len(a.Errors))
-	for i, err := range a.Errors {
-		errorMessages[i] = err.Error()
-	}
-
 	result := JsonOutput{
 		Problems: problems,
 		Results:  a.Results,
-		Errors:   errorMessages,
+		Errors:   a.Errors,
 		Status:   status,
 	}
 	output, err := json.MarshalIndent(result, "", "  ")
@@ -66,7 +60,7 @@ func (a *Analysis) textOutput() ([]byte, error) {
 		output.WriteString("\n")
 		output.WriteString(color.YellowString("Warnings : \n"))
 		for _, aerror := range a.Errors {
-			output.WriteString(fmt.Sprintf("- %s\n", color.YellowString(aerror.Error())))
+			output.WriteString(fmt.Sprintf("- %s\n", color.YellowString(aerror)))
 		}
 	}
 	output.WriteString("\n")

pkg/server/server.go

@@ -75,7 +75,7 @@ func (s *Config) analyzeHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	errorsList := config.RunAnalysis()
+	config.RunAnalysis()
 
 	if explain {
 		err := config.GetAIResults(s.Output, anonymize)
@@ -86,7 +86,7 @@ func (s *Config) analyzeHandler(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	out, err := config.PrintOutput(s.Output, errorsList)
+	out, err := config.PrintOutput(s.Output)
 	if err != nil {
 		health.Failure++
 		http.Error(w, err.Error(), http.StatusInternalServerError)