Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
perf(image-service): fetch vulnerability summaries only for paginated image results (#1814)
Kyle Mendell18fb1af42834
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex 2c62cbc8d..e07031f61 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -515,10 +515,9 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio}var (- dockerImages []image.Summary- containers []container.Summary- updateRecords []models.ImageUpdateRecord- vulnerabilityMap map[string]*vulnerability.ScanSummary+ dockerImages []image.Summary+ containers []container.Summary+ updateRecords []models.ImageUpdateRecord)g, groupCtx := errgroup.WithContext(ctx)@@ -558,23 +557,25 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio}}- if s.vulnerabilityService != nil {- var err error- vulnerabilityMap, err = s.vulnerabilityService.GetScanSummariesByImageIDs(ctx, imageIDs)- if err != nil {- return nil, pagination.Response{}, err- }- }-projectIDByName := buildProjectIDMapInternal(ctx, s.db, containers)usageMap := buildUsageMapInternal(containers, projectIDByName)updateMap := buildUpdateMap(updateRecords)- items := mapDockerImagesToDTOs(dockerImages, usageMap, updateMap, vulnerabilityMap)+ items := mapDockerImagesToDTOs(dockerImages, usageMap, updateMap, nil)config := s.getImagePaginationConfig()result := pagination.SearchOrderAndPaginate(items, params, config)++ if s.vulnerabilityService != nil && len(result.Items) > 0 {+ pageImageIDs := getImageIDsFromSummariesInternal(result.Items)+ vulnerabilityMap, err := s.vulnerabilityService.GetScanSummariesByImageIDs(ctx, pageImageIDs)+ if err != nil {+ return nil, pagination.Response{}, err+ }+ applyVulnerabilitySummariesToItemsInternal(result.Items, vulnerabilityMap)+ }+paginationResp := pagination.BuildResponseFromFilterResult(result, params)return result.Items, paginationResp, nil@@ -712,6 +713,36 @@ func buildUpdateMap(records []models.ImageUpdateRecord) map[string]*models.Imagereturn updateMap}+func getImageIDsFromSummariesInternal(items []imagetypes.Summary) []string {+ seen := make(map[string]struct{}, len(items))+ ids := make([]string, 0, len(items))++ for _, item := range items {+ if item.ID == "" {+ continue+ }+ if _, exists := seen[item.ID]; exists {+ continue+ }+ seen[item.ID] = struct{}{}+ ids = append(ids, item.ID)+ }++ return ids+}++func applyVulnerabilitySummariesToItemsInternal(items []imagetypes.Summary, vulnerabilityMap map[string]*vulnerability.ScanSummary) {+ if len(items) == 0 || len(vulnerabilityMap) == 0 {+ return+ }++ for i := range items {+ if summary, exists := vulnerabilityMap[items[i].ID]; exists {+ items[i].VulnerabilityScan = summary+ }+ }+}+func parseRepoAndTagFromRepoTag(repoTag string) (repo, tag string) {if named, err := ref.ParseNormalizedNamed(repoTag); err == nil {repo = ref.FamiliarName(named)diff --git a/backend/internal/services/image_service_test.go b/backend/internal/services/image_service_test.gonew file mode 100644index 000000000..d3e913961--- /dev/null+++ b/backend/internal/services/image_service_test.go@@ -0,0 +1,41 @@+package services++import (+ "testing"++ imagetypes "github.com/getarcaneapp/arcane/types/image"+ "github.com/getarcaneapp/arcane/types/vulnerability"+ "github.com/stretchr/testify/assert"+)++func TestGetImageIDsFromSummariesInternal(t *testing.T) {+ items := []imagetypes.Summary{+ {ID: "img1"},+ {ID: "img2"},+ {ID: "img1"},+ {ID: ""},+ }++ got := getImageIDsFromSummariesInternal(items)+ assert.Equal(t, []string{"img1", "img2"}, got)+}++func TestApplyVulnerabilitySummariesToItemsInternal(t *testing.T) {+ items := []imagetypes.Summary{+ {ID: "img1"},+ {ID: "img2"},+ }++ summary := &vulnerability.ScanSummary{+ ImageID: "img1",+ Status: vulnerability.ScanStatusCompleted,+ }+ vulnerabilityMap := map[string]*vulnerability.ScanSummary{+ "img1": summary,+ }++ applyVulnerabilitySummariesToItemsInternal(items, vulnerabilityMap)++ assert.Equal(t, summary, items[0].VulnerabilityScan)+ assert.Nil(t, items[1].VulnerabilityScan)+}