IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Settings: Use Grafana Azure SDK to pass Azure env vars for external plugins (#48954)

Browse Source 
* Azure env vars for plugins via Grafana Azure SDK

* Remove tests
This commit is contained in:
Sergey Kostrukov
2022-05-18 06:28:40 -07:00
committed by GitHub
parent 0ae8e3bd4e
commit 7251115457
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/plugins/manager/loader/initializer/initializer.go
View File

@@ -7,6 +7,7 @@ import (
"strings"
"github.com/grafana/grafana-aws-sdk/pkg/awsds"
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
@@ -66,7 +67,7 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
}
hostEnv = append(hostEnv, i.awsEnvVars()...)
hostEnv = append(hostEnv, i.azureEnvVars()...)
hostEnv = append(hostEnv, azsettings.WriteToEnvStr(i.cfg.Azure)...)
return getPluginSettings(plugin.ID, i.cfg).asEnvVar("GF_PLUGIN", hostEnv)
}
@@ -82,24 +83,6 @@ func (i *Initializer) awsEnvVars() []string {
return variables
}
func (i *Initializer) azureEnvVars() []string {
var variables []string
if i.cfg.Azure != nil {
if i.cfg.Azure.Cloud != "" {
variables = append(variables, "AZURE_CLOUD="+i.cfg.Azure.Cloud)
}
if i.cfg.Azure.ManagedIdentityClientId != "" {
variables = append(variables, "AZURE_MANAGED_IDENTITY_CLIENT_ID="+i.cfg.Azure.ManagedIdentityClientId)
}
if i.cfg.Azure.ManagedIdentityEnabled {
variables = append(variables, "AZURE_MANAGED_IDENTITY_ENABLED=true")
}
}
return variables
}
type pluginSettings map[string]string
func (ps pluginSettings) asEnvVar(prefix string, hostEnv []string) []string {

4
pkg/plugins/manager/loader/initializer/initializer_test.go
View File

@@ -146,10 +146,6 @@ func TestInitializer_getAWSEnvironmentVariables(t *testing.T) {
}
func TestInitializer_getAzureEnvironmentVariables(t *testing.T) {
}
func TestInitializer_handleModuleDefaults(t *testing.T) {
}