Skip to content

Commit

Permalink
Run gofmt on all existing code
Browse files Browse the repository at this point in the history
Also:

* Add check to .travis.yml that verifies that all code is gofmt-compliant
* Touch up some newlines

See spf13#351
  • Loading branch information
nmiyake authored and anthonyfok committed Jul 23, 2017
1 parent f257d19 commit 8ac2e2e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ matrix:

script:
- go install ./...
- diff -u <(echo -n) <(gofmt -d .)
- go test -v ./...

after_success:
Expand Down
1 change: 0 additions & 1 deletion flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,4 @@ func TestBindFlagValue(t *testing.T) {
flag.Changed = true //hack for pflag usage

assert.Equal(t, "testing_mutate", Get("testvalue"))

}
17 changes: 7 additions & 10 deletions remote/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,28 @@ func (rc remoteConfigProvider) Watch(rp viper.RemoteProvider) (io.Reader, error)
if err != nil {
return nil, err
}
resp,err := cm.Get(rp.Path())
resp, err := cm.Get(rp.Path())
if err != nil {
return nil, err
}

return bytes.NewReader(resp), nil
}

func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *viper.RemoteResponse, chan bool) {
cm, err := getConfigManager(rp)
if err != nil {
return nil, nil
}
quit := make(chan bool)
quitwc := make(chan bool)
viperResponsCh := make(chan *viper.RemoteResponse)
viperResponsCh := make(chan *viper.RemoteResponse)
cryptoResponseCh := cm.Watch(rp.Path(), quit)
// need this function to convert the Channel response form crypt.Response to viper.Response
go func(cr <-chan *crypt.Response,vr chan<- *viper.RemoteResponse, quitwc <-chan bool, quit chan<- bool) {
go func(cr <-chan *crypt.Response, vr chan<- *viper.RemoteResponse, quitwc <-chan bool, quit chan<- bool) {
for {
select {
case <- quitwc:
case <-quitwc:
quit <- true
return
case resp := <-cr:
Expand All @@ -65,15 +66,12 @@ func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *vi
}

}
}(cryptoResponseCh,viperResponsCh,quitwc,quit)

return viperResponsCh,quitwc
}(cryptoResponseCh, viperResponsCh, quitwc, quit)

return viperResponsCh, quitwc
}


func getConfigManager(rp viper.RemoteProvider) (crypt.ConfigManager, error) {

var cm crypt.ConfigManager
var err error

Expand All @@ -99,7 +97,6 @@ func getConfigManager(rp viper.RemoteProvider) (crypt.ConfigManager, error) {
return nil, err
}
return cm, nil

}

func init() {
Expand Down
1 change: 0 additions & 1 deletion util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
)

func TestCopyAndInsensitiviseMap(t *testing.T) {

var (
given = map[string]interface{}{
"Foo": 32,
Expand Down
1 change: 0 additions & 1 deletion viper.go
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,6 @@ func (v *Viper) searchInPath(in string) (filename string) {
// Search all configPaths for any config file.
// Returns the first path that exists (and is a config file).
func (v *Viper) findConfigFile() (string, error) {

jww.INFO.Println("Searching for config in ", v.configPaths)

for _, cp := range v.configPaths {
Expand Down

0 comments on commit 8ac2e2e

Please sign in to comment.