增加环境变量的Key转为小写的存储和查询

如环境变量为：CONFIG_TEST，则可以通过config.test，进行查询

Author: ichiro999

archaius.go

@@ -99,7 +99,7 @@ func Init(opts ...Option) error {
 		}
 	}
 	if o.UseENVSource {
-		envSource := env.NewEnvConfigurationSource()
+		envSource := env.NewEnvConfigurationSource(o.EnvKeyLowerCases)
 		if err = manager.AddSource(envSource); err != nil {
 			return err
 		}

archaius_test.go

@@ -113,6 +113,31 @@ func TestConfig_RegisterListener(t *testing.T) {
 	assert.NoError(t, err)
 	defer archaius.UnRegisterListener(eventHandler, "a*")
 
+	type Info struct {
+		Addr   string `yaml:"address"`
+		Number int    `yaml:"number"`
+	}
+}
+
+func TestUnmarshalConfig2(t *testing.T) {
+	os.Setenv("INFO_ADDRESS", "a")
+	os.Setenv("INFO_NUMBER", "8")
+	err := archaius.Init(archaius.WithENVSource(), archaius.WithENVKeyLowerCase())
+	assert.NoError(t, err)
+	type Info struct {
+		Addr   string `yaml:"address"`
+		Number int    `yaml:"number"`
+	}
+	type InfoWrapper struct {
+		I *Info `yaml:"info"`
+	}
+	a := archaius.GetString("info.address", "")
+	assert.Equal(t, "a", a)
+	info := &InfoWrapper{}
+	err = archaius.UnmarshalConfig(info)
+	assert.NoError(t, err)
+	assert.Equal(t, "a", info.I.Addr)
+	assert.Equal(t, 8, info.I.Number)
 }
 
 func TestUnmarshalConfig(t *testing.T) {

options.go

@@ -36,14 +36,15 @@ type RemoteInfo struct {
 
 //Options hold options
 type Options struct {
-	RequiredFiles []string
-	OptionalFiles []string
-	FileHandler   util.FileHandler
-	RemoteInfo    *RemoteInfo
-	RemoteSource  string
-	UseCLISource  bool
-	UseENVSource  bool
-	UseMemSource  bool
+	RequiredFiles    []string
+	OptionalFiles    []string
+	FileHandler      util.FileHandler
+	RemoteInfo       *RemoteInfo
+	RemoteSource     string
+	UseCLISource     bool
+	UseENVSource     bool
+	UseMemSource     bool
+	EnvKeyLowerCases bool
 }
 
 //Option is a func
@@ -95,6 +96,13 @@ func WithENVSource() Option {
 	}
 }
 
+// WithENVkeyLowerCase enable env key ignore case
+func WithENVKeyLowerCase() Option {
+	return func(options *Options) {
+		options.EnvKeyLowerCases = true
+	}
+}
+
 //WithMemorySource accept the information for initiating a Memory source
 func WithMemorySource() Option {
 	return func(options *Options) {

source/env/env.go

@@ -34,15 +34,17 @@ const (
 
 //Source is a struct
 type Source struct {
-	Configs  sync.Map
-	priority int
+	Configs         sync.Map
+	priority        int
+	lowerCaseForKey bool
 }
 
 //NewEnvConfigurationSource configures a new environment configuration
-func NewEnvConfigurationSource() source.ConfigSource {
+func NewEnvConfigurationSource(openLowerCase bool) source.ConfigSource {
 	openlog.Info("enable env source")
 	envConfigSource := new(Source)
 	envConfigSource.priority = envVariableSourcePriority
+	envConfigSource.lowerCaseForKey = openLowerCase
 	envConfigSource.pullConfigurations()
 	return envConfigSource
 }
@@ -55,6 +57,10 @@ func (es *Source) pullConfigurations() {
 		key := string(rs[0:in])
 		value := string(rs[in+1:])
 		envKey := strings.Replace(key, "_", ".", -1)
+		if es.lowerCaseForKey {
+			key = strings.ToLower(key)
+			envKey = strings.ToLower(envKey)
+		}
 		es.Configs.Store(key, value)
 		es.Configs.Store(envKey, value)
 

source/env/env_test.go

@@ -48,17 +48,29 @@ func populatEnvConfiguration() {
 func TestEnvConfigurationSource(t *testing.T) {
 
 	populatEnvConfiguration()
-	envsource := env.NewEnvConfigurationSource()
+	envsource := env.NewEnvConfigurationSource(false)
 	t.Run("set env with underscore, use dot to get ", func(t *testing.T) {
 		os.Setenv("a_b_c_d", "asd")
-		envsource := env.NewEnvConfigurationSource()
+		envsource := env.NewEnvConfigurationSource(false)
 		v, err := envsource.GetConfigurationByKey("a.b.c.d")
 		assert.Equal(t, nil, err)
 		assert.Equal(t, "asd", v)
 		v, err = envsource.GetConfigurationByKey("a_b_c_d")
 		assert.Equal(t, nil, err)
 		assert.Equal(t, "asd", v)
 	})
+
+	t.Run("set env with underscore, and open lower case, use dot to get", func(t *testing.T) {
+		os.Setenv("A_B_C_D", "ABCD")
+		envsource := env.NewEnvConfigurationSource(true)
+		v, err := envsource.GetConfigurationByKey("a.b.c.d")
+		assert.Equal(t, nil, err)
+		assert.Equal(t, "ABCD", v)
+		v, err = envsource.GetConfigurationByKey("a_b_c_d")
+		assert.Equal(t, nil, err)
+		assert.Equal(t, "ABCD", v)
+
+	})
 	t.Log("Test envconfigurationsource.go")
 
 	t.Log("verifying envsource configurations by Configs method")