reviewfix4

Author: Pawel Peksa

castai/resource_pod_mutation.go

@@ -40,7 +40,9 @@ const (
 	FieldPodMutationPreferred               = "preferred_during_scheduling_ignored_during_execution"
 	FieldPodMutationWeight                  = "weight"
 	FieldPodMutationPreference              = "preference"
-	FieldPodMutationMatchExpressions        = "match_expressions"
+	FieldPodMutationMatchExpressions           = "match_expressions"
+	FieldPodMutationMatchExpressionsKey        = "key"
+	FieldPodMutationMatchExpressionsOperator   = "operator"
 	FieldPodMutationSpotType                = "spot_type"
 	FieldPodMutationSpotDistributionPct     = "spot_distribution_percentage"
 	FieldPodMutationNodeTemplates           = "node_templates_to_consolidate"
@@ -205,11 +207,11 @@ var affinitySchema = &schema.Resource{
 												Optional: true,
 												Elem: &schema.Resource{
 													Schema: map[string]*schema.Schema{
-														FieldPodMutationTolerationKey: {
+														FieldPodMutationMatchExpressionsKey: {
 															Type:     schema.TypeString,
 															Required: true,
 														},
-														FieldPodMutationTolerationOperator: {
+														FieldPodMutationMatchExpressionsOperator: {
 															Type:     schema.TypeString,
 															Required: true,
 														},
@@ -924,8 +926,8 @@ func stateToAffinity(m map[string]interface{}) *patching_engine.Affinity {
 										continue
 									}
 									em := e.(map[string]interface{})
-									key := em[FieldPodMutationTolerationKey].(string)
-									operator := em[FieldPodMutationTolerationOperator].(string)
+									key := em[FieldPodMutationMatchExpressionsKey].(string)
+									operator := em[FieldPodMutationMatchExpressionsOperator].(string)
 									req := patching_engine.NodeSelectorRequirement{
 										Key:      &key,
 										Operator: &operator,
@@ -1108,7 +1110,7 @@ func podMutationToState(mutation *patching_engine.PodMutation, d *schema.Resourc
 			return diag.FromErr(err)
 		}
 	}
-	
+
 	return nil
 }
 
@@ -1229,8 +1231,8 @@ func flattenAffinity(affinity *patching_engine.Affinity) []map[string]interface{
 				exprs := make([]map[string]interface{}, 0)
 				for _, req := range *term.Preference.MatchExpressions {
 					exprMap := map[string]interface{}{
-						FieldPodMutationTolerationKey:      lo.FromPtr(req.Key),
-						FieldPodMutationTolerationOperator: lo.FromPtr(req.Operator),
+						FieldPodMutationMatchExpressionsKey:      lo.FromPtr(req.Key),
+						FieldPodMutationMatchExpressionsOperator: lo.FromPtr(req.Operator),
 					}
 					if req.Values != nil {
 						exprMap[FieldPodMutationValues] = *req.Values