Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions viper.go
Original file line number Diff line number Diff line change
Expand Up @@ -1535,8 +1535,8 @@ func (v *Viper) MergeInConfig() error {
func ReadConfig(in io.Reader) error { return v.ReadConfig(in) }

func (v *Viper) ReadConfig(in io.Reader) error {
if v.configType == "" {
return errors.New("cannot decode configuration: config type is not set")
if v.getConfigType() == "" {
return errors.New("cannot decode configuration: unable to get config type from configType or file extension")
}

v.config = make(map[string]any)
Expand All @@ -1547,8 +1547,8 @@ func (v *Viper) ReadConfig(in io.Reader) error {
func MergeConfig(in io.Reader) error { return v.MergeConfig(in) }

func (v *Viper) MergeConfig(in io.Reader) error {
if v.configType == "" {
return errors.New("cannot decode configuration: config type is not set")
if v.getConfigType() == "" {
return errors.New("cannot decode configuration: unable to get config type from configType or file extension")
}

cfg := make(map[string]any)
Expand Down
16 changes: 16 additions & 0 deletions viper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1542,6 +1542,14 @@ func TestReadConfig(t *testing.T) {
})
}

func TestReadConfigWithSetConfigFile(t *testing.T) {
v := New()
v.SetConfigFile("config.yaml") // Dummy value to infer config type from file extension
err := v.ReadConfig(bytes.NewBuffer(yamlMergeExampleSrc))
require.NoError(t, err)
assert.Equal(t, 45000, v.GetInt("hello.pop"))
}

func TestIsSet(t *testing.T) {
v := New()
v.SetConfigType("yaml")
Expand Down Expand Up @@ -2059,6 +2067,14 @@ func TestMergeConfig(t *testing.T) {
assert.Equal(t, "bar", v.GetString("fu"))
}

func TestMergeConfigWithSetConfigFile(t *testing.T) {
v := New()
v.SetConfigFile("config.yaml") // Dummy value to infer config type from file extension
err := v.MergeConfig(bytes.NewBuffer(yamlMergeExampleSrc))
require.NoError(t, err)
assert.Equal(t, 45000, v.GetInt("hello.pop"))
}

func TestMergeConfigOverrideType(t *testing.T) {
v := New()
v.SetConfigType("json")
Expand Down
Loading