switch to using featureEnabled for enterprise features (#41559)

* switch to using featureEnabled for enterprise features
2022-01-07 15:11:23 -05:00
parent 9eb82f9fff
commit 34f757ba5a
34 changed files with 109 additions and 148 deletions
@@ -196,11 +196,11 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
 		fmt.Sprintf("GF_VERSION=%s", i.cfg.BuildVersion),
 	}

-	if i.license != nil && i.license.HasLicense() {
+	if i.license != nil {
 		hostEnv = append(
 			hostEnv,
 			fmt.Sprintf("GF_EDITION=%s", i.license.Edition()),
-			fmt.Sprintf("GF_ENTERPRISE_license_PATH=%s", i.cfg.EnterpriseLicensePath),
+			fmt.Sprintf("GF_ENTERPRISE_LICENSE_PATH=%s", i.cfg.EnterpriseLicensePath),
 		)

 		if envProvider, ok := i.license.(models.LicenseEnvironment); ok {