From 96b7fb15dec8bcb0de1e12a8c2095dfc054b955d Mon Sep 17 00:00:00 2001 From: Sergey Kostrukov Date: Wed, 21 Dec 2022 04:37:33 -0800 Subject: [PATCH] Plugins: Fix parsing of Azure settings for plugins (#60611) Fix parsing of Azure settings for plugins --- pkg/plugins/config/config.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/plugins/config/config.go b/pkg/plugins/config/config.go index a90062d1ecd..b967ae3edb1 100644 --- a/pkg/plugins/config/config.go +++ b/pkg/plugins/config/config.go @@ -41,7 +41,6 @@ func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) *C func NewCfg(settingProvider setting.Provider, grafanaCfg *setting.Cfg) *Cfg { logger := log.New("plugin.cfg") - azure := settingProvider.Section("azure") aws := settingProvider.Section("aws") plugins := settingProvider.Section("plugins") @@ -65,12 +64,8 @@ func NewCfg(settingProvider setting.Provider, grafanaCfg *setting.Cfg) *Cfg { PluginsAllowUnsigned: allowedUnsigned, AWSAllowedAuthProviders: allowedAuth, AWSAssumeRoleEnabled: aws.KeyValue("assume_role_enabled").MustBool(grafanaCfg.AWSAssumeRoleEnabled), - Azure: &azsettings.AzureSettings{ - Cloud: azure.KeyValue("cloud").MustString(grafanaCfg.Azure.Cloud), - ManagedIdentityEnabled: azure.KeyValue("managed_identity_enabled").MustBool(grafanaCfg.Azure.ManagedIdentityEnabled), - ManagedIdentityClientId: azure.KeyValue("managed_identity_client_id").MustString(grafanaCfg.Azure.ManagedIdentityClientId), - }, - LogDatasourceRequests: grafanaCfg.IsFeatureToggleEnabled(featuremgmt.FlagDatasourceLogger), + Azure: grafanaCfg.Azure, + LogDatasourceRequests: grafanaCfg.IsFeatureToggleEnabled(featuremgmt.FlagDatasourceLogger), } }