stackrox · charmik-redhat · Jan 19, 2026 · Jan 26, 2026 · Jan 26, 2026 · Jan 27, 2026
diff --git a/central/image/datastore/singleton.go b/central/image/datastore/singleton.go
@@ -6,7 +6,6 @@ import (
 	pgStoreV2 "github.com/stackrox/rox/central/image/datastore/store/v2/postgres"
 	"github.com/stackrox/rox/central/ranking"
 	riskDS "github.com/stackrox/rox/central/risk/datastore"
-	"github.com/stackrox/rox/pkg/features"
 	"github.com/stackrox/rox/pkg/sync"
 )
 
@@ -23,9 +22,6 @@ func initialize() {
 
 // Singleton provides the interface for non-service external interaction.
 func Singleton() DataStore {
-	if features.FlattenImageData.Enabled() {
-		return nil
-	}
 	once.Do(initialize)
 	return ad
 }
@@ -0,0 +1,79 @@
+//go:build sql_integration
+
+package m223tom224
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stackrox/rox/migrator/migrations/m_223_to_m_224_populate_deployment_containers_imageidv2/schema"
+	pghelper "github.com/stackrox/rox/migrator/migrations/postgreshelper"
+	"github.com/stackrox/rox/migrator/types"
+	"github.com/stackrox/rox/pkg/postgres/pgutils"
+	"github.com/stackrox/rox/pkg/sac"
+	"github.com/stackrox/rox/pkg/uuid"
+)
+
+func BenchmarkMigration(b *testing.B) {
+	ctx := sac.WithAllAccess(context.Background())
+	db := pghelper.ForT(b, false)
+	pgutils.CreateTableFromModel(ctx, db.GetGormDB(), schema.CreateTableDeploymentsStmt)
+
+	const numDeployments = 100
+	const containersPerDeployment = 5
+	totalContainers := numDeployments * containersPerDeployment
+
+	// Insert deployments and containers.
+	for i := 0; i < numDeployments; i++ {
+		depID := uuid.NewV4().String()
+		err := insertIntoDeployments(ctx, db, &schema.Deployments{
+			ID:        depID,
+			Name:      fmt.Sprintf("dep-%d", i),
+			Type:      "Deployment",
+			Namespace: "default",
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+		for j := 0; j < containersPerDeployment; j++ {
+			sql := "INSERT INTO deployments_containers (image_name_fullname, image_id, deployments_id, idx) VALUES ($1, $2, $3, $4)"
+			fullName := fmt.Sprintf("registry.example.com/image-%d:%d@sha256:%064x", i, j, i*containersPerDeployment+j)
+			imageID := fmt.Sprintf("sha256:%064x", i*containersPerDeployment+j)
+			_, err := db.Exec(ctx, sql, fullName, imageID, depID, j)
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+	}
+
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		// Reset image_idv2 so the migration has work to do each iteration.
+		_, err := db.Exec(ctx, "UPDATE deployments_containers SET image_idv2 = ''")
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		batchSize = 5000
+		dbs := &types.Databases{
+			GormDB:     db.GetGormDB(),
+			PostgresDB: db.DB,
+			DBCtx:      ctx,
+		}
+		if err := migrate(dbs); err != nil {
+			b.Fatal(err)
+		}
+	}
+	b.StopTimer()
+
+	// Verify all rows were populated.
+	var count int
+	err := db.QueryRow(ctx, "SELECT COUNT(*) FROM deployments_containers WHERE image_idv2 != '' AND image_idv2 IS NOT NULL").Scan(&count)
+	if err != nil {
+		b.Fatal(err)
+	}
+	if count != totalContainers {
+		b.Fatalf("expected %d containers with image_idv2, got %d", totalContainers, count)
+	}
+}
@@ -0,0 +1,94 @@
+package m223tom224
+
+import (
+	"github.com/hashicorp/go-multierror"
+	"github.com/jackc/pgx/v5"
+	"github.com/stackrox/rox/migrator/migrations/m_223_to_m_224_populate_deployment_containers_imageidv2/schema"
+	"github.com/stackrox/rox/migrator/types"
+	"github.com/stackrox/rox/pkg/logging"
+	"github.com/stackrox/rox/pkg/postgres"
+	"github.com/stackrox/rox/pkg/postgres/pgutils"
+	"github.com/stackrox/rox/pkg/uuid"
+)
+
+var (
+	log       = logging.LoggerForModule()
+	batchSize = 5000
+)
+
+func migrate(database *types.Databases) error {
+	// Use databases.DBCtx to take advantage of the transaction wrapping present in the migration initiator
+	pgutils.CreateTableFromModel(database.DBCtx, database.GormDB, schema.CreateTableDeploymentsStmt)
+	log.Infof("Batch size is %d", batchSize)
+
+	db := database.PostgresDB
+
+	conn, err := db.Acquire(database.DBCtx)
+	defer conn.Release()
+	if err != nil {
+		return err
+	}
+	updatedRows := 0
+	for {
+		batch := pgx.Batch{}
+		// This will continue looping through the containers until there are no more containers that need to have their
+		// image_idv2 field populated, in batches up to batchSize
+		getStmt := `SELECT image_name_fullname, image_id FROM deployments_containers WHERE image_id is not null AND image_id != '' AND image_name_fullname is not null AND image_name_fullname != '' AND (image_idv2 is null OR image_idv2 = '') LIMIT $1`
+		rows, err := db.Query(database.DBCtx, getStmt, batchSize)
+		if err != nil {
+			return err
+		}
+		defer rows.Close()
+
+		containers, err := readRows(rows)
+		if err != nil {
+			return err
+		}
+		for _, container := range containers {
+			updateStmt := `UPDATE deployments_containers SET image_idv2 = $1 WHERE image_name_fullname = $2 AND image_id = $3`
+			imageIdV2 := uuid.NewV5FromNonUUIDs(container.ImageNameFullName, container.ImageID).String()
+			batch.Queue(updateStmt, imageIdV2, container.ImageNameFullName, container.ImageID)
+		}
+		batchResults := conn.SendBatch(database.DBCtx, &batch)
+		var result *multierror.Error
+		for i := 0; i < batch.Len(); i++ {
+			_, err = batchResults.Exec()
+			result = multierror.Append(result, err)
+			if err == nil {
+				updatedRows += 1
+			}
+		}
+		if err = batchResults.Close(); err != nil {
+			return err
+		}
+		if err = result.ErrorOrNil(); err != nil {
+			return err
+		}
+		if len(containers) != batchSize {
+			log.Infof("Populated the image_idv2 field in deployment containers. %d rows updated.", updatedRows)
+			return nil
+		}
+	}
+}
+
+func readRows(rows *postgres.Rows) ([]*schema.DeploymentsContainers, error) {
+	var containers []*schema.DeploymentsContainers
+
+	for rows.Next() {
+		var imageName string
+		var imageId string
+
+		if err := rows.Scan(&imageName, &imageId); err != nil {
+			log.Errorf("Error scanning row: %v", err)
+		}
+
+		container := &schema.DeploymentsContainers{
+			ImageID:           imageId,
+			ImageNameFullName: imageName,
+		}
+		containers = append(containers, container)
+	}
+
+	log.Debugf("Read returned %d containers", len(containers))
+	return containers, rows.Err()
+}
-	for rows.Next() {
-		var imageName string
-		var imageId string
-
-		if err := rows.Scan(&imageName, &imageId); err != nil {
-			log.Errorf("Error scanning row: %v", err)
-		}
-
-		container := &schema.DeploymentsContainers{
-			ImageID:           imageId,
-			ImageNameFullName: imageName,
-		}
-		containers = append(containers, container)
-	}
-
-	log.Debugf("Read returned %d containers", len(containers))
-	return containers, rows.Err()
-}
+	for rows.Next() {
+		var imageName string
+		var imageId string
+
+		if err := rows.Scan(&imageName, &imageId); err != nil {
+			return nil, err
+		}
+
+		container := &schema.DeploymentsContainers{
+			ImageID:           imageId,
+			ImageNameFullName: imageName,
+		}
+		containers = append(containers, container)
+	}
+
+	log.Debugf("Read returned %d containers", len(containers))
+	return containers, rows.Err()
+}
-	for rows.Next() {
-		var imageName string
-		var imageId string
-
-		if err := rows.Scan(&imageName, &imageId); err != nil {
-			log.Errorf("Error scanning row: %v", err)
-		}
-
-		container := &schema.DeploymentsContainers{
-			ImageID:           imageId,
-			ImageNameFullName: imageName,
-		}
-		containers = append(containers, container)
-	}
-
-	log.Debugf("Read returned %d containers", len(containers))
-	return containers, rows.Err()
-}
+	for rows.Next() {
+		var imageName string
+		var imageId string
+
+		if err := rows.Scan(&imageName, &imageId); err != nil {
+			return nil, err
+		}
+
+		container := &schema.DeploymentsContainers{
+			ImageID:           imageId,
+			ImageNameFullName: imageName,
+		}
+		containers = append(containers, container)
+	}
+
+	log.Debugf("Read returned %d containers", len(containers))
+	return containers, rows.Err()
+}