Merge pull request #6353 from mattfarina/moar-env

Environment variable cleanup

cmd/helm/env.go

@@ -19,6 +19,7 @@ package main
 import (
 	"fmt"
 	"io"
+	"sort"
 
 	"helm.sh/helm/pkg/cli"
 
@@ -55,8 +56,16 @@ type envOptions struct {
 }
 
 func (o *envOptions) run(out io.Writer) error {
-	for _, e := range o.settings.EnvironmentVariables {
-		fmt.Printf("%s=\"%s\" \n", e.Name, e.Value)
+
+	// Sorting keys to display in alphabetical order
+	var keys []string
+	for k := range o.settings.EnvironmentVariables {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	for _, k := range keys {
+		fmt.Printf("%s=\"%s\" \n", k, o.settings.EnvironmentVariables[k])
 	}
 	return nil
 }

cmd/helm/testdata/helmhome/helm/plugins/fullenv/fullenv.sh

@@ -2,6 +2,6 @@
 echo $HELM_PLUGIN_NAME
 echo $HELM_PLUGIN_DIR
 echo $HELM_PLUGIN
-echo $HELM_PATH_REPOSITORY_FILE
-echo $HELM_PATH_REPOSITORY_CACHE
+echo $HELM_REPOSITORY_CONFIG
+echo $HELM_REPOSITORY_CACHE
 echo $HELM_BIN

pkg/cli/environment.go

@@ -52,13 +52,8 @@ type EnvSettings struct {
 	// PluginsDirectory is the path to the plugins directory.
 	PluginsDirectory string
 
-	// Environment Variables Store
-	EnvironmentVariables []EnvironmentVariable
-}
-
-type EnvironmentVariable struct {
-	Name  string
-	Value string
+	// Environment Variables Store.
+	EnvironmentVariables map[string]string
 }
 
 func New() *EnvSettings {
@@ -67,7 +62,7 @@ func New() *EnvSettings {
 		RegistryConfig:       helmpath.ConfigPath("registry.json"),
 		RepositoryConfig:     helmpath.ConfigPath("repositories.yaml"),
 		RepositoryCache:      helmpath.CachePath("repository"),
-		EnvironmentVariables: []EnvironmentVariable{},
+		EnvironmentVariables: make(map[string]string),
 	}
 	envSettings.setHelmEnvVars()
 	return &envSettings
@@ -104,25 +99,21 @@ func setFlagFromEnv(name, envar string, fs *pflag.FlagSet) {
 
 func (s *EnvSettings) setHelmEnvVars() {
 	for key, val := range map[string]string{
-		"HELM_HOME":                  helmpath.DataPath(),
-		"HELM_PATH_STARTER":          helmpath.DataPath("starters"),
-		"HELM_DEBUG":                 fmt.Sprint(s.Debug),
-		"HELM_REGISTRY_CONFIG":       s.RegistryConfig,
-		"HELM_PATH_REPOSITORY_FILE":  s.RepositoryConfig,
-		"HELM_PATH_REPOSITORY_CACHE": s.RepositoryCache,
-		"HELM_PLUGIN":                s.PluginsDirectory,
-		xdg.CacheHomeEnvVar:          helmpath.CachePath(),
-		xdg.ConfigHomeEnvVar:         helmpath.ConfigPath(),
-		xdg.DataHomeEnvVar:           helmpath.DataPath(),
+		"HELM_HOME":              helmpath.DataPath(),
+		"HELM_PATH_STARTER":      helmpath.DataPath("starters"),
+		"HELM_DEBUG":             fmt.Sprint(s.Debug),
+		"HELM_REGISTRY_CONFIG":   s.RegistryConfig,
+		"HELM_REPOSITORY_CONFIG": s.RepositoryConfig,
+		"HELM_REPOSITORY_CACHE":  s.RepositoryCache,
+		"HELM_PLUGIN":            s.PluginsDirectory,
+		xdg.CacheHomeEnvVar:      helmpath.CachePath(),
+		xdg.ConfigHomeEnvVar:     helmpath.ConfigPath(),
+		xdg.DataHomeEnvVar:       helmpath.DataPath(),
 	} {
 		if eVal := os.Getenv(key); len(eVal) > 0 {
 			val = eVal
 		}
-		s.EnvironmentVariables = append(s.EnvironmentVariables,
-			EnvironmentVariable{
-				Name:  key,
-				Value: val,
-			})
+		s.EnvironmentVariables[key] = val
 	}
 }
 

pkg/plugin/plugin.go

@@ -224,11 +224,12 @@ func SetupPluginEnv(settings *cli.EnvSettings, name, base string) {
 		"HELM_PLUGIN":      settings.PluginsDirectory,
 
 		// Set vars that convey common information.
-		"HELM_PATH_REPOSITORY_FILE":  settings.RepositoryConfig,
-		"HELM_PATH_REPOSITORY_CACHE": settings.RepositoryCache,
-		"HELM_PATH_STARTER":          helmpath.DataPath("starters"),
-		"HELM_HOME":                  helmpath.DataPath(), // for backwards compatibility with Helm 2 plugins
-		"HELM_DEBUG":                 fmt.Sprint(settings.Debug),
+		"HELM_REGISTRY_CONFIG":   settings.RegistryConfig,
+		"HELM_REPOSITORY_CONFIG": settings.RepositoryConfig,
+		"HELM_REPOSITORY_CACHE":  settings.RepositoryCache,
+		"HELM_PATH_STARTER":      helmpath.DataPath("starters"),
+		"HELM_HOME":              helmpath.DataPath(), // for backwards compatibility with Helm 2 plugins
+		"HELM_DEBUG":             fmt.Sprint(settings.Debug),
 	} {
 		os.Setenv(key, val)
 	}