reviewfix2

Author: Pawel Peksa

castai/resource_pod_mutation.go

@@ -611,9 +611,14 @@ func stateToPodMutation(d *schema.ResourceData) patching_engine.PodMutation {
 	// Mutation config fields
 	configMap := map[string]interface{}{}
 	for _, key := range []string{
-		FieldPodMutationLabels, FieldPodMutationAnnotations, FieldPodMutationNodeSelector,
-		FieldPodMutationTolerations, FieldPodMutationAffinity, FieldPodMutationSpotType,
-		FieldPodMutationNodeTemplates, FieldPodMutationPatch,
+		FieldPodMutationLabels,
+		FieldPodMutationAnnotations,
+		FieldPodMutationNodeSelector,
+		FieldPodMutationTolerations,
+		FieldPodMutationAffinity,
+		FieldPodMutationSpotType,
+		FieldPodMutationNodeTemplates,
+		FieldPodMutationPatch,
 	} {
 		if v, ok := d.GetOk(key); ok {
 			configMap[key] = v
@@ -1032,18 +1037,30 @@ func podMutationToState(mutation *patching_engine.PodMutation, d *schema.Resourc
 		if err := d.Set(FieldPodMutationLabels, *mutation.Labels); err != nil {
 			return diag.FromErr(err)
 		}
+	} else {
+		if err := d.Set(FieldPodMutationLabels, map[string]string{}); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if mutation.Annotations != nil {
 		if err := d.Set(FieldPodMutationAnnotations, *mutation.Annotations); err != nil {
 			return diag.FromErr(err)
 		}
+	} else {
+		if err := d.Set(FieldPodMutationAnnotations, map[string]string{}); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if mutation.NodeSelector != nil {
 		if err := d.Set(FieldPodMutationNodeSelector, flattenPodMutationNodeSelector(mutation.NodeSelector)); err != nil {
 			return diag.FromErr(err)
 		}
+	} else {
+		if err := d.Set(FieldPodMutationNodeSelector, []map[string]interface{}{}); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if mutation.Tolerations != nil {
@@ -1055,12 +1072,20 @@ func podMutationToState(mutation *patching_engine.PodMutation, d *schema.Resourc
 		if err := d.Set(FieldPodMutationTolerations, flatTolerations); err != nil {
 			return diag.FromErr(err)
 		}
+	} else {
+		if err := d.Set(FieldPodMutationTolerations, []map[string]interface{}{}); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if mutation.Affinity != nil {
 		if err := d.Set(FieldPodMutationAffinity, flattenAffinity(mutation.Affinity)); err != nil {
 			return diag.FromErr(err)
 		}
+	} else {
+		if err := d.Set(FieldPodMutationAffinity, []map[string]interface{}{}); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	// Spot type — treat UNSPECIFIED as empty to avoid drift when user doesn't set it