more formatting and fix test errors

Signed-off-by: Atif Ali <[email protected]>

Author: aali309

pkg/sync/sync_context.go

@@ -973,34 +973,47 @@ func formatValue(v interface{}) string {
 
 	// Special case for volumeClaimTemplates
 	if templates, ok := v.([]interface{}); ok {
-		var details []string
+		var names []string
 		for _, t := range templates {
 			if template, ok := t.(map[string]interface{}); ok {
 				if metadata, ok := template["metadata"].(map[string]interface{}); ok {
 					if name, ok := metadata["name"].(string); ok {
-						// Only include templates that have changes
 						if spec, ok := template["spec"].(map[string]interface{}); ok {
 							if resources, ok := spec["resources"].(map[string]interface{}); ok {
 								if requests, ok := resources["requests"].(map[string]interface{}); ok {
 									if storage, ok := requests["storage"].(string); ok {
-										details = append(details, fmt.Sprintf("%s(%s)", name, storage))
+										names = append(names, fmt.Sprintf("%s(%s)", name, storage))
 										continue
 									}
 								}
 							}
 						}
-						details = append(details, name)
+						names = append(names, name)
 					}
 				}
 			}
 		}
-		return fmt.Sprintf("[%s]", strings.Join(details, ", "))
+		return fmt.Sprintf("[%s]", strings.Join(names, ", "))
 	}
 
+	// Special case for selector matchLabels
+	if m, ok := v.(map[string]interface{}); ok {
+		if matchLabels, exists := m["matchLabels"].(map[string]interface{}); exists {
+			var labels []string
+			for k, v := range matchLabels {
+				labels = append(labels, fmt.Sprintf("%s:%s", k, v))
+			}
+			sort.Strings(labels)
+			return fmt.Sprintf("{%s}", strings.Join(labels, ", "))
+		}
+	}
+
+	// Add quotes for string values
 	if str, ok := v.(string); ok {
 		return fmt.Sprintf("%q", str)
 	}
 
+	// For other types, use standard formatting
 	return fmt.Sprintf("%v", v)
 }
 
@@ -1066,22 +1079,19 @@ func (sc *syncContext) applyObject(t *syncTask, dryRun, validate bool) (common.R
 				for k, desiredVal := range desiredSpec {
 					if !mutableFields[k] {
 						currentVal, exists := currentSpec[k]
+						// Only add to changes if values are actually different
 						if !exists || !reflect.DeepEqual(currentVal, desiredVal) {
-							// Format the values for better readability
 							currentStr := formatValue(currentVal)
 							desiredStr := formatValue(desiredVal)
 							changes = append(changes, fmt.Sprintf("   - %s:\n      from: %s\n      to:   %s",
 								k, currentStr, desiredStr))
 						}
 					}
 				}
-
 				if len(changes) > 0 {
-					// Sort the changes to ensure consistent order
 					sort.Strings(changes)
-					message := fmt.Sprintf("one or more objects failed to apply, reason: attempting to change immutable fields:\n%s\n\nForbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden",
+					return common.ResultCodeSyncFailed, fmt.Sprintf("attempting to change immutable fields:\n%s\n\nForbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden",
 						strings.Join(changes, "\n"))
-					return common.ResultCodeSyncFailed, message
 				}
 			}
 		}

pkg/sync/sync_context_test.go

@@ -2040,8 +2040,6 @@ func TestWaitForCleanUpBeforeNextWave(t *testing.T) {
 
 }
 
-///////////////
-
 func TestStatefulSetImmutableFieldErrors(t *testing.T) {
 	tests := []struct {
 		name            string
@@ -2123,8 +2121,8 @@ Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordina
 			},
 			expectedMessage: `attempting to change immutable fields:
    - selector:
-      from: map[matchLabels:map[app:old-app]]
-      to:   map[matchLabels:map[app:new-app]]
+      from: {app:old-app}
+      to:   {app:new-app}
 
 Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
 		},