Improve fuzzy setting logic for VirtualNetwork, RouteTable, and LoadBalancer extensions (#3009)

Author: super-harsh

v2/api/network/customizations/load_balancer_extension.go

@@ -146,8 +146,8 @@ func fuzzySetInboundNatRules(lb genruntime.ARMResourceSpec, inboundNatRules []ge
 	return nil
 }
 
-func fuzzySetInboundNatRule(InboundNatRule genruntime.ARMResourceSpec, embeddedInboundNatRule reflect.Value) error {
-	inboundNatRuleJSON, err := json.Marshal(InboundNatRule)
+func fuzzySetInboundNatRule(inboundNatRule genruntime.ARMResourceSpec, embeddedInboundNatRule reflect.Value) error {
+	inboundNatRuleJSON, err := json.Marshal(inboundNatRule)
 	if err != nil {
 		return errors.Wrapf(err, "failed to marshal inboundNatRule json")
 	}
@@ -163,8 +163,10 @@ func fuzzySetInboundNatRule(InboundNatRule genruntime.ARMResourceSpec, embeddedI
 	if err != nil {
 		return errors.Wrap(err, "unable to check that embedded inboundNatRule is the same as inboundNatRule")
 	}
-	if string(embeddedInboundNatRuleJSON) != string(inboundNatRuleJSON) {
-		return errors.Errorf("embeddedInboundNatRuleJSON (%s) != inboundNatRuleJSON (%s)", string(embeddedInboundNatRuleJSON), string(inboundNatRuleJSON))
+
+	err = fuzzyEqualityComparison(embeddedInboundNatRuleJSON, inboundNatRuleJSON)
+	if err != nil {
+		return errors.Wrap(err, "failed during comparison for embeddedInboundNatRuleJSON and inboundNatRuleJSON")
 	}
 
 	return nil

v2/api/network/customizations/route_table_extensions.go

@@ -167,8 +167,10 @@ func fuzzySetRoute(route genruntime.ARMResourceSpec, embeddedRoute reflect.Value
 	if err != nil {
 		return errors.Wrap(err, "unable to check that embedded route is the same as route")
 	}
-	if string(embeddedRouteJSON) != string(routeJSON) {
-		return errors.Errorf("embeddedRouteJSON (%s) != routeJSON (%s)", string(embeddedRouteJSON), string(routeJSON))
+
+	err = fuzzyEqualityComparison(embeddedRouteJSON, routeJSON)
+	if err != nil {
+		return errors.Wrap(err, "failed during comparison for embeddedRouteJSON and routeJSON")
 	}
 
 	return nil

v2/api/network/customizations/virtual_network_extensions.go

@@ -5,6 +5,7 @@ package customizations
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"reflect"
 
 	"github.com/go-logr/logr"
@@ -201,8 +202,30 @@ func fuzzySetSubnet(subnet genruntime.ARMResourceSpec, embeddedSubnet reflect.Va
 	if err != nil {
 		return errors.Wrap(err, "unable to check that embedded subnet is the same as subnet")
 	}
-	if string(embeddedSubnetJSON) != string(subnetJSON) {
-		return errors.Errorf("embeddedSubnetJSON (%s) != subnetJSON (%s)", string(embeddedSubnetJSON), string(subnetJSON))
+
+	err = fuzzyEqualityComparison(embeddedSubnetJSON, subnetJSON)
+	if err != nil {
+		return errors.Wrap(err, "failed during comparison for embeddedSubnetJSON and subnetJSON")
+	}
+
+	return nil
+}
+
+func fuzzyEqualityComparison(embeddedResourceJSON, resourceJSON []byte) error {
+	var embeddedResourceJSONMap map[string]interface{}
+	err := json.Unmarshal(embeddedResourceJSON, &embeddedResourceJSONMap)
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("unable to unmarshal (%s)", embeddedResourceJSONMap))
+	}
+
+	var resourceJSONMap map[string]interface{}
+	err = json.Unmarshal(resourceJSON, &resourceJSONMap)
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("unable to unmarshal (%s)", resourceJSONMap))
+	}
+
+	if !reflect.DeepEqual(embeddedResourceJSONMap, resourceJSONMap) {
+		return errors.Errorf(" (%s) != (%s)", string(embeddedResourceJSON), string(resourceJSON))
 	}
 
 	return nil