IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-26 21:37:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Licensing: Send the app url to plugin (#64258)

Browse Source
This commit is contained in:
lean.dev
2023-03-08 14:44:04 -03:00
committed by GitHub
parent 4625958aea
commit 0b0140b761
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/manager/loader/initializer/initializer.go
+1
View File
@@ -57,6 +57,7 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
hostEnv,
fmt.Sprintf("GF_EDITION=%s", i.license.Edition()),
fmt.Sprintf("GF_ENTERPRISE_LICENSE_PATH=%s", i.license.Path()),
fmt.Sprintf("GF_ENTERPRISE_APP_URL=%s", i.license.AppURL()),
)
hostEnv = append(hostEnv, i.license.Environment()...)
}
pkg/plugins/manager/loader/initializer/initializer_test.go
+4 -2
View File
@@ -140,6 +140,7 @@ func TestInitializer_envVars(t *testing.T) {
LicenseEdition: "test",
TokenRaw: "token",
LicensePath: "/path/to/ent/license",
LicenseAppURL: "https://myorg.com/",
}
i := &Initializer{
@@ -158,12 +159,13 @@ func TestInitializer_envVars(t *testing.T) {
}
envVars := i.envVars(p)
assert.Len(t, envVars, 5)
assert.Len(t, envVars, 6)
assert.Equal(t, "GF_PLUGIN_CUSTOM_ENV_VAR=customVal", envVars[0])
assert.Equal(t, "GF_VERSION=", envVars[1])
assert.Equal(t, "GF_EDITION=test", envVars[2])
assert.Equal(t, "GF_ENTERPRISE_LICENSE_PATH=/path/to/ent/license", envVars[3])
assert.Equal(t, "GF_ENTERPRISE_LICENSE_TEXT=token", envVars[4])
assert.Equal(t, "GF_ENTERPRISE_APP_URL=https://myorg.com/", envVars[4])
assert.Equal(t, "GF_ENTERPRISE_LICENSE_TEXT=token", envVars[5])
})
}