IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-09 04:38:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Configprovider: Update the interface to propagate errors (#110814)

Browse Source 
* ConfigProvider: Update Get method to return error alongside configuration
This commit is contained in:
Sofia Papagiannaki
2025-09-11 17:26:54 +03:00
committed by GitHub
parent 0b1e640b03
commit 7ec9a7a4a8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/configprovider/configprovider.go
+3 -3
View File
@@ -8,7 +8,7 @@ import (
)
type ConfigProvider interface {
Get(context.Context) *setting.Cfg
Get(context.Context) (*setting.Cfg, error)
}
type OSSConfigProvider struct {
@@ -16,9 +16,9 @@ type OSSConfigProvider struct {
log log.Logger
}
func (c *OSSConfigProvider) Get(_ context.Context) *setting.Cfg {
func (c *OSSConfigProvider) Get(_ context.Context) (*setting.Cfg, error) {
c.log.Debug("OSSConfigProvider Get")
return c.Cfg
return c.Cfg, nil
}
func ProvideService(cfg *setting.Cfg) (ConfigProvider, error) {
pkg/services/quota/quotaimpl/quota.go
+2 -1
View File
@@ -76,7 +76,8 @@ func ProvideService(ctx context.Context, db db.DB, configProvider configprovider
}
func (s *service) IsDisabled(ctx context.Context) bool {
return !s.cfg.Get(ctx).Quota.Enabled
c, err := s.cfg.Get(ctx)
return err != nil || !c.Quota.Enabled
}
// QuotaReached checks that quota is reached for a target. Runs CheckQuotaReached and take context and scope parameters from the request context