Fix kvstore wire (#111827)

pkg/storage/unified/sql/server.go

@@ -30,6 +30,7 @@ type QOSEnqueueDequeuer interface {
 
 // ServerOptions contains the options for creating a new ResourceServer
 type ServerOptions struct {
+	Backend        resource.StorageBackend
 	DB             infraDB.DB
 	Cfg            *setting.Cfg
 	Tracer         trace.Tracer
@@ -87,29 +88,35 @@ func NewResourceServer(opts ServerOptions) (resource.ResourceServer, error) {
 	maxPageSizeBytes := unifiedStorageCfg.Key("max_page_size_bytes")
 	serverOptions.MaxPageSizeBytes = maxPageSizeBytes.MustInt(0)
 
-	eDB, err := dbimpl.ProvideResourceDB(opts.DB, opts.Cfg, opts.Tracer)
-	if err != nil {
-		return nil, err
+	if opts.Backend != nil {
+		serverOptions.Backend = opts.Backend
+		// TODO: we should probably have a proper interface for diagnostics/lifecycle
+	} else {
+		eDB, err := dbimpl.ProvideResourceDB(opts.DB, opts.Cfg, opts.Tracer)
+		if err != nil {
+			return nil, err
+		}
+
+		isHA := isHighAvailabilityEnabled(opts.Cfg.SectionWithEnvOverrides("database"),
+			opts.Cfg.SectionWithEnvOverrides("resource_api"))
+		withPruner := opts.Features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageHistoryPruner)
+
+		backend, err := NewBackend(BackendOptions{
+			DBProvider:     eDB,
+			Tracer:         opts.Tracer,
+			Reg:            opts.Reg,
+			IsHA:           isHA,
+			withPruner:     withPruner,
+			storageMetrics: opts.StorageMetrics,
+		})
+		if err != nil {
+			return nil, err
+		}
+		serverOptions.Backend = backend
+		serverOptions.Diagnostics = backend
+		serverOptions.Lifecycle = backend
 	}
 
-	isHA := isHighAvailabilityEnabled(opts.Cfg.SectionWithEnvOverrides("database"),
-		opts.Cfg.SectionWithEnvOverrides("resource_api"))
-	withPruner := opts.Features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageHistoryPruner)
-
-	store, err := NewBackend(BackendOptions{
-		DBProvider:     eDB,
-		Tracer:         opts.Tracer,
-		Reg:            opts.Reg,
-		IsHA:           isHA,
-		withPruner:     withPruner,
-		storageMetrics: opts.StorageMetrics,
-	})
-	if err != nil {
-		return nil, err
-	}
-	serverOptions.Backend = store
-	serverOptions.Diagnostics = store
-	serverOptions.Lifecycle = store
 	serverOptions.Search = opts.SearchOptions
 	serverOptions.IndexMetrics = opts.IndexMetrics
 	serverOptions.QOSQueue = opts.QOSQueue