Zanzana: Add config options for Check and ListObjects queries (#94619)

* Zanzana: Add config options for Check and ListObjects queries

* remove fixme

* pass only zanzana settings
This commit is contained in:
Alexander Zobnin
2024-10-14 14:44:47 +03:00
committed by GitHub
parent 981aad6b77
commit fcfa4aa777
5 changed files with 25 additions and 9 deletions
+2 -2
View File
@@ -49,7 +49,7 @@ func ProvideZanzana(cfg *setting.Cfg, db db.DB, features featuremgmt.FeatureTogg
return nil, fmt.Errorf("failed to start zanzana: %w", err)
}
srv, err := zanzana.NewServer(store, logger)
srv, err := zanzana.NewServer(cfg, store, logger)
if err != nil {
return nil, fmt.Errorf("failed to start zanzana: %w", err)
}
@@ -104,7 +104,7 @@ func (z *Zanzana) start(ctx context.Context) error {
return fmt.Errorf("failed to initilize zanana store: %w", err)
}
srv, err := zanzana.NewServer(store, z.logger)
srv, err := zanzana.NewServer(z.cfg, store, z.logger)
if err != nil {
return fmt.Errorf("failed to start zanzana: %w", err)
}
@@ -107,7 +107,7 @@ func zanzanaServerIntegrationTest(tb testing.TB) *inprocgrpc.Channel {
store, err := zstore.NewEmbeddedStore(cfg, db, logger)
require.NoError(tb, err)
srv, err := zserver.New(store, logger)
srv, err := zserver.New(&cfg.Zanzana, store, logger)
require.NoError(tb, err)
channel := &inprocgrpc.Channel{}
+2 -2
View File
@@ -11,8 +11,8 @@ import (
zserver "github.com/grafana/grafana/pkg/services/authz/zanzana/server"
)
func NewServer(store storage.OpenFGADatastore, logger log.Logger) (*server.Server, error) {
return zserver.New(store, logger)
func NewServer(cfg *setting.Cfg, store storage.OpenFGADatastore, logger log.Logger) (*server.Server, error) {
return zserver.New(&cfg.Zanzana, store, logger)
}
func StartOpenFGAHttpSever(cfg *setting.Cfg, srv grpcserver.Provider, logger log.Logger) error {
+5 -2
View File
@@ -27,11 +27,14 @@ import (
zlogger "github.com/grafana/grafana/pkg/services/authz/zanzana/logger"
)
func New(store storage.OpenFGADatastore, logger log.Logger) (*server.Server, error) {
// FIXME(kalleep): add support for more options, tracing etc
func New(cfg *setting.ZanzanaSettings, store storage.OpenFGADatastore, logger log.Logger) (*server.Server, error) {
opts := []server.OpenFGAServiceV1Option{
server.WithDatastore(store),
server.WithLogger(zlogger.New(logger)),
server.WithCheckQueryCacheEnabled(cfg.CheckQueryCache),
server.WithCheckQueryCacheTTL(cfg.CheckQueryCacheTTL),
server.WithListObjectsMaxResults(cfg.ListObjectsMaxResults),
server.WithListObjectsDeadline(cfg.ListObjectsDeadline),
}
// FIXME(kalleep): Interceptors