IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

use in-process grpc client instead of wrapping server interface (#81926)

Browse Source 
* use in-process grpc client instead of wrapping server interface

* comment out jwt token checks until we're ready to validate the token
This commit is contained in:
Dan Cech
2024-02-07 13:17:02 -05:00
committed by GitHub
parent ba7e0d5c2e
commit 156d7ae194
8 changed files with 137 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/apiserver/service.go
View File

@@ -240,11 +240,13 @@ func (s *service) start(ctx context.Context) error {
return err
}
store, err := sqlstash.ProvideSQLEntityServer(eDB)
storeServer, err := sqlstash.ProvideSQLEntityServer(eDB)
if err != nil {
return err
}
store := entity.NewEntityStoreClientLocal(storeServer)
serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, o.RecommendedOptions.Etcd.StorageConfig.Codec)
case grafanaapiserveroptions.StorageTypeUnifiedGrpc:
@@ -259,7 +261,7 @@ func (s *service) start(ctx context.Context) error {
// defer conn.Close()
// Create a client instance
store := entity.NewEntityStoreClientWrapper(conn)
store := entity.NewEntityStoreClientGRPC(conn)
serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, o.RecommendedOptions.Etcd.StorageConfig.Codec)

4
pkg/services/apiserver/storage/entity/restoptions.go
View File

@@ -24,11 +24,11 @@ var _ generic.RESTOptionsGetter = (*RESTOptionsGetter)(nil)
type RESTOptionsGetter struct {
cfg *setting.Cfg
store entityStore.EntityStoreServer
store entityStore.EntityStoreClient
Codec runtime.Codec
}
func NewRESTOptionsGetter(cfg *setting.Cfg, store entityStore.EntityStoreServer, codec runtime.Codec) *RESTOptionsGetter {
func NewRESTOptionsGetter(cfg *setting.Cfg, store entityStore.EntityStoreClient, codec runtime.Codec) *RESTOptionsGetter {
return &RESTOptionsGetter{
cfg: cfg,
store: store,

4
pkg/services/apiserver/storage/entity/storage.go
View File

@@ -36,7 +36,7 @@ const MaxUpdateAttempts = 1
// Storage implements storage.Interface and storage resources as JSON files on disk.
type Storage struct {
config *storagebackend.ConfigForResource
store entityStore.EntityStoreServer
store entityStore.EntityStoreClient
gr schema.GroupResource
codec runtime.Codec
keyFunc func(obj runtime.Object) (string, error)
@@ -52,7 +52,7 @@ type Storage struct {
func NewStorage(
config *storagebackend.ConfigForResource,
gr schema.GroupResource,
store entityStore.EntityStoreServer,
store entityStore.EntityStoreClient,
codec runtime.Codec,
keyFunc func(obj runtime.Object) (string, error),
newFunc func() runtime.Object,