EntityStore: Rename ObjectStore to EntityStore (part 2) (#59616)

pkg/services/sqlstore/migrations/entity_store_mig.go

@@ -18,7 +18,7 @@ func getLatinPathColumn(name string) *migrator.Column {
 	}
 }
 
-func addObjectStorageMigrations(mg *migrator.Migrator) {
+func addEntityStoreMigrations(mg *migrator.Migrator) {
 	grnLength := 256 // len(tenant)~8 + len(kind)!16 + len(kind)~128 = 256
 	tables := []migrator.Table{}
 	tables = append(tables, migrator.Table{

pkg/services/sqlstore/migrations/migrations.go

@@ -83,8 +83,8 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 			addCommentMigrations(mg)
 		}
 
-		if mg.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagObjectStore) {
-			addObjectStorageMigrations(mg)
+		if mg.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagEntityStore) {
+			addEntityStoreMigrations(mg)
 		}
 	}
 

pkg/services/sqlstore/sqlstore.go

@@ -489,7 +489,7 @@ var featuresEnabledDuringTests = []string{
 	featuremgmt.FlagDashboardPreviews,
 	featuremgmt.FlagDashboardComments,
 	featuremgmt.FlagPanelTitleSearch,
-	featuremgmt.FlagObjectStore,
+	featuremgmt.FlagEntityStore,
 }
 
 // InitTestDBWithMigration initializes the test DB given custom migrations.