empty secret json marshals ""

Signed-off-by: Owen Diehl <ow.diehl@gmail.com>

Author: owen-d

config/config.go

@@ -42,6 +42,9 @@ func (s *Secret) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 // MarshalJSON implements the json.Marshaler interface for Secret.
 func (s Secret) MarshalJSON() ([]byte, error) {
+	if len(s) == 0 {
+		return json.Marshal("")
+	}
 	return json.Marshal(secretToken)
 }
 

config/config_test.go

@@ -23,18 +23,33 @@ import (
 )
 
 func TestJSONMarshalSecret(t *testing.T) {
-	test := struct {
+	type tmp struct {
 		S Secret
-	}{
-		S: Secret("test"),
 	}
-
-	c, err := json.Marshal(test)
-	if err != nil {
-		t.Fatal(err)
+	for _, tc := range []struct {
+		desc     string
+		data     tmp
+		expected string
+	}{
+		{
+			desc: "inhabited",
+			// u003c -> "<"
+			// u003e -> ">"
+			data:     tmp{"test"},
+			expected: "{\"S\":\"\\u003csecret\\u003e\"}",
+		},
+		{
+			desc:     "empty",
+			data:     tmp{},
+			expected: "{\"S\":\"\"}",
+		},
+	} {
+		t.Run(tc.desc, func(t *testing.T) {
+			c, err := json.Marshal(tc.data)
+			if err != nil {
+				t.Fatal(err)
+			}
+			require.Equal(t, tc.expected, string(c), "Secret not properly elided.")
+		})
 	}
-
-	// u003c -> "<"
-	// u003e -> ">"
-	require.Equal(t, "{\"S\":\"\\u003csecret\\u003e\"}", string(c), "Secret not properly elided.")
 }