adding preliminary etcd support

This commit is contained in:
Brian Ketelsen 2014-10-26 09:42:03 -04:00
parent 3d8182460c
commit a28bee1fba

View file

@ -38,6 +38,7 @@ import (
"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"
crypt "github.com/xordataexchange/crypt/config"
"gopkg.in/yaml.v1" "gopkg.in/yaml.v1"
) )
@ -459,34 +460,37 @@ func ReadInConfig() error {
return err return err
} }
getKeyValueConfig() err = getKeyValueConfig()
if err != nil {
return err
}
MarshallReader(bytes.NewReader(file)) MarshallReader(bytes.NewReader(file), config)
return nil return nil
} }
func MarshallReader(in io.Reader) { func MarshallReader(in io.Reader, c map[string]interface{}) {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
buf.ReadFrom(in) buf.ReadFrom(in)
switch getConfigType() { switch getConfigType() {
case "yaml", "yml": case "yaml", "yml":
if err := yaml.Unmarshal(buf.Bytes(), &config); err != nil { if err := yaml.Unmarshal(buf.Bytes(), &c); err != nil {
jww.ERROR.Fatalf("Error parsing config: %s", err) jww.ERROR.Fatalf("Error parsing config: %s", err)
} }
case "json": case "json":
if err := json.Unmarshal(buf.Bytes(), &config); err != nil { if err := json.Unmarshal(buf.Bytes(), &c); err != nil {
jww.ERROR.Fatalf("Error parsing config: %s", err) jww.ERROR.Fatalf("Error parsing config: %s", err)
} }
case "toml": case "toml":
if _, err := toml.Decode(buf.String(), &config); err != nil { if _, err := toml.Decode(buf.String(), &c); err != nil {
jww.ERROR.Fatalf("Error parsing config: %s", err) jww.ERROR.Fatalf("Error parsing config: %s", err)
} }
} }
insensativiseMap(config) insensativiseMap(c)
} }
func insensativiseMaps() { func insensativiseMaps() {
@ -497,20 +501,23 @@ func insensativiseMaps() {
} }
// retrieve the first found remote configuration // retrieve the first found remote configuration
func getKeyValueConfig() { func getKeyValueConfig() error {
var err error
for _, rp := range remoteProviders { for _, rp := range remoteProviders {
val, err := getRemoteConfig(rp) val, err := getRemoteConfig(rp)
if err != nil { if err != nil {
continue
}
kvstore = val kvstore = val
return return nil
}
} }
return err
} }
func getRemoteConfig(provider *remoteProvider) (map[string]interface{}, error) { func getRemoteConfig(provider *remoteProvider) (map[string]interface{}, error) {
switch provider.provider { switch provider.provider {
case "etcd": case "etcd":
// do something return getEtcdConfig(provider)
case "consul": case "consul":
// do something // do something
@ -518,6 +525,32 @@ func getRemoteConfig(provider *remoteProvider) (map[string]interface{}, error) {
return config, nil return config, nil
} }
func getEtcdConfig(provider *remoteProvider) (map[string]interface{}, error) {
var cm crypt.ConfigManager
var err error
if provider.secretKeyring != "" {
kr, err := os.Open(provider.secretKeyring)
defer kr.Close()
if err != nil {
return nil, err
}
cm, err = crypt.NewEtcdConfigManager([]string{provider.endpoint}, kr)
} else {
cm, err = crypt.NewStandardEtcdConfigManager([]string{provider.endpoint})
}
if err != nil {
return nil, err
}
b, err := cm.Get(configFile)
if err != nil {
return nil, err
}
reader := bytes.NewReader(b)
MarshallReader(reader, kvstore)
return nil, err
}
func insensativiseMap(m map[string]interface{}) { func insensativiseMap(m map[string]interface{}) {
for key, val := range m { for key, val := range m {
lower := strings.ToLower(key) lower := strings.ToLower(key)