_EXT_

Signed-off-by: Jeff Ortel <[email protected]>

addon/injector.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/konveyor/tackle2-hub/api"
+	"github.com/konveyor/tackle2-hub/task"
 )
 
 var (
@@ -29,19 +30,11 @@ func (r *EnvInjector) Inject(extension *api.Extension) {
 	extension.Metadata = mp
 }
 
-// buildEnv builds the `env`.
-// Maps EXTENSION_<extension>_<var> found in the addon environment to its
-// original unqualified name in the extension environment.
+// buildEnv builds the extension `env`.
 func (r *EnvInjector) buildEnv(extension *api.Extension) {
 	r.env = make(map[string]string)
 	for _, env := range extension.Container.Env {
-		key := strings.Join(
-			[]string{
-				"EXTENSION",
-				strings.ToUpper(extension.Name),
-				env.Name,
-			},
-			"_")
+		key := task.ExtEnv(extension.Name, env.Name)
 		r.env[env.Name] = os.Getenv(key)
 	}
 }

task/manager.go

@@ -961,13 +961,7 @@ func (r *Task) propagateEnv(addon, extension *core.Container) {
 		addon.Env = append(
 			addon.Env,
 			core.EnvVar{
-				Name: strings.Join(
-					[]string{
-						"EXTENSION",
-						strings.ToUpper(extension.Name),
-						env.Name,
-					},
-					"_"),
+				Name:  ExtEnv(extension.Name, env.Name),
 				Value: env.Value,
 			})
 	}
@@ -1031,3 +1025,16 @@ type Event struct {
 	Reporter string
 	Message  string
 }
+
+// ExtEnv returns an environment variable named namespaced to an extension.
+// Format: _EXT_<extension_<var>.
+func ExtEnv(extension string, envar string) (s string) {
+	s = strings.Join(
+		[]string{
+			"_EXT",
+			strings.ToUpper(extension),
+			envar,
+		},
+		"_")
+	return
+}