Merge pull request #468 from nokia/expand-globals-env

properly expand global attributes if set to an environment variable
openconfig · Jun 20, 2024 · 5f1fdc5 · 5f1fdc5
2 parents a9bedd0 + 85d658a
commit 5f1fdc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -213,6 +213,7 @@ func (a *App) InitGlobalFlags() {
 }
 
 func (a *App) PreRunE(cmd *cobra.Command, args []string) error {
+	a.Config.SetGlobalsFromEnv(a.RootCmd)
 	a.Config.SetPersistentFlagsFromFile(a.RootCmd)
 
 	logOutput, flags, err := a.Config.SetLogger()

diff --git a/pkg/config/environment.go b/pkg/config/environment.go
@@ -11,6 +11,9 @@ package config
 import (
 	"os"
 	"strings"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 func envToMap() map[string]interface{} {
@@ -54,6 +57,14 @@ func (c *Config) mergeEnvVars() {
 	c.FileConfig.MergeConfigMap(envs)
 }
 
+func (c *Config) SetGlobalsFromEnv(cmd *cobra.Command) {
+	cmd.PersistentFlags().VisitAll(func(f *pflag.Flag) {
+		if !f.Changed && c.FileConfig.IsSet(f.Name) {
+			c.setFlagValue(cmd, f.Name, os.ExpandEnv(c.FileConfig.GetString(f.Name)))
+		}
+	})
+}
+
 func expandMapEnv(m map[string]interface{}, except ...string) {
 OUTER:
 	for f := range m {