refactor: use environmentmapper for vuln summary

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

Author: 3 people

internal/vulnerability/queries.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/nais/api/internal/activitylog"
 	"github.com/nais/api/internal/auth/authz"
+	"github.com/nais/api/internal/environmentmapper"
 	"github.com/nais/api/internal/graph/apierror"
 	"github.com/nais/api/internal/graph/ident"
 	"github.com/nais/api/internal/graph/model"
@@ -347,7 +348,8 @@ func getFilteredVulnerabilitySummaries(ctx context.Context, s slug.Slug, filter
 	it := iterator.New(ctx, 100, func(limit, offset int32) (*vulnerabilities.ListVulnerabilitySummariesResponse, error) {
 		opts := make([]vulnerabilities.Option, 0)
 		if filter != nil && len(filter.Environments) == 1 {
-			opts = append(opts, vulnerabilities.ClusterFilter(filter.Environments[0]))
+			cluster := environmentmapper.ClusterName(filter.Environments[0])
+			opts = append(opts, vulnerabilities.ClusterFilter(cluster))
 		}
 		opts = append(opts, vulnerabilities.NamespaceFilter(s.String()))
 		opts = append(opts, vulnerabilities.Offset(offset))
@@ -362,15 +364,16 @@ func getFilteredVulnerabilitySummaries(ctx context.Context, s slug.Slug, filter
 		}
 
 		wSum := it.Value()
+		env := environmentmapper.EnvironmentName(wSum.Workload.Cluster)
 		if wSum.Workload.Type == "app" {
-			_, err := application.Get(ctx, s, wSum.Workload.Cluster, wSum.Workload.Name)
+			_, err := application.Get(ctx, s, env, wSum.Workload.Name)
 			if err != nil {
 				continue
 			}
 			ret = append(ret, toWorkloadVulnerabilitySummary(wSum))
 		}
 		if wSum.Workload.Type == "job" {
-			_, err := job.Get(ctx, s, wSum.Workload.Cluster, wSum.Workload.Name)
+			_, err := job.Get(ctx, s, env, wSum.Workload.Name)
 			if err != nil {
 				continue
 			}