re
/
viper
forked from mirror/viper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for Afero filesystems

This commit is contained in:
Matthieu Grieger 2016-08-05 00:24:49 -07:00 committed by Bjørn Erik Pedersen
parent 5619c0edbe
commit 4cf0bd2789
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util.go
View File

@ -77,7 +77,7 @@ func absPathify(inPath string) string {
// Check if File / Directory Exists // Check if File / Directory Exists
func exists(path string) (bool, error) { func exists(path string) (bool, error) {
_, err := os.Stat(path) _, err := fs.Stat(path)
if err == nil { if err == nil {
return true, nil return true, nil
} }

8
viper.go
View File

@ -23,7 +23,6 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
@ -33,15 +32,18 @@ import (
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/spf13/afero"
"github.com/spf13/cast" "github.com/spf13/cast"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )
var v *Viper var v *Viper
var fs afero.Fs
func init() { func init() {
v = New() v = New()
fs = afero.NewOsFs()
} }
type remoteConfigFactory interface { type remoteConfigFactory interface {
@ -936,7 +938,7 @@ func (v *Viper) ReadInConfig() error {
return UnsupportedConfigError(v.getConfigType()) return UnsupportedConfigError(v.getConfigType())
} }
file, err := ioutil.ReadFile(v.getConfigFile()) file, err := afero.ReadFile(fs, v.getConfigFile())
if err != nil { if err != nil {
return err return err
} }
@ -954,7 +956,7 @@ func (v *Viper) MergeInConfig() error {
return UnsupportedConfigError(v.getConfigType()) return UnsupportedConfigError(v.getConfigType())
} }
file, err := ioutil.ReadFile(v.getConfigFile()) file, err := afero.ReadFile(fs, v.getConfigFile())
if err != nil { if err != nil {
return err return err
} }