From d1df8969621a268510ee0a418486072cca2ab723 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Tue, 16 Aug 2022 17:33:24 +0200
Subject: [PATCH] Remove unsued dep (#53785)

---
 pkg/api/common_test.go                                      | 2 +-
 .../accesscontrol/ossaccesscontrol/ossaccesscontrol.go      | 6 +-----
 .../accesscontrol/ossaccesscontrol/ossaccesscontrol_test.go | 2 --
 pkg/services/publicdashboards/api/common_test.go            | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 245d9982eff..759cd48872c 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -376,7 +376,7 @@ func setupHTTPServerWithCfgDb(
 		ac = acmock
 	} else {
 		var err error
-		ac, err = ossaccesscontrol.ProvideService(features, cfg, database.ProvideService(db), routeRegister)
+		ac, err = ossaccesscontrol.ProvideService(cfg, database.ProvideService(db), routeRegister)
 		require.NoError(t, err)
 	}
 
diff --git a/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go b/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go
index 39d80206378..14f8c1da05d 100644
--- a/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go
+++ b/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go
@@ -8,16 +8,12 @@ import (
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/api"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func ProvideService(
-	features featuremgmt.FeatureToggles, cfg *setting.Cfg,
-	store accesscontrol.PermissionsStore, routeRegister routing.RouteRegister,
-) (*OSSAccessControlService, error) {
+func ProvideService(cfg *setting.Cfg, store accesscontrol.PermissionsStore, routeRegister routing.RouteRegister) (*OSSAccessControlService, error) {
 	var errDeclareRoles error
 	s := ProvideOSSAccessControl(cfg, store)
 	if !s.IsDisabled() {
diff --git a/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol_test.go b/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol_test.go
index 264b455891f..a6f2a5406ce 100644
--- a/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol_test.go
+++ b/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/database"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -142,7 +141,6 @@ func TestUsageMetrics(t *testing.T) {
 			cfg.RBACEnabled = tt.enabled
 
 			s, errInitAc := ProvideService(
-				featuremgmt.WithFeatures(),
 				cfg,
 				database.ProvideService(sqlstore.InitTestDB(t)),
 				routing.NewRouteRegister(),
diff --git a/pkg/services/publicdashboards/api/common_test.go b/pkg/services/publicdashboards/api/common_test.go
index 931ea7e760e..e0d37100d15 100644
--- a/pkg/services/publicdashboards/api/common_test.go
+++ b/pkg/services/publicdashboards/api/common_test.go
@@ -62,7 +62,7 @@ func setupTestServer(
 	}
 
 	var err error
-	ac, err := ossaccesscontrol.ProvideService(features, cfg, database.ProvideService(db), rr)
+	ac, err := ossaccesscontrol.ProvideService(cfg, database.ProvideService(db), rr)
 	require.NoError(t, err)
 
 	// build mux
@@ -139,7 +139,7 @@ func buildQueryDataService(t *testing.T, cs datasources.CacheService, fpc *fakeP
 	)
 }
 
-//copied from pkg/api/metrics_test.go
+// copied from pkg/api/metrics_test.go
 type fakePluginRequestValidator struct {
 	err error
 }