Revert "Chore: Refactor quota service (#57586)" (#58394)

This reverts commit 326ea86a57.

pkg/middleware/quota_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/quota/quotatest"
+	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
@@ -30,6 +30,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 403, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Global.User = 4
 		})
 
 		middlewareScenario(t, "and global session quota not reached", func(t *testing.T, sc *scenarioContext) {
@@ -39,6 +41,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 200, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Global.Session = 10
 		})
 
 		middlewareScenario(t, "and global session quota reached", func(t *testing.T, sc *scenarioContext) {
@@ -48,10 +52,13 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 403, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Global.Session = 1
 		})
 	})
 
 	t.Run("with user logged in", func(t *testing.T) {
+		const quotaUsed = 4
 		setUp := func(sc *scenarioContext) {
 			sc.withTokenSessionCookie("token")
 			sc.userService.ExpectedSignedInUser = &user.SignedInUser{UserID: 12}
@@ -72,6 +79,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 403, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Global.DataSource = quotaUsed
 		})
 
 		middlewareScenario(t, "user Org quota not reached", func(t *testing.T, sc *scenarioContext) {
@@ -84,6 +93,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 200, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.User.Org = quotaUsed + 1
 		})
 
 		middlewareScenario(t, "user Org quota reached", func(t *testing.T, sc *scenarioContext) {
@@ -95,6 +106,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 403, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.User.Org = quotaUsed
 		})
 
 		middlewareScenario(t, "org dashboard quota not reached", func(t *testing.T, sc *scenarioContext) {
@@ -106,6 +119,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 200, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Org.Dashboard = quotaUsed + 1
 		})
 
 		middlewareScenario(t, "org dashboard quota reached", func(t *testing.T, sc *scenarioContext) {
@@ -117,6 +132,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 403, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Org.Dashboard = quotaUsed
 		})
 
 		middlewareScenario(t, "org dashboard quota reached, but quotas disabled", func(t *testing.T, sc *scenarioContext) {
@@ -128,6 +145,9 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 200, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Org.Dashboard = quotaUsed
+			cfg.Quota.Enabled = false
 		})
 
 		middlewareScenario(t, "org alert quota reached and unified alerting is enabled", func(t *testing.T, sc *scenarioContext) {
@@ -142,6 +162,7 @@ func TestMiddlewareQuota(t *testing.T) {
 
 			cfg.UnifiedAlerting.Enabled = new(bool)
 			*cfg.UnifiedAlerting.Enabled = true
+			cfg.Quota.Org.AlertRule = quotaUsed
 		})
 
 		middlewareScenario(t, "org alert quota not reached and unified alerting is enabled", func(t *testing.T, sc *scenarioContext) {
@@ -156,6 +177,7 @@ func TestMiddlewareQuota(t *testing.T) {
 
 			cfg.UnifiedAlerting.Enabled = new(bool)
 			*cfg.UnifiedAlerting.Enabled = true
+			cfg.Quota.Org.AlertRule = quotaUsed + 1
 		})
 
 		middlewareScenario(t, "org alert quota reached but ngalert disabled", func(t *testing.T, sc *scenarioContext) {
@@ -168,6 +190,8 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 403, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Org.AlertRule = quotaUsed
 		})
 
 		middlewareScenario(t, "org alert quota not reached but ngalert disabled", func(t *testing.T, sc *scenarioContext) {
@@ -179,15 +203,58 @@ func TestMiddlewareQuota(t *testing.T) {
 			assert.Equal(t, 200, sc.resp.Code)
 		}, func(cfg *setting.Cfg) {
 			configure(cfg)
+
+			cfg.Quota.Org.AlertRule = quotaUsed + 1
 		})
 	})
 }
 
 func getQuotaHandler(reached bool, target string) web.Handler {
-	qs := quotatest.New(reached, nil)
+	qs := &mockQuotaService{
+		reached: reached,
+	}
 	return Quota(qs)(target)
 }
 
 func configure(cfg *setting.Cfg) {
 	cfg.AnonymousEnabled = false
+	cfg.Quota = setting.QuotaSettings{
+		Enabled: true,
+		Org: &setting.OrgQuota{
+			User:       5,
+			Dashboard:  5,
+			DataSource: 5,
+			ApiKey:     5,
+			AlertRule:  5,
+		},
+		User: &setting.UserQuota{
+			Org: 5,
+		},
+		Global: &setting.GlobalQuota{
+			Org:        5,
+			User:       5,
+			Dashboard:  5,
+			DataSource: 5,
+			ApiKey:     5,
+			Session:    5,
+			AlertRule:  5,
+		},
+	}
+}
+
+type mockQuotaService struct {
+	reached bool
+	err     error
+}
+
+func (m *mockQuotaService) QuotaReached(c *models.ReqContext, target string) (bool, error) {
+	return m.reached, m.err
+}
+
+func (m *mockQuotaService) CheckQuotaReached(c context.Context, target string, params *quota.ScopeParameters) (bool, error) {
+	return m.reached, m.err
+}
+
+func (m *mockQuotaService) DeleteByUser(c context.Context, userID int64) error {
+	return m.err
 }