wip

Author: Gnoale

internal/acctest/compare.go

@@ -7,6 +7,24 @@ import (
 	"strings"
 )
 
+// compareJSONFields compare two given json fields
+// it will recurse on map[string]interface{} and []interface{}
+// and compare string fields with compareJSONFieldsStrings
+func compareJSONFields(requestValue, cassetteValue interface{}) bool {
+	switch requestValue := requestValue.(type) {
+	case string:
+		return compareJSONFieldsStrings(requestValue, cassetteValue.(string))
+	case map[string]interface{}:
+		return compareJSONBodies(requestValue, cassetteValue.(map[string]interface{}))
+	case []interface{}:
+		return compareJSONSlices(requestValue, cassetteValue.([]interface{}))
+	case []string:
+		return compareStringSlices(requestValue, cassetteValue.([]string))
+	default:
+		return reflect.DeepEqual(requestValue, cassetteValue)
+	}
+}
+
 // compareJSONBodies compare two given maps that represent json bodies
 // returns true if both json are equivalent
 func compareJSONBodies(request, cassette map[string]interface{}) bool {
@@ -27,15 +45,17 @@ func compareJSONBodies(request, cassette map[string]interface{}) bool {
 			return false
 		}
 	}
+
 	// TODO: record back ipam/TestAccIPAMIPReverseDNS_Basic
-	//for key, cassetteValue := range cassette {
-	//	if _, ok := request[key]; !ok && cassetteValue != nil {
-	//		// Fails match if cassettes contains a field not in actual requests
-	//		// Fields should not disappear from requests unless a sdk breaking change
-	//		// We ignore if field is nil in cassette as it could be an old deprecated and unused field
-	//		return false
+
+	//	for key, cassetteValue := range cassette {
+	//		if _, ok := request[key]; !ok && cassetteValue != nil {
+	//			// Fails match if cassettes contains a field not in actual requests
+	//			// Fields should not disappear from requests unless a sdk breaking change
+	//			// We ignore if field is nil in cassette as it could be an old deprecated and unused field
+	//			return false
+	//		}
 	//	}
-	//}
 
 	return true
 }
@@ -113,6 +133,10 @@ func compareJSONFieldsStrings(expected, actual string) bool {
 }
 
 func compareStringSlices(request, cassette []string) bool {
+	if len(request) != len(cassette) {
+		return false
+	}
+
 	sort.Slice(request, func(i, j int) bool {
 		return request[i] < request[j]
 	})
@@ -131,7 +155,7 @@ func compareStringSlices(request, cassette []string) bool {
 
 // compareJSONSlices compares two slices of interface{}
 // if the slices are comparable (string or float64), it will sort them and compare them
-// it returns true in case of map[string]interface{} because it is not possible to sort them
+// it returns true in case of slice of map[string]interface{} because it is not possible to sort them
 func compareJSONSlices(request, cassette []interface{}) bool {
 	if len(request) != len(cassette) {
 		return false
@@ -144,17 +168,20 @@ func compareJSONSlices(request, cassette []interface{}) bool {
 	// try to infer the type of the slice, sort it and compare all elements
 	switch request[0].(type) {
 	case string:
-		cassetteString := make([]string, len(cassette))
-		for i, v := range cassette {
-			cassetteString[i] = v.(string)
-		}
+		sort.Slice(request, func(i, j int) bool {
+			return request[i].(string) < request[j].(string)
+		})
+		sort.Slice(cassette, func(i, j int) bool {
+			return cassette[i].(string) < cassette[j].(string)
+		})
 
-		requestString := make([]string, len(request))
-		for i, v := range request {
-			requestString[i] = v.(string)
+		for i := range request {
+			if !compareJSONFieldsStrings(request[i].(string), cassette[i].(string)) {
+				return false
+			}
 		}
 
-		return compareStringSlices(requestString, cassetteString)
+		return true
 	case float64:
 		sort.Slice(request, func(i, j int) bool {
 			return request[i].(float64) < request[j].(float64)
@@ -170,29 +197,9 @@ func compareJSONSlices(request, cassette []interface{}) bool {
 		}
 
 		return true
-	case []interface{}:
-		return compareJSONSlices(request, cassette)
 	case map[string]interface{}:
 		return true
-	}
-
-	return false
-}
-
-// compareJSONFields compare two given json fields
-// it will recurse on map[string]interface{} and []interface{}
-// and compare string fields with compareJSONFieldsStrings
-func compareJSONFields(requestValue, cassetteValue interface{}) bool {
-	switch requestValue := requestValue.(type) {
-	case string:
-		return compareJSONFieldsStrings(requestValue, cassetteValue.(string))
-	case map[string]interface{}: // recurse
-		return compareJSONBodies(requestValue, cassetteValue.(map[string]interface{}))
-	case []interface{}:
-		return compareJSONSlices(requestValue, cassetteValue.([]interface{}))
-	case []string:
-		return compareStringSlices(requestValue, cassetteValue.([]string))
 	default:
-		return reflect.DeepEqual(requestValue, cassetteValue)
+		return reflect.DeepEqual(request, cassette)
 	}
 }

internal/acctest/vcr.go

@@ -139,8 +139,7 @@ func cassetteBodyMatcher(request *http.Request, cassette cassette.Request) bool
 		removeKeyRecursive(requestJSON, key)
 		removeKeyRecursive(cassetteJSON, key)
 	}
-	fmt.Println("requestJSON", requestJSON)
-	fmt.Println("cassetteJSON", cassetteJSON)
+
 	return compareJSONBodies(requestJSON, cassetteJSON)
 }