more formatting && tests

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

Author: aali309

pkg/sync/sync_context.go

@@ -973,18 +973,30 @@ func formatValue(v interface{}) string {
 
 	// Special case for volumeClaimTemplates
 	if templates, ok := v.([]interface{}); ok {
-		names := []string{}
+		var details []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 {
-						names = append(names, name)
+						// 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))
+										continue
+									}
+								}
+							}
+						}
+						details = append(details, name)
 					}
 				}
 			}
 		}
-		return fmt.Sprintf("templates: [%s]", strings.Join(names, ", "))
+		return fmt.Sprintf("[%s]", strings.Join(details, ", "))
 	}
+
 	if str, ok := v.(string); ok {
 		return fmt.Sprintf("%q", str)
 	}

pkg/sync/sync_context_test.go

@@ -2065,44 +2065,88 @@ func TestStatefulSetImmutableFieldErrors(t *testing.T) {
 Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
 		},
 		{
-			name: "volumeClaimTemplates change from nil",
+			name: "volumeClaimTemplates change with storage size",
 			currentSpec: map[string]interface{}{
-				"serviceName": "test-svc",
+				"volumeClaimTemplates": []interface{}{
+					map[string]interface{}{
+						"metadata": map[string]interface{}{
+							"name": "data",
+						},
+						"spec": map[string]interface{}{
+							"resources": map[string]interface{}{
+								"requests": map[string]interface{}{
+									"storage": "1Gi",
+								},
+							},
+						},
+					},
+				},
 			},
 			desiredSpec: map[string]interface{}{
-				"serviceName": "test-svc",
 				"volumeClaimTemplates": []interface{}{
 					map[string]interface{}{
 						"metadata": map[string]interface{}{
 							"name": "data",
 						},
+						"spec": map[string]interface{}{
+							"resources": map[string]interface{}{
+								"requests": map[string]interface{}{
+									"storage": "2Gi",
+								},
+							},
+						},
 					},
 				},
 			},
 			expectedMessage: `one or more objects failed to apply, reason: attempting to change immutable fields:
    - volumeClaimTemplates:
-      from: <nil>
-      to:   templates: [data]
+      from: [data(1Gi)]
+      to:   [data(2Gi)]
 
 Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
 		},
 		{
-			name: "multiple immutable field changes",
+			name: "selector change",
 			currentSpec: map[string]interface{}{
-				"serviceName":         "old-svc",
-				"podManagementPolicy": "OrderedReady",
+				"selector": map[string]interface{}{
+					"matchLabels": map[string]interface{}{
+						"app": "old-app",
+					},
+				},
 			},
 			desiredSpec: map[string]interface{}{
-				"serviceName":         "new-svc",
-				"podManagementPolicy": "Parallel",
+				"selector": map[string]interface{}{
+					"matchLabels": map[string]interface{}{
+						"app": "new-app",
+					},
+				},
 			},
 			expectedMessage: `one or more objects failed to apply, reason: attempting to change immutable fields:
-   - podManagementPolicy:
-      from: "OrderedReady"
-      to:   "Parallel"
-   - serviceName:
-      from: "old-svc"
-      to:   "new-svc"
+   - selector:
+      from: map[matchLabels:map[app:old-app]]
+      to:   map[matchLabels:map[app:new-app]]
+
+Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
+		},
+		{
+			name: "volumeClaimTemplates change from nil",
+			currentSpec: map[string]interface{}{
+				"serviceName": "test-svc",
+			},
+			desiredSpec: map[string]interface{}{
+				"serviceName": "test-svc",
+				"volumeClaimTemplates": []interface{}{
+					map[string]interface{}{
+						"metadata": map[string]interface{}{
+							"name": "data",
+						},
+					},
+				},
+			},
+			expectedMessage: `one or more objects failed to apply, reason: attempting to change immutable fields:
+   - volumeClaimTemplates:
+      from: <nil>
+      to:   [data]
 
 Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
 		},
@@ -2133,8 +2177,28 @@ Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordina
 			},
 			expectedMessage: `one or more objects failed to apply, reason: attempting to change immutable fields:
    - volumeClaimTemplates:
-      from: templates: [data1]
-      to:   templates: [data1, data2]
+      from: [data1]
+      to:   [data1, data2]
+
+Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
+		},
+		{
+			name: "multiple immutable field changes",
+			currentSpec: map[string]interface{}{
+				"serviceName":         "old-svc",
+				"podManagementPolicy": "OrderedReady",
+			},
+			desiredSpec: map[string]interface{}{
+				"serviceName":         "new-svc",
+				"podManagementPolicy": "Parallel",
+			},
+			expectedMessage: `one or more objects failed to apply, reason: attempting to change immutable fields:
+   - podManagementPolicy:
+      from: "OrderedReady"
+      to:   "Parallel"
+   - serviceName:
+      from: "old-svc"
+      to:   "new-svc"
 
 Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden`,
 		},
@@ -2184,6 +2248,8 @@ Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordina
 			sc.resourceOps = mockResourceOps
 
 			_, message := sc.applyObject(task, false, false)
+			t.Logf("+++Actual error message:\n%s", message)
+			t.Logf("+++Expected error message:\n%s", tt.expectedMessage)
 			assert.Equal(t, tt.expectedMessage, message)
 		})
 	}