scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 02:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert to logxi

Browse Source
This commit is contained in:
Jeff Mitchell
2016-08-19 16:45:17 -04:00
parent 826146f9e8
commit 68345eb770
102 changed files with 4336 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
command/server/config_test.go
View File

@@ -5,10 +5,15 @@ import (
"strings"
"testing"
"time"
"github.com/hashicorp/vault/helper/logformat"
log "github.com/mgutz/logxi/v1"
)
func TestLoadConfigFile(t *testing.T) {
config, err := LoadConfigFile("./test-fixtures/config.hcl")
logger := logformat.NewVaultLogger(log.LevelTrace)
config, err := LoadConfigFile("./test-fixtures/config.hcl", logger)
if err != nil {
t.Fatalf("err: %s", err)
}
@@ -70,7 +75,9 @@ func TestLoadConfigFile(t *testing.T) {
}
func TestLoadConfigFile_json(t *testing.T) {
config, err := LoadConfigFile("./test-fixtures/config.hcl.json")
logger := logformat.NewVaultLogger(log.LevelTrace)
config, err := LoadConfigFile("./test-fixtures/config.hcl.json", logger)
if err != nil {
t.Fatalf("err: %s", err)
}
@@ -131,7 +138,9 @@ func TestLoadConfigFile_json(t *testing.T) {
}
func TestLoadConfigFile_json2(t *testing.T) {
config, err := LoadConfigFile("./test-fixtures/config2.hcl.json")
logger := logformat.NewVaultLogger(log.LevelTrace)
config, err := LoadConfigFile("./test-fixtures/config2.hcl.json", logger)
if err != nil {
t.Fatalf("err: %s", err)
}
@@ -189,7 +198,9 @@ func TestLoadConfigFile_json2(t *testing.T) {
}
func TestLoadConfigDir(t *testing.T) {
config, err := LoadConfigDir("./test-fixtures/config-dir")
logger := logformat.NewVaultLogger(log.LevelTrace)
config, err := LoadConfigDir("./test-fixtures/config-dir", logger)
if err != nil {
t.Fatalf("err: %s", err)
}
@@ -230,11 +241,13 @@ func TestLoadConfigDir(t *testing.T) {
}
func TestParseConfig_badTopLevel(t *testing.T) {
logger := logformat.NewVaultLogger(log.LevelTrace)
_, err := ParseConfig(strings.TrimSpace(`
backend {}
bad = "one"
nope = "yes"
`))
`), logger)
if err == nil {
t.Fatal("expected error")
@@ -250,13 +263,15 @@ nope = "yes"
}
func TestParseConfig_badListener(t *testing.T) {
logger := logformat.NewVaultLogger(log.LevelTrace)
_, err := ParseConfig(strings.TrimSpace(`
listener "tcp" {
address = "1.2.3.3"
bad = "one"
nope = "yes"
}
`))
`), logger)
if err == nil {
t.Fatal("expected error")
@@ -272,13 +287,15 @@ listener "tcp" {
}
func TestParseConfig_badTelemetry(t *testing.T) {
logger := logformat.NewVaultLogger(log.LevelTrace)
_, err := ParseConfig(strings.TrimSpace(`
telemetry {
statsd_address = "1.2.3.3"
bad = "one"
nope = "yes"
}
`))
`), logger)
if err == nil {
t.Fatal("expected error")