lib/envflag: substitute dots with underscores in env var names if -envflag.enable is set

See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/311
This commit is contained in:
Aliaksandr Valialkin 2020-02-24 21:14:22 +02:00
parent 6ca1e58d98
commit 13ee8271d0

View File

@ -4,6 +4,7 @@ import (
"flag" "flag"
"log" "log"
"os" "os"
"strings"
) )
var enable = flag.Bool("envflag.enable", false, "Whether to enable reading flags from environment variables additionally to command line. "+ var enable = flag.Bool("envflag.enable", false, "Whether to enable reading flags from environment variables additionally to command line. "+
@ -34,11 +35,18 @@ func Parse() {
return return
} }
// Get flag value from environment var. // Get flag value from environment var.
if v, ok := os.LookupEnv(f.Name); ok { fname := getEnvFlagName(f.Name)
if v, ok := os.LookupEnv(fname); ok {
if err := f.Value.Set(v); err != nil { if err := f.Value.Set(v); err != nil {
// Do not use lib/logger here, since it is uninitialized yet. // Do not use lib/logger here, since it is uninitialized yet.
log.Fatalf("cannot set flag %s to %q, which is read from environment variable: %s", f.Name, v, err) log.Fatalf("cannot set flag %s to %q, which is read from environment variable %q: %s", f.Name, v, fname, err)
} }
} }
}) })
} }
func getEnvFlagName(s string) string {
// Substitute dots with underscores, since env var names cannot contain dots.
// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/311#issuecomment-586354129 for details.
return strings.ReplaceAll(s, ".", "_")
}