first cut of dskit-ification of entity store

grafana · Jul 5, 2023 · b43a9bc · b43a9bc
1 parent 3d1f114
commit b43a9bc
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 235 deletions.
diff --git a/pkg/modules/dependencies.go b/pkg/modules/dependencies.go
@@ -11,16 +11,17 @@ const (
 	KubernetesRegistration string = "kubernetes-registration"
 	Kubernetes             string = "kubernetes"
 	KubernetesClientset    string = "kubernetes-clientset"
+	EntityStore            string = "entity-store"
 
 	Provisioning string = "provisioning"
 )
 
 var DependencyMap = map[string][]string{
 	CertGenerator: {},
 
-	HTTPServer: {CertGenerator},
+	HTTPServer: {CertGenerator, EntityStore},
 
-	KubernetesAPIServer:    {CertGenerator},
+	KubernetesAPIServer:    {CertGenerator, EntityStore},
 	KubernetesRegistration: {KubernetesAPIServer},
 	KubernetesClientset:    {KubernetesRegistration},
 	Kubernetes:             {KubernetesClientset},

diff --git a/pkg/modules/registry/registry.go b/pkg/modules/registry/registry.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/k8s/apiserver"
 	"github.com/grafana/grafana/pkg/services/k8s/client"
 	"github.com/grafana/grafana/pkg/services/provisioning"
+	"github.com/grafana/grafana/pkg/services/store/entity"
 )
 
 type Registry interface{}
@@ -27,6 +28,7 @@ func ProvideRegistry(
 	httpServer *api.HTTPServer,
 	provisioning *provisioning.ProvisioningServiceImpl,
 	coreGRDRegistry *coregrd.Registry,
+	entityService entity.EntityStoreService,
 ) *registry {
 	return NewRegistry(
 		moduleManager,
@@ -36,6 +38,7 @@ func ProvideRegistry(
 		httpServer,
 		provisioning,
 		coreGRDRegistry,
+		entityService,
 	)
 }
 

diff --git a/pkg/server/wire.go b/pkg/server/wire.go
@@ -128,6 +128,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/star/starimpl"
 	"github.com/grafana/grafana/pkg/services/stats/statsimpl"
 	"github.com/grafana/grafana/pkg/services/store"
+	"github.com/grafana/grafana/pkg/services/store/entity"
 	entityDB "github.com/grafana/grafana/pkg/services/store/entity/db"
 	"github.com/grafana/grafana/pkg/services/store/entity/httpentitystore"
 	"github.com/grafana/grafana/pkg/services/store/entity/sqlstash"
@@ -343,6 +344,8 @@ var wireBasicSet = wire.NewSet(
 	kind.ProvideService, // The registry of known kinds
 	entityDB.ProvideEntityDB,
 	sqlstash.ProvideSQLEntityServer,
+	wire.Bind(new(entity.EntityStoreServer), new(*sqlstash.EntityServer)),
+	wire.Bind(new(entity.EntityStoreService), new(*sqlstash.EntityServer)),
 	resolver.ProvideEntityReferenceResolver,
 	httpentitystore.ProvideHTTPEntityStore,
 	teamimpl.ProvideService,

diff --git a/pkg/services/playlist/playlistimpl/entity_store.go b/pkg/services/playlist/playlistimpl/entity_store.go
diff --git a/pkg/services/playlist/playlistimpl/playlist.go b/pkg/services/playlist/playlistimpl/playlist.go
@@ -6,7 +6,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/playlist"
-	"github.com/grafana/grafana/pkg/services/store/entity"
 )
 
 type Service struct {
@@ -15,7 +14,7 @@ type Service struct {
 
 var _ playlist.Service = &Service{}
 
-func ProvideService(db db.DB, toggles featuremgmt.FeatureToggles, objserver entity.EntityStoreServer) playlist.Service {
+func ProvideService(db db.DB, toggles featuremgmt.FeatureToggles) playlist.Service {
 	var sqlstore store
 
 	// 🐢🐢🐢 pick the store
@@ -28,20 +27,7 @@ func ProvideService(db db.DB, toggles featuremgmt.FeatureToggles, objserver enti
 			db: db,
 		}
 	}
-	svc := &Service{store: sqlstore}
-
-	// FlagObjectStore is only supported in development mode
-	if false && toggles.IsEnabled(featuremgmt.FlagEntityStore) {
-		impl := &entityStoreImpl{
-			sqlimpl: svc,
-			store:   objserver,
-			sess:    db.GetSqlxSession(),
-		}
-		impl.sync() // load everythign from the existing SQL setup into the new object store
-		return impl
-	}
-
-	return svc
+	return &Service{store: sqlstore}
 }
 
 func (s *Service) Create(ctx context.Context, cmd *playlist.CreatePlaylistCommand) (*playlist.Playlist, error) {

diff --git a/pkg/services/store/entity/db/service.go b/pkg/services/store/entity/db/service.go
@@ -34,7 +34,6 @@ func ProvideEntityDB(db db.DB, cfg *setting.Cfg) (EntityDB, error) {
 				return nil, fmt.Errorf("invalid host specifier '%s': %w", dbHost, err)
 			}
 
-
 			connectionString := fmt.Sprintf(
 				"user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", // sslcert=%s sslkey=%s sslrootcert=%s",
 				dbUser, dbPass, addr.Host, addr.Port, dbName, dbSslMode, // ss.dbCfg.ClientCertPath, ss.dbCfg.ClientKeyPath, ss.dbCfg.CaCertPath

diff --git a/pkg/services/store/entity/httpentitystore/service.go b/pkg/services/store/entity/httpentitystore/service.go
@@ -30,7 +30,7 @@ type httpEntityStore struct {
 	kinds kind.KindRegistry
 }
 
-func ProvideHTTPEntityStore(store entity.EntityStoreServer, kinds kind.KindRegistry) HTTPEntityStore {
+func ProvideHTTPEntityStore(store entity.EntityStoreService, kinds kind.KindRegistry) HTTPEntityStore {
 	return &httpEntityStore{
 		store: store,
 		log:   log.New("http-entity-store"),

diff --git a/pkg/services/store/entity/service.go b/pkg/services/store/entity/service.go
@@ -0,0 +1,15 @@
+package entity
+
+import (
+	"github.com/grafana/dskit/services"
+)
+
+type EntityStoreService interface {
+	services.NamedService
+	EntityStoreServer
+}
+
+type EntityStoreAdminService interface {
+	services.NamedService
+	EntityStoreAdminServer
+}