upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

tweak service_registration config

Browse source
This commit is contained in:
Mike Jarmy 2019-12-04 09:39:57 -05:00
parent 39fcedec86
commit 5509920a8a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
command/server/config.go
View file

@ -155,7 +155,7 @@ func (b *Storage) GoString() string {
// ServiceRegistration is the optional service discovery for the server.
type ServiceRegistration struct {
Type string
Config map[string]string
Config map[string]interface{}
}
func (b *ServiceRegistration) GoString() string {
@ -864,7 +864,7 @@ func parseServiceRegistration(result *Config, list *ast.ObjectList, name string)
key = item.Keys[0].Token.Value().(string)
}
var m map[string]string
var m map[string]interface{}
if err := hcl.DecodeObject(&m, item.Val); err != nil {
return multierror.Prefix(err, fmt.Sprintf("%s.%s:", name, key))
}

8
command/server/config_test_helpers.go
View file

@ -49,7 +49,7 @@ func testLoadConfigFile_topLevel(t *testing.T, entropy *Entropy) {
ServiceRegistration: &ServiceRegistration{
Type: "consul",
Config: map[string]string{
Config: map[string]interface{}{
"foo": "bar",
},
},
@ -135,7 +135,7 @@ func testLoadConfigFile_json2(t *testing.T, entropy *Entropy) {
ServiceRegistration: &ServiceRegistration{
Type: "consul",
Config: map[string]string{
Config: map[string]interface{}{
"foo": "bar",
},
},
@ -277,7 +277,7 @@ func testLoadConfigFile(t *testing.T) {
ServiceRegistration: &ServiceRegistration{
Type: "consul",
Config: map[string]string{
Config: map[string]interface{}{
"foo": "bar",
},
},
@ -347,7 +347,7 @@ func testLoadConfigFile_json(t *testing.T) {
ServiceRegistration: &ServiceRegistration{
Type: "consul",
Config: map[string]string{
Config: map[string]interface{}{
"foo": "bar",
},
},