From 99507cf0230bc930e6c428f8c578f41b223fc90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 3 Dec 2017 11:46:14 -0800 Subject: [PATCH] Allow --config.* flags to be also passed via env variables --- internal/config/config.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index 4272983b4..e3c3bbabd 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -18,9 +18,6 @@ import ( var ( // Config will hold final configuration read from the file and flags Config configSchema - - configDir string - configFile string ) func init() { @@ -36,9 +33,9 @@ func init() { pflag.StringSlice("annotations.visible", []string{}, "List of annotations that are visible by default") - pflag.StringVar(&configDir, "config.dir", ".", + pflag.String("config.dir", ".", "Directory with configuration file to read") - pflag.StringVar(&configFile, "config.file", "unsee", + pflag.String("config.file", "unsee", "Name of the configuration file to read") pflag.Bool("debug", false, "Enable debug mode") @@ -94,6 +91,8 @@ func (config *configSchema) Read() { // bind legacy env variables config.legacyEnvs(v) + configFile := v.GetString("config.file") + configDir := v.GetString("config.dir") v.SetConfigType("yaml") v.SetConfigName(configFile) v.AddConfigPath(configDir)