wip

Author: Gnoale

internal/acctest/compare.go

@@ -7,12 +7,45 @@ import (
 	"strings"
 )
 
+// compareJSONBodies compare two given maps that represent json bodies
+// returns true if both json are equivalent
+func compareJSONBodies(request, cassette map[string]interface{}) bool {
+	for key, requestValue := range request {
+		cassetteValue, ok := cassette[key]
+		if !ok {
+			// Actual request may contain a field that does not exist in cassette
+			// New fields can appear in requests with new api features
+			// We do not want to generate new cassettes for each new features
+			continue
+		}
+
+		if reflect.TypeOf(cassetteValue) != reflect.TypeOf(requestValue) {
+			return false
+		}
+
+		if !compareJSONFields(requestValue, cassetteValue) {
+			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
+	//	}
+	//}
+
+	return true
+}
+
 // compareFormBodies compare two given url.Values
 // returns true if both url.Values are equivalent
 func compareFormBodies(request, cassette url.Values) bool {
 	// Check for each key in actual requests
 	// Compare its value to cassette content if marshal-able to string
-	for key := range cassette {
+	for key := range request {
 		requestValue, exists := request[key]
 		if !exists {
 			// Actual request may contain a field that does not exist in cassette
@@ -26,9 +59,8 @@ func compareFormBodies(request, cassette url.Values) bool {
 		}
 	}
 
-	for key := range request {
-		_, exists := cassette[key]
-		if !exists && request[key] != nil {
+	for key, cassetteValue := range cassette {
+		if _, exists := request[key]; !exists && 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
@@ -46,8 +78,8 @@ func compareJSONFieldsStrings(expected, actual string) bool {
 		return true
 	}
 
-	snsPrefix := "test-mnq-sns-topic-basic"
 	// Action=DeleteTopic&TopicArn=arn%3Ascw%3Asns%3Afr-par%3Aproject-1a080a81-67b6-476d-80b4-f3bb9184e318%3Atest-mnq-sns-topic-basic20250603151943185500000004&Version=2010-03-31
+	snsPrefix := "test-mnq-sns-topic-basic"
 	if strings.HasPrefix(actual, snsPrefix) && strings.HasPrefix(expected, snsPrefix) {
 		return true
 	}
@@ -164,27 +196,3 @@ func compareJSONFields(requestValue, cassetteValue interface{}) bool {
 		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 {
-	for key, requestValue := range request {
-		cassetteValue, ok := cassette[key]
-		if !ok {
-			// Actual request may contain a field that does not exist in cassette
-			// New fields can appear in requests with new api features
-			// We do not want to generate new cassettes for each new features
-			continue
-		}
-
-		if reflect.TypeOf(cassetteValue) != reflect.TypeOf(requestValue) {
-			return false
-		}
-
-		if !compareJSONFields(requestValue, cassetteValue) {
-			return false
-		}
-	}
-
-	return true
-}