root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 73 Packages Projects Releases Wiki Activity

to revert: fix dependency cycle

This commit is contained in:
Artur Wierzbicki 2022-04-27 17:08:17 +04:00
parent 3d0658f707
commit 1ffbee73ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go
View File

@ -15,11 +15,11 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )
func ProvideService(features featuremgmt.FeatureToggles, usageStats usagestats.Service, func ProvideService(features featuremgmt.FeatureToggles,
provider accesscontrol.PermissionsProvider, routeRegister routing.RouteRegister) (*OSSAccessControlService, error) { provider accesscontrol.PermissionsProvider, routeRegister routing.RouteRegister) (*OSSAccessControlService, error) {
var errDeclareRoles error var errDeclareRoles error
s := ProvideOSSAccessControl(features, provider) s := ProvideOSSAccessControl(features, provider)
s.registerUsageMetrics(usageStats) //s.registerUsageMetrics(usageStats)
if !s.IsDisabled() { if !s.IsDisabled() {
api := api.AccessControlAPI{ api := api.AccessControlAPI{
RouteRegister: routeRegister, RouteRegister: routeRegister,