Plugins: Include Azure settings as a part of Grafana config sent in plugin requests (#79342)
* Add Azure settings and update tests * Filter by plugin ID * Add forward settings config variable * Update line * Add tests * Update so that data sources are fully defined in config * Update SDK and test * Fix lint * Update docs/sources/setup-grafana/configure-grafana/_index.md Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com> * Remove unnecessary if --------- Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
This commit is contained in:
co-authored by
Andrew Hackmann
parent
31d79c0502
commit
f3cdb44898
@@ -2,6 +2,7 @@ package setting
|
||||
|
||||
import (
|
||||
"github.com/grafana/grafana-azure-sdk-go/azsettings"
|
||||
"github.com/grafana/grafana/pkg/util"
|
||||
)
|
||||
|
||||
func (cfg *Cfg) readAzureSettings() {
|
||||
@@ -63,5 +64,7 @@ func (cfg *Cfg) readAzureSettings() {
|
||||
azureSettings.UserIdentityTokenEndpoint = tokenEndpointSettings
|
||||
}
|
||||
|
||||
azureSettings.ForwardSettingsPlugins = util.SplitString(azureSection.Key("forward_settings_to_plugins").String())
|
||||
|
||||
cfg.Azure = azureSettings
|
||||
}
|
||||
|
||||
@@ -215,4 +215,34 @@ func TestAzureSettings(t *testing.T) {
|
||||
assert.Empty(t, cfg.Azure.UserIdentityTokenEndpoint.ClientSecret)
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("forward settings to plugins", func(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
configuredValue string
|
||||
resolvedValue []string
|
||||
}{
|
||||
{
|
||||
name: "should be set to user plugins if set",
|
||||
configuredValue: "test-datasource",
|
||||
resolvedValue: []string{"test-datasource"},
|
||||
},
|
||||
}
|
||||
|
||||
for _, c := range testCases {
|
||||
t.Run(c.name, func(t *testing.T) {
|
||||
cfg := NewCfg()
|
||||
|
||||
azureSection, err := cfg.Raw.NewSection("azure")
|
||||
require.NoError(t, err)
|
||||
_, err = azureSection.NewKey("forward_settings_to_plugins", c.configuredValue)
|
||||
require.NoError(t, err)
|
||||
|
||||
cfg.readAzureSettings()
|
||||
require.NotNil(t, cfg.Azure)
|
||||
|
||||
assert.Equal(t, c.resolvedValue, cfg.Azure.ForwardSettingsPlugins)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user