Adding tests for each helper method
This commit is contained in:
parent
6efdc94ae3
commit
64dda483dd
|
@ -0,0 +1,11 @@
|
|||
package structure
|
||||
|
||||
import "encoding/json"
|
||||
|
||||
func ExpandJsonFromString(jsonString string) (map[string]interface{}, error) {
|
||||
var result map[string]interface{}
|
||||
|
||||
err := json.Unmarshal([]byte(jsonString), &result)
|
||||
|
||||
return result, err
|
||||
}
|
|
@ -0,0 +1,48 @@
|
|||
package structure
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestExpandJson_emptyString(t *testing.T) {
|
||||
_, err := ExpandJsonFromString("")
|
||||
if err == nil {
|
||||
t.Fatal("Expected to throw an error while Expanding JSON")
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpandJson_singleItem(t *testing.T) {
|
||||
input := `{
|
||||
"foo": "bar"
|
||||
}`
|
||||
expected := make(map[string]interface{}, 1)
|
||||
expected["foo"] = "bar"
|
||||
actual, err := ExpandJsonFromString(input)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected not to throw an error while Expanding JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(actual, expected) {
|
||||
t.Fatalf("Got:\n\n%+v\n\nExpected:\n\n%+v\n", actual, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpandJson_multipleItems(t *testing.T) {
|
||||
input := `{
|
||||
"foo": "bar",
|
||||
"hello": "world"
|
||||
}`
|
||||
expected := make(map[string]interface{}, 1)
|
||||
expected["foo"] = "bar"
|
||||
expected["hello"] = "world"
|
||||
|
||||
actual, err := ExpandJsonFromString(input)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected not to throw an error while Expanding JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(actual, expected) {
|
||||
t.Fatalf("Got:\n\n%+v\n\nExpected:\n\n%+v\n", actual, expected)
|
||||
}
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
package structure
|
||||
|
||||
import "encoding/json"
|
||||
|
||||
func FlattenJsonToString(input map[string]interface{}) (string, error) {
|
||||
if len(input) == 0 {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
result, err := json.Marshal(input)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return string(result), nil
|
||||
}
|
|
@ -0,0 +1,47 @@
|
|||
package structure
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFlattenJson_empty(t *testing.T) {
|
||||
input := make(map[string]interface{}, 0)
|
||||
expected := ""
|
||||
actual, err := FlattenJsonToString(input)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected not to throw an error while Flattening JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
if expected != actual {
|
||||
t.Fatalf("Got: `%+v`. Expected: `%+v`", actual, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFlattenJson_singleItem(t *testing.T) {
|
||||
input := make(map[string]interface{}, 1)
|
||||
input["foo"] = "bar"
|
||||
expected := `{"foo":"bar"}`
|
||||
actual, err := FlattenJsonToString(input)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected not to throw an error while Flattening JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
if expected != actual {
|
||||
t.Fatalf("Got: `%+v`. Expected: `%+v`", actual, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFlattenJson_multipleItems(t *testing.T) {
|
||||
input := make(map[string]interface{}, 1)
|
||||
input["foo"] = "bar"
|
||||
input["bar"] = "foo"
|
||||
expected := `{"bar":"foo","foo":"bar"}`
|
||||
actual, err := FlattenJsonToString(input)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected not to throw an error while Flattening JSON, but got: %s", err)
|
||||
}
|
||||
|
||||
if expected != actual {
|
||||
t.Fatalf("Got: `%+v`. Expected: `%+v`", actual, expected)
|
||||
}
|
||||
}
|
|
@ -0,0 +1,24 @@
|
|||
package structure
|
||||
|
||||
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
|
||||
}
|
|
@ -1,65 +0,0 @@
|
|||
package structure
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"reflect"
|
||||
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
|
||||
// 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
|
||||
}
|
||||
|
||||
func ExpandJsonFromString(jsonString string) (map[string]interface{}, error) {
|
||||
var result map[string]interface{}
|
||||
|
||||
err := json.Unmarshal([]byte(jsonString), &result)
|
||||
|
||||
return result, err
|
||||
}
|
||||
|
||||
func FlattenJsonToString(input map[string]interface{}) (string, error) {
|
||||
|
||||
if len(input) == 0 {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
result, err := json.Marshal(input)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return string(result), nil
|
||||
}
|
||||
|
||||
func SuppressJsonDiff(k, old, new string, d *schema.ResourceData) bool {
|
||||
oldMap, err := ExpandJsonFromString(old)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
newMap, err := ExpandJsonFromString(new)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return reflect.DeepEqual(oldMap, newMap)
|
||||
}
|
|
@ -0,0 +1,21 @@
|
|||
package structure
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
|
||||
func SuppressJsonDiff(k, old, new string, d *schema.ResourceData) bool {
|
||||
oldMap, err := ExpandJsonFromString(old)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
newMap, err := ExpandJsonFromString(new)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return reflect.DeepEqual(oldMap, newMap)
|
||||
}
|
|
@ -0,0 +1,51 @@
|
|||
package structure
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSuppressJsonDiff_same(t *testing.T) {
|
||||
original := `{ "enabled": true }`
|
||||
new := `{ "enabled": true }`
|
||||
expected := true
|
||||
|
||||
actual := SuppressJsonDiff("test", original, new, nil)
|
||||
if actual != expected {
|
||||
t.Fatal("[ERROR] Identical JSON values shouldn't cause a diff")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSuppressJsonDiff_sameWithWhitespace(t *testing.T) {
|
||||
original := `{
|
||||
"enabled": true
|
||||
}`
|
||||
new := `{ "enabled": true }`
|
||||
expected := true
|
||||
|
||||
actual := SuppressJsonDiff("test", original, new, nil)
|
||||
if actual != expected {
|
||||
t.Fatal("[ERROR] Identical JSON values shouldn't cause a diff")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSuppressJsonDiff_differentValue(t *testing.T) {
|
||||
original := `{ "enabled": true }`
|
||||
new := `{ "enabled": false }`
|
||||
expected := false
|
||||
|
||||
actual := SuppressJsonDiff("test", original, new, nil)
|
||||
if actual != expected {
|
||||
t.Fatal("[ERROR] Different JSON values should cause a diff")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSuppressJsonDiff_newValue(t *testing.T) {
|
||||
original := `{ "enabled": true }`
|
||||
new := `{ "enabled": false, "world": "round" }`
|
||||
expected := false
|
||||
|
||||
actual := SuppressJsonDiff("test", original, new, nil)
|
||||
if actual != expected {
|
||||
t.Fatal("[ERROR] Different JSON values should cause a diff")
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue