From 3defb4441e6adcf33c6a12b155825d2c2082709c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 27 Jul 2020 08:36:36 +0200
Subject: [PATCH] Settings: Remove global variable (#26613)

---
 pkg/api/metrics.go     |  3 +--
 pkg/setting/setting.go | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index 1f9a976e403..9c5a8983293 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/setting"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
@@ -77,7 +76,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricReq
 			return Error(500, "Metric request error", err)
 		}
 	} else {
-		if !setting.IsExpressionsEnabled() {
+		if !hs.Cfg.IsExpressionsEnabled() {
 			return Error(404, "Expressions feature toggle is not enabled", nil)
 		}
 
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 67a9e42193a..3c210e1e12c 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -215,7 +215,6 @@ var (
 	S3TempImageStoreSecretKey string
 
 	ImageUploadProvider string
-	FeatureToggles      map[string]bool
 )
 
 // TODO move all global vars to this struct
@@ -1023,7 +1022,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	for _, feature := range util.SplitString(featuresTogglesStr) {
 		cfg.FeatureToggles[feature] = true
 	}
-	FeatureToggles = cfg.FeatureToggles
 
 	// check old location for this option
 	if panelsSection.Key("enable_alpha").MustBool(false) {
@@ -1191,11 +1189,3 @@ func (s *DynamicSection) Key(k string) *ini.Key {
 func (cfg *Cfg) SectionWithEnvOverrides(s string) *DynamicSection {
 	return &DynamicSection{cfg.Raw.Section(s), cfg.Logger}
 }
-
-func IsExpressionsEnabled() bool {
-	v, ok := FeatureToggles["expressions"]
-	if !ok {
-		return false
-	}
-	return v
-}