luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

config_parse_test, handle defaults

This commit is contained in:
Lang Martin 2019-06-11 15:17:31 -04:00
parent c97dd512f4
commit 3bd153690b
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
command/agent/config_parse_test.go
View File

@ -289,7 +289,7 @@ var pluginConfig = &Config{
Consul: nil, Consul: nil,
Vault: nil, Vault: nil,
TLSConfig: nil, TLSConfig: nil,
HTTPAPIResponseHeaders: nil, HTTPAPIResponseHeaders: map[string]string{},
Sentinel: nil, Sentinel: nil,
Plugins: []*config.PluginConfig{ Plugins: []*config.PluginConfig{
{ {
@ -355,7 +355,7 @@ var nonoptConfig = &Config{
Consul: nil, Consul: nil,
Vault: nil, Vault: nil,
TLSConfig: nil, TLSConfig: nil,
HTTPAPIResponseHeaders: nil, HTTPAPIResponseHeaders: map[string]string{},
Sentinel: nil, Sentinel: nil,
} }
@ -411,6 +411,9 @@ func TestConfig_Parse(t *testing.T) {
t.Fatalf("file: %s\n\n%s", tc.File, err) t.Fatalf("file: %s\n\n%s", tc.File, err)
} }
// Merge defaults like LoadConfig does
actual = ParseConfigDefault().Merge(actual)
//panic(fmt.Sprintf("first: %+v \n second: %+v", actual.TLSConfig, tc.Result.TLSConfig)) //panic(fmt.Sprintf("first: %+v \n second: %+v", actual.TLSConfig, tc.Result.TLSConfig))
require.EqualValues(tc.Result, removeHelperAttributes(actual)) require.EqualValues(tc.Result, removeHelperAttributes(actual))
}) })
@ -548,26 +551,11 @@ var sample0 = &Config{
Token: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", Token: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
ServerAutoJoin: helper.BoolToPtr(false), ServerAutoJoin: helper.BoolToPtr(false),
ClientAutoJoin: helper.BoolToPtr(false), ClientAutoJoin: helper.BoolToPtr(false),
// Defaults
ServerServiceName: "nomad",
ServerHTTPCheckName: "Nomad Server HTTP Check",
ServerSerfCheckName: "Nomad Server Serf Check",
ServerRPCCheckName: "Nomad Server RPC Check",
ClientServiceName: "nomad-client",
ClientHTTPCheckName: "Nomad Client HTTP Check",
AutoAdvertise: helper.BoolToPtr(true),
ChecksUseAdvertise: helper.BoolToPtr(false),
Timeout: 5 * time.Second,
EnableSSL: helper.BoolToPtr(false),
VerifySSL: helper.BoolToPtr(true),
}, },
Vault: &config.VaultConfig{ Vault: &config.VaultConfig{
Enabled: helper.BoolToPtr(true), Enabled: helper.BoolToPtr(true),
Role: "nomad-cluster", Role: "nomad-cluster",
Addr: "http://host.example.com:8200", Addr: "http://host.example.com:8200",
// Defaults
AllowUnauthenticated: helper.BoolToPtr(true),
ConnectionRetryIntv: 30 * time.Second,
}, },
TLSConfig: &config.TLSConfig{ TLSConfig: &config.TLSConfig{
EnableHTTP: true, EnableHTTP: true,
@ -579,10 +567,6 @@ var sample0 = &Config{
}, },
Autopilot: &config.AutopilotConfig{ Autopilot: &config.AutopilotConfig{
CleanupDeadServers: helper.BoolToPtr(true), CleanupDeadServers: helper.BoolToPtr(true),
// Defaults
ServerStabilizationTime: 10 * time.Second,
LastContactThreshold: 200 * time.Millisecond,
MaxTrailingLogs: 250,
}, },
} }