stackrox · ajheflin · Sep 3, 2025 · Aug 27, 2025 · Aug 27, 2025 · Aug 29, 2025
diff --git a/central/graphql/resolvers/components_v1.go b/central/graphql/resolvers/components_v1.go
@@ -206,15 +206,22 @@ func (eicr *EmbeddedImageScanComponentResolver) Images(ctx context.Context, args
 
 // ImageCount is the number of images that contain the Component.
 func (eicr *EmbeddedImageScanComponentResolver) ImageCount(ctx context.Context, args RawQuery) (int32, error) {
-	imageLoader, err := loaders.GetImageLoader(ctx)
+	query, err := args.AsV1QueryOrEmpty()
 	if err != nil {
 		return 0, err
 	}
-	query, err := args.AsV1QueryOrEmpty()
+	query, err = search.AddAsConjunction(eicr.componentQuery(), query)
 	if err != nil {
 		return 0, err
 	}
-	query, err = search.AddAsConjunction(eicr.componentQuery(), query)
+	if features.FlattenImageData.Enabled() {
+		imageLoader, err := loaders.GetImageV2Loader(ctx)
+		if err != nil {
+			return 0, err
+		}
+		return imageLoader.CountFromQuery(ctx, query)
+	}
+	imageLoader, err := loaders.GetImageLoader(ctx)
 	if err != nil {
 		return 0, err
 	}
@@ -388,18 +395,21 @@ func (eicr *EmbeddedImageScanComponentResolver) loadDeployments(ctx context.Cont
 
 func (eicr *EmbeddedImageScanComponentResolver) getDeploymentBaseQuery(ctx context.Context) (*v1.Query, error) {
 	imageQuery := eicr.componentQuery()
-	results, err := eicr.root.ImageDataStore.Search(ctx, imageQuery)
-	if err != nil || len(results) == 0 {
-		return nil, err
-	}
-
-	// Create a query that finds all of the deployments that contain at least one of the infected images.
+	var results []search.Result
+	var err error
 	var searchField search.FieldLabel
 	if features.FlattenImageData.Enabled() {
+		results, err = eicr.root.ImageV2DataStore.Search(ctx, imageQuery)
 		searchField = search.ImageID
 	} else {
+		results, err = eicr.root.ImageDataStore.Search(ctx, imageQuery)
 		searchField = search.ImageSHA
 	}
+	if err != nil || len(results) == 0 {
+		return nil, err
+	}
+
+	// Create a query that finds all of the deployments that contain at least one of the infected images.
 	return search.NewQueryBuilder().AddExactMatches(searchField, search.ResultsToIDs(results)...).ProtoQuery(), nil
 }
 

diff --git a/central/graphql/resolvers/image_components.go b/central/graphql/resolvers/image_components.go
@@ -357,7 +357,11 @@ func getImageIDFromScope(contexts ...context.Context) string {
 	var scope scoped.Scope
 	var hasScope bool
 	for _, ctx := range contexts {
-		if scope, hasScope = scoped.GetScopeAtLevel(ctx, v1.SearchCategory_IMAGES); hasScope {
+		searchCategory := v1.SearchCategory_IMAGES
+		if features.FlattenImageData.Enabled() {
+			searchCategory = v1.SearchCategory_IMAGES_V2
+		}
+		if scope, hasScope = scoped.GetScopeAtLevel(ctx, searchCategory); hasScope {
 			if len(scope.IDs) != 1 {
 				return ""
 			}
@@ -477,7 +481,13 @@ func (resolver *imageComponentResolver) ActiveState(ctx context.Context, args Ra
 			return nil, err
 		}
 	} else {
-		query := search.NewQueryBuilder().AddExactMatches(search.ImageSHA, imageID).ProtoQuery()
+		var searchField search.FieldLabel
+		if features.FlattenImageData.Enabled() {
+			searchField = search.ImageID
+		} else {
+			searchField = search.ImageSHA
+		}
+		query := search.NewQueryBuilder().AddExactMatches(searchField, imageID).ProtoQuery()
 		results, err := resolver.root.ActiveComponent.Search(ctx, query)
 		if err != nil {
 			return nil, err
@@ -559,6 +569,33 @@ func (resolver *imageComponentResolver) LastScanned(ctx context.Context) (*graph
 		return &graphql.Time{Time: *scanTime}, nil
 	}
 
+	if features.FlattenImageData.Enabled() {
+		imageLoader, err := loaders.GetImageV2Loader(resolver.ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		q := resolver.componentQuery()
+		q.Pagination = &v1.QueryPagination{
+			Limit:  1,
+			Offset: 0,
+			SortOptions: []*v1.QuerySortOption{
+				{
+					Field:    search.ImageScanTime.String(),
+					Reversed: true,
+				},
+			},
+		}
+
+		images, err := imageLoader.FromQuery(resolver.ctx, q)
+		if err != nil || len(images) == 0 {
+			return nil, err
+		} else if len(images) > 1 {
+			return nil, errors.New("multiple images matched for last scanned image component query")
+		}
+
+		return protocompat.ConvertTimestampToGraphqlTimeOrError(images[0].GetScan().GetScanTime())
+	}
 	imageLoader, err := loaders.GetImageLoader(resolver.ctx)
 	if err != nil {
 		return nil, err
@@ -610,7 +647,13 @@ func (resolver *imageComponentResolver) Location(ctx context.Context, args RawQu
 		return "", nil
 	}
 
-	query := search.NewQueryBuilder().AddExactMatches(search.ImageSHA, imageID).AddExactMatches(search.ComponentID, resolver.data.GetId()).ProtoQuery()
+	var searchField search.FieldLabel
+	if features.FlattenImageData.Enabled() {
+		searchField = search.ImageID
+	} else {
+		searchField = search.ImageSHA
+	}
+	query := search.NewQueryBuilder().AddExactMatches(searchField, imageID).AddExactMatches(search.ComponentID, resolver.data.GetId()).ProtoQuery()
 	edges, err := resolver.root.ImageComponentEdgeDataStore.SearchRawEdges(resolver.ctx, query)
 	if err != nil || len(edges) == 0 {
 		return "", err
@@ -760,6 +803,22 @@ func (resolver *imageComponentV2Resolver) LastScanned(ctx context.Context) (*gra
 		return &graphql.Time{Time: *scanTime}, nil
 	}
 
+	if features.FlattenImageData.Enabled() {
+		imageLoader, err := loaders.GetImageV2Loader(resolver.ctx)
+		if err != nil {
+			return nil, err
+		}
+		q := search.NewQueryBuilder().AddExactMatches(search.ImageID, resolver.data.GetImageIdV2()).ProtoQuery()
+
+		images, err := imageLoader.FromQuery(resolver.ctx, q)
+		if err != nil || len(images) == 0 {
+			return nil, err
+		} else if len(images) > 1 {
+			return nil, errors.New("multiple images matched for last scanned image component query")
+		}
+
+		return protocompat.ConvertTimestampToGraphqlTimeOrError(images[0].GetScan().GetScanTime())
+	}
 	imageLoader, err := loaders.GetImageLoader(resolver.ctx)
 	if err != nil {
 		return nil, err

diff --git a/central/graphql/resolvers/image_cve_core.go b/central/graphql/resolvers/image_cve_core.go
@@ -292,7 +292,13 @@ func (resolver *imageCVECoreResolver) Images(ctx context.Context, args struct{ P
 		return nil, nil
 	}
 
-	imageQ := search.NewQueryBuilder().AddExactMatches(search.ImageSHA, imageIDs...).Query()
+	var searchField search.FieldLabel
+	if features.FlattenImageData.Enabled() {
+		searchField = search.ImageID
+	} else {
+		searchField = search.ImageSHA
+	}
+	imageQ := search.NewQueryBuilder().AddExactMatches(searchField, imageIDs...).Query()
 	return resolver.root.Images(ctx, PaginatedQuery{
 		Query:      pointers.String(imageQ),
 		Pagination: args.Pagination,

diff --git a/central/graphql/resolvers/image_scan.go b/central/graphql/resolvers/image_scan.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stackrox/rox/central/graphql/resolvers/loaders"
 	"github.com/stackrox/rox/central/image/datastore/store/common/v2"
 	"github.com/stackrox/rox/central/image/mappings"
+	commonv2 "github.com/stackrox/rox/central/imagev2/datastore/store/common"
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/generated/storage"
 	"github.com/stackrox/rox/pkg/features"
@@ -100,6 +101,66 @@ func getImageComponentV2Resolvers(ctx context.Context, root *Resolver, imageScan
 		return nil, nil
 	}
 
+	if features.FlattenImageData.Enabled() {
+		imageLoader, err := loaders.GetImageV2Loader(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		image, err := imageLoader.FullImageWithID(ctx, imageID)
+		if err != nil {
+			return nil, err
+		}
+
+		query, _ = search.FilterQueryWithMap(query, mappings.ComponentV2OptionsMap)
+		predicate, err := componentPredicateFactory.GeneratePredicate(query)
+		if err != nil {
+			return nil, err
+		}
+
+		idToComponent := make(map[string]*imageComponentV2Resolver)
+		for _, embeddedComponent := range imageScan.GetComponents() {
+			if !predicate.Matches(embeddedComponent) {
+				continue
+			}
+
+			os := imageScan.GetOperatingSystem()
+			id, err := scancomponent.ComponentIDV2(embeddedComponent, imageID)
+			if err != nil {
+				return nil, err
+			}
+			if _, exists := idToComponent[id]; !exists {
+				component, err := commonv2.GenerateImageComponentV2(os, image, embeddedComponent)
+				if err != nil {
+					return nil, err
+				}
+
+				resolver, err := root.wrapImageComponentV2(component, true, nil)
+				if err != nil {
+					return nil, err
+				}
+				imageScanTime := protocompat.ConvertTimestampToTimeOrNil(imageScan.GetScanTime())
+				resolver.ctx = embeddedobjs.ComponentContext(ctx, os, imageScanTime, embeddedComponent)
+				idToComponent[id] = resolver
+			}
+		}
+
+		// For now, sort by IDs.
+		resolvers := make([]*imageComponentV2Resolver, 0, len(idToComponent))
+		for _, component := range idToComponent {
+			resolvers = append(resolvers, component)
+		}
+		if len(query.GetPagination().GetSortOptions()) == 0 {
+			sort.SliceStable(resolvers, func(i, j int) bool {
+				return resolvers[i].data.GetId() < resolvers[j].data.GetId()
+			})
+		}
+		resolverI := make([]ImageComponentResolver, 0, len(resolvers))
+		for _, resolver := range resolvers {
+			resolverI = append(resolverI, resolver)
+		}
+		return paginate(query.GetPagination(), resolverI, nil)
+	}
 	imageLoader, err := loaders.GetImageLoader(ctx)
 	if err != nil {
 		return nil, err