Merge pull request #8909 from kwilczynski/feature/json-parsing-error-azurerm
provider/azurerm: Add normalizeJsonString and validateJsonString functions.
This commit is contained in:
commit
2c69a2bf93
|
@ -0,0 +1,24 @@
|
|||
package azurerm
|
||||
|
||||
import "encoding/json"
|
||||
|
||||
// Takes a value containing JSON string and passes it through
|
||||
// the JSON parser to normalize it, returns either a parsing
|
||||
// error or normalized JSON string.
|
||||
func normalizeJsonString(jsonString interface{}) (string, error) {
|
||||
var j interface{}
|
||||
|
||||
if jsonString == nil || jsonString.(string) == "" {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
s := jsonString.(string)
|
||||
|
||||
err := json.Unmarshal([]byte(s), &j)
|
||||
if err != nil {
|
||||
return s, err
|
||||
}
|
||||
|
||||
bytes, _ := json.Marshal(j)
|
||||
return string(bytes[:]), nil
|
||||
}
|
|
@ -0,0 +1,55 @@
|
|||
package azurerm
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestNormalizeJsonString(t *testing.T) {
|
||||
var err error
|
||||
var actual string
|
||||
|
||||
// Well formatted and valid.
|
||||
validJson := `{
|
||||
"abc": {
|
||||
"def": 123,
|
||||
"xyz": [
|
||||
{
|
||||
"a": "ホリネズミ"
|
||||
},
|
||||
{
|
||||
"b": "1\\n2"
|
||||
}
|
||||
]
|
||||
}
|
||||
}`
|
||||
expected := `{"abc":{"def":123,"xyz":[{"a":"ホリネズミ"},{"b":"1\\n2"}]}}`
|
||||
|
||||
actual, err = normalizeJsonString(validJson)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected not to throw an error while parsing JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
if actual != expected {
|
||||
t.Fatalf("Got:\n\n%s\n\nExpected:\n\n%s\n", actual, expected)
|
||||
}
|
||||
|
||||
// Well formatted but not valid,
|
||||
// missing closing squre bracket.
|
||||
invalidJson := `{
|
||||
"abc": {
|
||||
"def": 123,
|
||||
"xyz": [
|
||||
{
|
||||
"a": "1"
|
||||
}
|
||||
}
|
||||
}
|
||||
}`
|
||||
actual, err = normalizeJsonString(invalidJson)
|
||||
if err == nil {
|
||||
t.Fatalf("Expected to throw an error while parsing JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
// We expect the invalid JSON to be shown back to us again.
|
||||
if actual != invalidJson {
|
||||
t.Fatalf("Got:\n\n%s\n\nExpected:\n\n%s\n", expected, invalidJson)
|
||||
}
|
||||
}
|
|
@ -0,0 +1,10 @@
|
|||
package azurerm
|
||||
|
||||
import "fmt"
|
||||
|
||||
func validateJsonString(v interface{}, k string) (ws []string, errors []error) {
|
||||
if _, err := normalizeJsonString(v); err != nil {
|
||||
errors = append(errors, fmt.Errorf("%q contains an invalid JSON: %s", k, err))
|
||||
}
|
||||
return
|
||||
}
|
|
@ -0,0 +1,58 @@
|
|||
package azurerm
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestValidateJsonString(t *testing.T) {
|
||||
type testCases struct {
|
||||
Value string
|
||||
ErrCount int
|
||||
}
|
||||
|
||||
invalidCases := []testCases{
|
||||
{
|
||||
Value: `{0:"1"}`,
|
||||
ErrCount: 1,
|
||||
},
|
||||
{
|
||||
Value: `{'abc':1}`,
|
||||
ErrCount: 1,
|
||||
},
|
||||
{
|
||||
Value: `{"def":}`,
|
||||
ErrCount: 1,
|
||||
},
|
||||
{
|
||||
Value: `{"xyz":[}}`,
|
||||
ErrCount: 1,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range invalidCases {
|
||||
_, errors := validateJsonString(tc.Value, "json")
|
||||
if len(errors) != tc.ErrCount {
|
||||
t.Fatalf("Expected %q to trigger a validation error.", tc.Value)
|
||||
}
|
||||
}
|
||||
|
||||
validCases := []testCases{
|
||||
{
|
||||
Value: ``,
|
||||
ErrCount: 0,
|
||||
},
|
||||
{
|
||||
Value: `{}`,
|
||||
ErrCount: 0,
|
||||
},
|
||||
{
|
||||
Value: `{"abc":["1","2"]}`,
|
||||
ErrCount: 0,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range validCases {
|
||||
_, errors := validateJsonString(tc.Value, "json")
|
||||
if len(errors) != tc.ErrCount {
|
||||
t.Fatalf("Expected %q not to trigger a validation error.", tc.Value)
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue