From 78c20c0cb9f66f093e3ce28cbea4c8f6b9bd6f93 Mon Sep 17 00:00:00 2001 From: grambbledook Date: Tue, 16 Dec 2025 15:45:15 +0100 Subject: [PATCH] address golint issues --- pkg/services/featuremgmt/static_provider.go | 3 ++- pkg/services/featuremgmt/static_provider_test.go | 1 - pkg/setting/setting_feature_toggles.go | 1 - pkg/setting/setting_feature_toggles_test.go | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/services/featuremgmt/static_provider.go b/pkg/services/featuremgmt/static_provider.go index 3a1b5a1465f..1d59561bc2b 100644 --- a/pkg/services/featuremgmt/static_provider.go +++ b/pkg/services/featuremgmt/static_provider.go @@ -3,10 +3,11 @@ package featuremgmt import ( "encoding/json" "fmt" + "strconv" + "github.com/grafana/grafana/pkg/setting" "github.com/open-feature/go-sdk/openfeature" "github.com/open-feature/go-sdk/openfeature/memprovider" - "strconv" ) // inMemoryBulkProvider is a wrapper around memprovider.InMemoryProvider that diff --git a/pkg/services/featuremgmt/static_provider_test.go b/pkg/services/featuremgmt/static_provider_test.go index 7a21f83697b..50b92563992 100644 --- a/pkg/services/featuremgmt/static_provider_test.go +++ b/pkg/services/featuremgmt/static_provider_test.go @@ -267,5 +267,4 @@ func makeFlags(tt struct { } return config, []FeatureFlag{orig} - } diff --git a/pkg/setting/setting_feature_toggles.go b/pkg/setting/setting_feature_toggles.go index 72d6a15c8f1..de9ba72a3de 100644 --- a/pkg/setting/setting_feature_toggles.go +++ b/pkg/setting/setting_feature_toggles.go @@ -34,7 +34,6 @@ func (cfg *Cfg) readFeatureToggles(iniFile *ini.File) error { // TODO IsFeatureToggleEnabled has been deprecated for 2 years now, we should remove this function completely // nolint:staticcheck cfg.IsFeatureToggleEnabled = func(key string) bool { - toggle, ok := toggles[key] if !ok { return false diff --git a/pkg/setting/setting_feature_toggles_test.go b/pkg/setting/setting_feature_toggles_test.go index ceb34272e3b..bd8adf73440 100644 --- a/pkg/setting/setting_feature_toggles_test.go +++ b/pkg/setting/setting_feature_toggles_test.go @@ -91,7 +91,7 @@ func TestFeatureToggles(t *testing.T) { if err == nil { for k, v := range featureToggles { - toggle, _ := tc.expectedToggles[k] + toggle := tc.expectedToggles[k] require.Equal(t, toggle, v, tc.name) } }