diff --git a/pkg/tests/api/alerting/api_backtesting_test.go b/pkg/tests/api/alerting/api_backtesting_test.go index 363339af168..9ac1339debf 100644 --- a/pkg/tests/api/alerting/api_backtesting_test.go +++ b/pkg/tests/api/alerting/api_backtesting_test.go @@ -107,9 +107,9 @@ func TestBacktesting(t *testing.T) { require.Equalf(t, http.StatusForbidden, status, "Response: %s", body) }) - asService := resourcepermissions.NewActionSetService() + // asService := nil // resourcepermissions.NewActionSetService() // access control permissions store - permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), &asService) + permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), nil) _, err := permissionsStore.SetUserResourcePermission(context.Background(), accesscontrol.GlobalOrgID, accesscontrol.User{ID: testUserId}, diff --git a/pkg/tests/api/alerting/api_prometheus_test.go b/pkg/tests/api/alerting/api_prometheus_test.go index da3b58a8aa3..a9d0a59bbd5 100644 --- a/pkg/tests/api/alerting/api_prometheus_test.go +++ b/pkg/tests/api/alerting/api_prometheus_test.go @@ -668,9 +668,9 @@ func TestIntegrationPrometheusRulesPermissions(t *testing.T) { apiClient := newAlertingApiClient(grafanaListedAddr, "grafana", "password") - asService := resourcepermissions.NewActionSetService() + // asService := resourcepermissions.NewActionSetService() // access control permissions store - permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), &asService) + permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), nil) // Create the namespace we'll save our alerts to. apiClient.CreateFolder(t, "folder1", "folder1") diff --git a/pkg/tests/api/alerting/api_ruler_test.go b/pkg/tests/api/alerting/api_ruler_test.go index fb160313cea..0565a0fc147 100644 --- a/pkg/tests/api/alerting/api_ruler_test.go +++ b/pkg/tests/api/alerting/api_ruler_test.go @@ -1415,8 +1415,8 @@ func TestIntegrationRuleUpdate(t *testing.T) { AppModeProduction: true, }) grafanaListedAddr, env := testinfra.StartGrafanaEnv(t, dir, path) - asService := resourcepermissions.NewActionSetService() - permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), &asService) + // asService := resourcepermissions.NewActionSetService() + permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), nil) // Create a user to make authenticated requests userID := createUser(t, env.SQLStore, env.Cfg, user.CreateUserCommand{ diff --git a/pkg/tests/api/alerting/api_testing_test.go b/pkg/tests/api/alerting/api_testing_test.go index 138be67213d..13c851748a5 100644 --- a/pkg/tests/api/alerting/api_testing_test.go +++ b/pkg/tests/api/alerting/api_testing_test.go @@ -275,8 +275,8 @@ func TestGrafanaRuleConfig(t *testing.T) { }) // access control permissions store - asService := resourcepermissions.NewActionSetService() - permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), &asService) + // asService := resourcepermissions.NewActionSetService() + permissionsStore := resourcepermissions.NewStore(env.SQLStore, featuremgmt.WithFeatures(), nil) _, err := permissionsStore.SetUserResourcePermission(context.Background(), accesscontrol.GlobalOrgID, accesscontrol.User{ID: testUserId}, diff --git a/pkg/tests/api/folders/api_folders_test.go b/pkg/tests/api/folders/api_folders_test.go index f42d1dcb112..3b24ea01181 100644 --- a/pkg/tests/api/folders/api_folders_test.go +++ b/pkg/tests/api/folders/api_folders_test.go @@ -65,8 +65,8 @@ func TestGetFolders(t *testing.T) { viewerClient := tests.GetClient(grafanaListedAddr, "viewer", "viewer") // access control permissions store - actionSetService := resourcepermissions.NewActionSetService() - permissionsStore := resourcepermissions.NewStore(store, featuremgmt.WithFeatures(), &actionSetService) + // actionSetService := resourcepermissions.NewActionSetService() + permissionsStore := resourcepermissions.NewStore(store, featuremgmt.WithFeatures(), nil) numberOfFolders := 5 indexWithoutPermission := 3