From 6d594b3bc6cd87dc2a35076a05f98cf8adc47749 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 14 Dec 2016 13:52:34 -0800 Subject: [PATCH] helper/variables: trim whitespace on key before empty string comp --- helper/variables/flag.go | 6 +++--- helper/variables/flag_test.go | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/helper/variables/flag.go b/helper/variables/flag.go index 497b6fb1e..3af1d9164 100644 --- a/helper/variables/flag.go +++ b/helper/variables/flag.go @@ -21,6 +21,9 @@ func (v *Flag) Set(raw string) error { } key, input := raw[0:idx], raw[idx+1:] + + // Trim the whitespace on the key + key = strings.TrimSpace(key) if key == "" { return fmt.Errorf("No key to left '=' in arg: %s", raw) } @@ -30,9 +33,6 @@ func (v *Flag) Set(raw string) error { return err } - // Trim the whitespace on the key - key = strings.TrimSpace(key) - *v = Merge(*v, map[string]interface{}{key: value}) return nil } diff --git a/helper/variables/flag_test.go b/helper/variables/flag_test.go index 66c8d1a65..1bd5471ae 100644 --- a/helper/variables/flag_test.go +++ b/helper/variables/flag_test.go @@ -25,6 +25,12 @@ func TestFlag(t *testing.T) { true, }, + { + " =value", + nil, + true, + }, + { "key=value", map[string]interface{}{"key": "value"},