glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-11 22:57:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Recognize tfvars files as hcl by default.

Browse source
This commit is contained in:
Jim Razmus II 2020-05-13 12:15:28 -05:00
parent 13df721090
commit e491f2c4ca
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
viper.go
View file

@ -286,7 +286,7 @@ func NewWithOptions(opts ...Option) *Viper {
// can use it in their testing as well. // can use it in their testing as well.
func Reset() { func Reset() {
v = New() v = New()
SupportedExts = []string{"json", "toml", "yaml", "yml", "properties", "props", "prop", "hcl", "dotenv", "env", "ini"} SupportedExts = []string{"json", "toml", "yaml", "yml", "properties", "props", "prop", "hcl", "tfvars", "dotenv", "env", "ini"}
SupportedRemoteProviders = []string{"etcd", "consul", "firestore"} SupportedRemoteProviders = []string{"etcd", "consul", "firestore"}
} }
@ -325,7 +325,7 @@ type RemoteProvider interface {
} }
// SupportedExts are universally supported extensions. // SupportedExts are universally supported extensions.
var SupportedExts = []string{"json", "toml", "yaml", "yml", "properties", "props", "prop", "hcl", "dotenv", "env", "ini"} var SupportedExts = []string{"json", "toml", "yaml", "yml", "properties", "props", "prop", "hcl", "tfvars", "dotenv", "env", "ini"}
// SupportedRemoteProviders are universally supported remote providers. // SupportedRemoteProviders are universally supported remote providers.
var SupportedRemoteProviders = []string{"etcd", "consul", "firestore"} var SupportedRemoteProviders = []string{"etcd", "consul", "firestore"}
@ -1496,7 +1496,7 @@ func (v *Viper) unmarshalReader(in io.Reader, c map[string]interface{}) error {
return ConfigParseError{err} return ConfigParseError{err}
} }
case "hcl": case "hcl", "tfvars":
obj, err := hcl.Parse(buf.String()) obj, err := hcl.Parse(buf.String())
if err != nil { if err != nil {
return ConfigParseError{err} return ConfigParseError{err}
@ -1576,7 +1576,7 @@ func (v *Viper) marshalWriter(f afero.File, configType string) error {
return ConfigMarshalError{err} return ConfigMarshalError{err}
} }
case "hcl": case "hcl", "tfvars":
b, err := json.Marshal(c) b, err := json.Marshal(c)
if err != nil { if err != nil {
return ConfigMarshalError{err} return ConfigMarshalError{err}