fix: set result name and namespace to trivy vulnreport and configaudi… (

#869)

* fix: set result name and namespace to trivy vulnreport and configauditreport

Signed-off-by: Johannes Kleinlercher <johannes.kleinlercher@suxess-it.com>

* fix: increase linter timeout

Signed-off-by: Johannes Kleinlercher <johannes@kleinlercher.at>

---------

Signed-off-by: Johannes Kleinlercher <johannes.kleinlercher@suxess-it.com>
Signed-off-by: Johannes Kleinlercher <johannes@kleinlercher.at>
Co-authored-by: Alex Jones <alexsimonjones@gmail.com>

.github/workflows/golangci_lint.yaml

@@ -16,5 +16,5 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-check
-          golangci_lint_flags: "--timeout=120s"
+          golangci_lint_flags: "--timeout=240s"
           level: warning

pkg/integration/trivy/analyzer.go

@@ -15,9 +15,10 @@ package trivy
 
 import (
 	"fmt"
-	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
 	"strings"
 
+	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/aquasecurity/trivy-operator/pkg/apis/aquasecurity/v1alpha1"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
@@ -59,8 +60,8 @@ func (TrivyAnalyzer) analyzeVulnerabilityReports(a common.Analyzer) ([]common.Re
 			}
 		}
 		if len(failures) > 0 {
-			preAnalysis[fmt.Sprintf("%s/%s", report.Labels["trivy-operator.resource.namespace"],
-				report.Labels["trivy-operator.resource.name"])] = common.PreAnalysis{
+			preAnalysis[fmt.Sprintf("%s/%s", report.Namespace,
+				report.Name)] = common.PreAnalysis{
 				TrivyVulnerabilityReport: report,
 				FailureDetails:           failures,
 			}
@@ -122,8 +123,8 @@ func (t TrivyAnalyzer) analyzeConfigAuditReports(a common.Analyzer) ([]common.Re
 		}
 
 		if len(failures) > 0 {
-			preAnalysis[fmt.Sprintf("%s/%s", report.Labels["trivy-operator.resource.namespace"],
-				report.Labels["trivy-operator.resource.name"])] = common.PreAnalysis{
+			preAnalysis[fmt.Sprintf("%s/%s", report.Namespace,
+				report.Name)] = common.PreAnalysis{
 				TrivyConfigAuditReport: report,
 				FailureDetails:         failures,
 			}