Skip to content

Commit

Permalink
Merge pull request #8385 from gyuho/shadowed-environment-variables
Browse files Browse the repository at this point in the history
pkg/flags: warns on shadowed environment variable flags
  • Loading branch information
gyuho authored Aug 14, 2017
2 parents deb0098 + 195744a commit f1509a1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/flags/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ func SetFlagsFromEnv(prefix string, fs *flag.FlagSet) error {
fs.VisitAll(func(f *flag.Flag) {
err = setFlagFromEnv(fs, prefix, f.Name, usedEnvKey, alreadySet, true)
})

verifyEnv(prefix, usedEnvKey, alreadySet)

return err
}

Expand All @@ -100,6 +98,7 @@ func SetPflagsFromEnv(prefix string, fs *pflag.FlagSet) error {
err = serr
}
})
verifyEnv(prefix, usedEnvKey, alreadySet)
return err
}

Expand All @@ -118,7 +117,8 @@ func verifyEnv(prefix string, usedEnvKey, alreadySet map[string]bool) {
continue
}
if alreadySet[kv[0]] {
plog.Infof("recognized environment variable %s, but unused: shadowed by corresponding flag ", kv[0])
// TODO: exit with error in v3.4
plog.Warningf("recognized environment variable %s, but unused: shadowed by corresponding flag", kv[0])
continue
}
if strings.HasPrefix(env, prefix+"_") {
Expand Down

0 comments on commit f1509a1

Please sign in to comment.