Skip to content

Commit

Permalink
fixup ory#1, we should not change the import path
Browse files Browse the repository at this point in the history
  • Loading branch information
荒野無燈 committed Aug 25, 2019
1 parent 75cf305 commit a6b1a1b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
![viper logo](https://cloud.githubusercontent.com/assets/173412/10886745/998df88a-8151-11e5-9448-4736db51020d.png)

[![CircleCI](https://circleci.com/gh/ory/viper/tree/master.svg?style=shield](https://circleci.com/gh/ory/viper/tree/master)
[![CircleCI](https://circleci.com/gh/spf13/viper/tree/master.svg?style=shield](https://circleci.com/gh/spf13/viper/tree/master)

Go configuration with fangs!

> This is a fork. It resolves several issues that are left unresolved in [the upstream](https://github.com/ory/viper).
> This is a fork. It resolves several issues that are left unresolved in [the upstream](https://github.com/spf13/viper).
> Issues resolved and features added include:
>
> - Fixed race conditions when reloading configs.
Expand All @@ -23,11 +23,11 @@ Many Go projects are built using Viper including:
* [doctl](https://github.com/digitalocean/doctl)
* [Clairctl](https://github.com/jgsqware/clairctl)

[![Build Status](https://travis-ci.org/ory/viper.svg)](https://travis-ci.org/ory/viper) [![Join the chat at https://gitter.im/ory/viper](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ory/viper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GoDoc](https://godoc.org/github.com/ory/viper?status.svg)](https://godoc.org/github.com/ory/viper)
[![Build Status](https://travis-ci.org/spf13/viper.svg)](https://travis-ci.org/spf13/viper) [![Join the chat at https://gitter.im/spf13/viper](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/spf13/viper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GoDoc](https://godoc.org/github.com/spf13/viper?status.svg)](https://godoc.org/github.com/spf13/viper)

## Install
```console
go get -u github.com/ory/viper
go get -u github.com/spf13/viper
```

## What is Viper?
Expand Down Expand Up @@ -394,7 +394,7 @@ viper.BindFlagValues("my-flags", fSet)
To enable remote support in Viper, do a blank import of the `viper/remote`
package:

`import _ "github.com/ory/viper/remote"`
`import _ "github.com/spf13/viper/remote"`

Viper will read a config string (as JSON, TOML, YAML, HCL or envfile) retrieved from a path
in a Key/Value store such as etcd or Consul. These values take precedence over
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ory/viper
module github.com/spf13/viper

require (
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect
Expand Down
2 changes: 1 addition & 1 deletion remote/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

crypt "github.com/xordataexchange/crypt/config"

"github.com/ory/viper"
"github.com/spf13/viper"
)

type remoteConfigProvider struct{}
Expand Down
2 changes: 1 addition & 1 deletion util.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func deepSearch(m map[string]interface{}, path []string) map[string]interface{}
return m
}

// toMapStringInterface is a workaround for https://github.com/ory/viper/issues/730
// toMapStringInterface is a workaround for https://github.com/spf13/viper/issues/730
// and https://github.com/go-yaml/yaml/issues/139
func toMapStringInterface(in interface{}) interface{} {
switch t := in.(type) {
Expand Down
2 changes: 1 addition & 1 deletion viper.go
Original file line number Diff line number Diff line change
Expand Up @@ -1708,7 +1708,7 @@ func (v *Viper) getKeyValueConfig() error {
defer v.lock.RUnlock()

if RemoteConfig == nil {
return RemoteConfigError("Enable the remote features by doing a blank import of the viper/remote package: '_ github.com/ory/viper/remote'")
return RemoteConfigError("Enable the remote features by doing a blank import of the viper/remote package: '_ github.com/spf13/viper/remote'")
}

for _, rp := range v.remoteProviders {
Expand Down

0 comments on commit a6b1a1b

Please sign in to comment.