Storage: Remove unified storage feature flag (#92192)

remove unified storage flag
This commit is contained in:
Ryan McKinley
2024-08-21 19:28:30 +03:00
committed by GitHub
parent 71f0dae39e
commit 2136fd9a92
11 changed files with 7 additions and 36 deletions
+4 -6
View File
@@ -61,12 +61,10 @@ func newResourceDBProvider(grafanaDB infraDB.DB, cfg *setting.Cfg, features feat
}
p = &resourceDBProvider{
cfg: cfg,
log: log.New("entity-db"),
logQueries: getter.Key("log_queries").MustBool(false),
}
if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorage) {
p.migrateFunc = migrations.MigrateResourceStore
cfg: cfg,
log: log.New("entity-db"),
logQueries: getter.Key("log_queries").MustBool(false),
migrateFunc: migrations.MigrateResourceStore,
}
switch dbType := getter.Key("db_type").MustString(""); dbType {
@@ -31,7 +31,7 @@ func newServer(t *testing.T) (sql.Backend, resource.ResourceServer) {
dbstore := infraDB.InitTestDB(t)
cfg := setting.NewCfg()
features := featuremgmt.WithFeatures(featuremgmt.FlagUnifiedStorage)
features := featuremgmt.WithFeatures()
eDB, err := dbimpl.ProvideResourceDB(dbstore, cfg, features, nil)
require.NoError(t, err)
@@ -331,7 +331,7 @@ func TestClientServer(t *testing.T) {
cfg.GRPCServerAddress = "localhost:0"
cfg.GRPCServerNetwork = "tcp"
features := featuremgmt.WithFeatures(featuremgmt.FlagUnifiedStorage)
features := featuremgmt.WithFeatures()
svc, err := sql.ProvideService(cfg, features, dbstore, nil)
require.NoError(t, err)