refactor: fix workloadtype mapping

Co-authored-by: tommytroen <[email protected]>
Co-authored-by: ybelmekk <[email protected]>

Author: 3 people

internal/api/grpcvulnerabilities/vulnerabilities.go

@@ -29,7 +29,7 @@ func (s *Server) ListVulnerabilities(ctx context.Context, request *vulnerabiliti
 	v, err := s.querier.ListVulnerabilities(ctx, sql.ListVulnerabilitiesParams{
 		Cluster:           request.GetFilter().Cluster,
 		Namespace:         request.GetFilter().Namespace,
-		WorkloadType:      request.GetFilter().WorkloadType,
+		WorkloadType:      request.GetFilter().FuzzyWorkloadType(),
 		WorkloadName:      request.GetFilter().Workload,
 		ImageName:         request.GetFilter().ImageName,
 		ImageTag:          request.GetFilter().ImageTag,
@@ -77,7 +77,7 @@ func (s *Server) ListVulnerabilities(ctx context.Context, request *vulnerabiliti
 	total, err := s.querier.CountVulnerabilities(ctx, sql.CountVulnerabilitiesParams{
 		Cluster:           request.GetFilter().Cluster,
 		Namespace:         request.GetFilter().Namespace,
-		WorkloadType:      request.GetFilter().WorkloadType,
+		WorkloadType:      request.GetFilter().FuzzyWorkloadType(),
 		WorkloadName:      request.GetFilter().Workload,
 		IncludeSuppressed: request.IncludeSuppressed,
 	})
@@ -186,7 +186,7 @@ func (s *Server) ListSuppressedVulnerabilities(ctx context.Context, request *vul
 	total, err := s.querier.CountSuppressedVulnerabilities(ctx, sql.CountSuppressedVulnerabilitiesParams{
 		Cluster:      filter.Cluster,
 		Namespace:    filter.Namespace,
-		WorkloadType: filter.WorkloadType,
+		WorkloadType: filter.FuzzyWorkloadType(),
 		WorkloadName: filter.Workload,
 		ImageName:    filter.ImageName,
 		ImageTag:     filter.ImageTag,

pkg/api/vulnerabilities/options.go

@@ -12,6 +12,13 @@ type Option interface {
 
 type OrderByField string
 
+type WorkLoadType string
+
+const (
+	WorkloadTypeApp WorkLoadType = "app"
+	WorkloadTypeJob WorkLoadType = "job"
+)
+
 const (
 	OrderBySeverity   OrderByField = "severity"
 	OrderByPackage    OrderByField = "package"
@@ -179,3 +186,19 @@ func applyOptions(opts ...Option) *options {
 	}
 	return o
 }
+
+func (f *Filter) FuzzyWorkloadType() *string {
+	if f.WorkloadType == nil {
+		return nil
+	}
+	app := string(WorkloadTypeApp)
+	job := string(WorkloadTypeJob)
+
+	switch *f.WorkloadType {
+	case "app", "APP", "application", "Application", "APPLICATION":
+		return &app
+	case "job", "Job", "JOB", "Naisjob", "NAISJOB", "NaisJob":
+		return &job
+	}
+	return f.WorkloadType
+}