glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-06-25 21:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from smukk9/update-tests-#1700

Browse source 
fix linting
This commit is contained in:
sandeep 2024-03-25 09:56:07 -07:00 committed by GitHub
parent e152d74e81 a848f49a70
commit b683b74f0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
viper.go
View file

@ -1791,11 +1791,12 @@ func (v *Viper) writeConfig(filename string, force bool) error {
return f.Sync() return f.Sync()
} }
// commenting since it is unsed.
// Unmarshal a Reader into a map. // Unmarshal a Reader into a map.
// Should probably be an unexported function. // Should probably be an unexported function.
func unmarshalReader(in io.Reader, c map[string]any) error { // func unmarshalReader(in io.Reader, c map[string]any) error {
return v.unmarshalReader(in, c) // return v.unmarshalReader(in, c)
} // }
func (v *Viper) unmarshalReader(in io.Reader, c map[string]any) error { func (v *Viper) unmarshalReader(in io.Reader, c map[string]any) error {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)

20
viper_test.go
View file

@ -137,7 +137,6 @@ Good man.
""" # Succeeding comment`) """ # Succeeding comment`)
func initConfigs(v *Viper) { func initConfigs(v *Viper) {
var r io.Reader var r io.Reader
v.SetConfigType("yaml") v.SetConfigType("yaml")
r = bytes.NewReader(yamlExample) r = bytes.NewReader(yamlExample)
@ -497,9 +496,7 @@ func TestAliasInConfigFile(t *testing.T) {
} }
func TestYML(t *testing.T) { func TestYML(t *testing.T) {
v := New() v := New()
v.SetConfigType("yaml") v.SetConfigType("yaml")
// Read the YAML data into Viper configuration // Read the YAML data into Viper configuration
@ -530,7 +527,6 @@ func TestProperties(t *testing.T) {
} }
func TestTOML(t *testing.T) { func TestTOML(t *testing.T) {
v := New() v := New()
v.SetConfigType("toml") v.SetConfigType("toml")
@ -550,7 +546,6 @@ func TestDotEnv(t *testing.T) {
} }
func TestHCL(t *testing.T) { func TestHCL(t *testing.T) {
v := New() v := New()
v.SetConfigType("hcl") v.SetConfigType("hcl")
// Read the properties data into Viper configuration // Read the properties data into Viper configuration
@ -577,7 +572,6 @@ func TestIni(t *testing.T) {
} }
func TestRemotePrecedence(t *testing.T) { func TestRemotePrecedence(t *testing.T) {
v := New() v := New()
v.SetConfigType("json") v.SetConfigType("json")
// Read the properties data into Viper configuration v.config // Read the properties data into Viper configuration v.config
@ -585,7 +579,7 @@ func TestRemotePrecedence(t *testing.T) {
assert.Equal(t, "0001", v.Get("id")) assert.Equal(t, "0001", v.Get("id"))
//update the kvstore with the remoteExample which should overite the key in v.config // update the kvstore with the remoteExample which should overite the key in v.config
remote := bytes.NewReader(remoteExample) remote := bytes.NewReader(remoteExample)
require.NoError(t, v.unmarshalReader(remote, v.kvstore), "Error reading json data in to kvstore") require.NoError(t, v.unmarshalReader(remote, v.kvstore), "Error reading json data in to kvstore")
@ -595,11 +589,9 @@ func TestRemotePrecedence(t *testing.T) {
v.Set("newkey", "newvalue") v.Set("newkey", "newvalue")
assert.NotEqual(t, "remote", v.Get("newkey")) assert.NotEqual(t, "remote", v.Get("newkey"))
assert.Equal(t, "newvalue", v.Get("newkey")) assert.Equal(t, "newvalue", v.Get("newkey"))
} }
func TestEnv(t *testing.T) { func TestEnv(t *testing.T) {
v := New() v := New()
v.SetConfigType("json") v.SetConfigType("json")
// Read the properties data into Viper configuration v.config // Read the properties data into Viper configuration v.config
@ -651,7 +643,6 @@ func TestEmptyEnv(t *testing.T) {
} }
func TestEmptyEnv_Allowed(t *testing.T) { func TestEmptyEnv_Allowed(t *testing.T) {
v := New() v := New()
v.SetConfigType("json") v.SetConfigType("json")
// Read the properties data into Viper configuration v.config // Read the properties data into Viper configuration v.config
@ -702,19 +693,14 @@ func TestAutoEnv(t *testing.T) {
} }
func TestAutoEnvWithPrefix(t *testing.T) { func TestAutoEnvWithPrefix(t *testing.T) {
v := New() v := New()
v.AutomaticEnv() v.AutomaticEnv()
v.SetEnvPrefix("Baz") v.SetEnvPrefix("Baz")
t.Setenv("BAZ_BAR", "13") t.Setenv("BAZ_BAR", "13")
assert.Equal(t, "13", v.Get("bar")) assert.Equal(t, "13", v.Get("bar"))
} }
func TestSetEnvKeyReplacer(t *testing.T) { func TestSetEnvKeyReplacer(t *testing.T) {
v := New() v := New()
v.AutomaticEnv() v.AutomaticEnv()
@ -728,16 +714,12 @@ func TestSetEnvKeyReplacer(t *testing.T) {
func TestEnvKeyReplacer(t *testing.T) { func TestEnvKeyReplacer(t *testing.T) {
v := NewWithOptions(EnvKeyReplacer(strings.NewReplacer("-", "_"))) v := NewWithOptions(EnvKeyReplacer(strings.NewReplacer("-", "_")))
v.AutomaticEnv() v.AutomaticEnv()
t.Setenv("REFRESH_INTERVAL", "30s") t.Setenv("REFRESH_INTERVAL", "30s")
assert.Equal(t, "30s", v.Get("refresh-interval")) assert.Equal(t, "30s", v.Get("refresh-interval"))
} }
func TestEnvSubConfig(t *testing.T) { func TestEnvSubConfig(t *testing.T) {
v := New() v := New()
v.SetConfigType("yaml") v.SetConfigType("yaml")
// Read the properties data into Viper configuration v.config // Read the properties data into Viper configuration v.config