diff --git a/compose/service/service.go b/compose/service/service.go index cca47fe2f..2623e39a0 100644 --- a/compose/service/service.go +++ b/compose/service/service.go @@ -108,7 +108,9 @@ func Initialize(ctx context.Context, log *zap.Logger, c Config) (err error) { if DefaultPermissions == nil { // Do not override permissions service stored under DefaultPermissions // to allow integration tests to inject own permission service - DefaultPermissions = permissions.Service(ctx, DefaultLogger, db, "compose_permission_rules") + rbac := permissions.Service(DefaultLogger, db, "compose_permission_rules") + rbac.Reload(ctx) + DefaultPermissions = rbac } DefaultAccessControl = AccessControl(DefaultPermissions) diff --git a/messaging/service/service.go b/messaging/service/service.go index b1c62f788..53b0046a4 100644 --- a/messaging/service/service.go +++ b/messaging/service/service.go @@ -84,7 +84,9 @@ func Initialize(ctx context.Context, log *zap.Logger, c Config) (err error) { if DefaultPermissions == nil { // Do not override permissions service stored under DefaultPermissions // to allow integration tests to inject own permission service - DefaultPermissions = permissions.Service(ctx, DefaultLogger, repository.DB(ctx), "messaging_permission_rules") + rbac := permissions.Service(DefaultLogger, repository.DB(ctx), "messaging_permission_rules") + rbac.Reload(ctx) + DefaultPermissions = rbac } DefaultAccessControl = AccessControl(DefaultPermissions) diff --git a/pkg/permissions/service.go b/pkg/permissions/service.go index 370087806..51691d320 100644 --- a/pkg/permissions/service.go +++ b/pkg/permissions/service.go @@ -36,7 +36,7 @@ const ( // // service{} struct preloads, checks, grants and flushes privileges to and from repository // It acts as a caching layer -func Service(ctx context.Context, logger *zap.Logger, db *factory.DB, tbl string) (svc *service) { +func Service(logger *zap.Logger, db *factory.DB, tbl string) (svc *service) { svc = &service{ l: &sync.Mutex{}, f: make(chan bool), diff --git a/system/service/service.go b/system/service/service.go index d1405c488..78b20d314 100644 --- a/system/service/service.go +++ b/system/service/service.go @@ -118,7 +118,9 @@ func Initialize(ctx context.Context, log *zap.Logger, c Config) (err error) { if DefaultPermissions == nil { // Do not override permissions service stored under DefaultPermissions // to allow integration tests to inject own permission service - DefaultPermissions = permissions.Service(ctx, DefaultLogger, repository.DB(ctx), "sys_permission_rules") + rbac := permissions.Service(DefaultLogger, repository.DB(ctx), "sys_permission_rules") + rbac.Reload(ctx) + DefaultPermissions = rbac } DefaultAccessControl = AccessControl(DefaultPermissions)