From fe2285898a7e332e5e0d9f762b66bb7e40bf59cc Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 22 Jul 2014 08:10:06 -0700 Subject: [PATCH] config: DefaultsMap should return nil if nil --- config/config.go | 5 ++++- config/config_test.go | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index 99f2a66cb5..46a2ce431e 100644 --- a/config/config.go +++ b/config/config.go @@ -283,8 +283,11 @@ func (r *Resource) mergerMerge(m merger) merger { // DefaultsMap returns a map of default values for this variable. func (v *Variable) DefaultsMap() map[string]string { - n := fmt.Sprintf("var.%s", v.Name) + if v.Default == nil { + return nil + } + n := fmt.Sprintf("var.%s", v.Name) switch v.Type() { case VariableTypeString: return map[string]string{n: v.Default.(string)} diff --git a/config/config_test.go b/config/config_test.go index 3fe6517431..a060798ee7 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -102,6 +102,11 @@ func TestVariableDefaultsMap(t *testing.T) { Default interface{} Output map[string]string }{ + { + nil, + nil, + }, + { "foo", map[string]string{"var.foo": "foo"},