Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/parsers/parsers.go
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,11 @@ func parseMapForApplicationJSON(params map[string]interface{}, responses map[str
}

switch {
case parsed[0:1] == "[" && parsed[len(parsed)-1:] == "]":
case strings.HasPrefix(parsed, "[") && strings.HasSuffix(parsed, "]"):
paramArray := make([]interface{}, 0)
json.Unmarshal([]byte(parsed), &paramArray)
result[key] = paramArray
case parsed[0:1] == "{" && parsed[len(parsed)-1:] == "}":
case strings.HasPrefix(parsed, "{") && strings.HasSuffix(parsed, "}"):
paramMap := make(map[string]interface{})
json.Unmarshal([]byte(parsed), &paramMap)
result[key] = paramMap
Expand Down
18 changes: 18 additions & 0 deletions pkg/parsers/parsers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,24 @@ func TestParseInterfaceToJSONDeeplyNested(t *testing.T) {
require.Equal(t, "First Name", gjson.Get(json, "custom_fields.0.label.custom").String())
}

func TestParseInterfaceToJSONEmptyString(t *testing.T) {
// An empty-string value used to panic here because the array/object
// sniffing indexed parsed[0:1] and parsed[len(parsed)-1:] on a
// zero-length string. It should just come through as "".
data := map[string]interface{}{
"description": "",
"name": "Bender Bending Rodriguez",
}

output, err := ParseToApplicationJSON(data, make(map[string]gjson.Result))
require.NoError(t, err)

jsonParams, _ := json.Marshal(output)
json := string(jsonParams)
require.Equal(t, "", gjson.Get(json, "description").String())
require.Equal(t, "Bender Bending Rodriguez", gjson.Get(json, "name").String())
}

func TestParseInterface(t *testing.T) {
address := make(map[string]interface{})
address["line1"] = "1 Planet Express St"
Expand Down