reviewfix1

Author: Pawel Peksa

castai/resource_pod_mutation.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 
@@ -19,55 +20,55 @@ import (
 )
 
 const (
-	FieldPodMutationOrganizationID          = "organization_id"
-	FieldPodMutationClusterID               = "cluster_id"
-	FieldPodMutationName                    = "name"
-	FieldPodMutationEnabled                 = "enabled"
-	FieldPodMutationObjectFilterV2          = "object_filter_v2"
-	FieldPodMutationLabels                  = "labels"
-	FieldPodMutationAnnotations             = "annotations"
-	FieldPodMutationNodeSelector            = "node_selector"
-	FieldPodMutationNodeSelectorAdd         = "add"
-	FieldPodMutationNodeSelectorRemove      = "remove"
-	FieldPodMutationTolerations             = "tolerations"
-	FieldPodMutationTolerationKey           = "key"
-	FieldPodMutationTolerationOperator      = "operator"
-	FieldPodMutationTolerationValue         = "value"
-	FieldPodMutationTolerationEffect        = "effect"
-	FieldPodMutationTolerationSeconds       = "toleration_seconds"
-	FieldPodMutationAffinity                = "affinity"
-	FieldPodMutationNodeAffinity            = "node_affinity"
-	FieldPodMutationPreferred               = "preferred_during_scheduling_ignored_during_execution"
-	FieldPodMutationWeight                  = "weight"
-	FieldPodMutationPreference              = "preference"
-	FieldPodMutationMatchExpressions           = "match_expressions"
-	FieldPodMutationMatchExpressionsKey        = "key"
-	FieldPodMutationMatchExpressionsOperator   = "operator"
-	FieldPodMutationSpotType                = "spot_type"
-	FieldPodMutationSpotDistributionPct     = "spot_distribution_percentage"
-	FieldPodMutationNodeTemplates           = "node_templates_to_consolidate"
-	FieldPodMutationRestartWorkloads        = "restart_matching_workloads"
-	FieldPodMutationPatch                   = "patch"
-	FieldPodMutationDistributionGroups      = "distribution_groups"
-	FieldPodMutationDistributionGroupName   = "name"
-	FieldPodMutationDistributionGroupPct    = "percentage"
-	FieldPodMutationDistributionGroupConfig = "config"
-	FieldPodMutationSource                  = "source"
-	FieldPodMutationFilterNames             = "names"
-	FieldPodMutationFilterNamespaces        = "namespaces"
-	FieldPodMutationFilterKinds             = "kinds"
-	FieldPodMutationFilterLabelsFilter      = "labels_filter"
-	FieldPodMutationFilterExcludeNames      = "exclude_names"
-	FieldPodMutationFilterExcludeNamespaces = "exclude_namespaces"
-	FieldPodMutationFilterExcludeKinds      = "exclude_kinds"
-	FieldPodMutationFilterExcludeLabels     = "exclude_labels_filter"
-	FieldPodMutationMatcherType             = "type"
-	FieldPodMutationMatcherValue            = "value"
-	FieldPodMutationLabelsFilterOperator    = "operator"
-	FieldPodMutationLabelsFilterMatchers    = "matchers"
-	FieldPodMutationLabelMatcherKey         = "key"
-	FieldPodMutationLabelMatcherValue       = "value"
-	FieldPodMutationValues                  = "values"
+	FieldPodMutationOrganizationID           = "organization_id"
+	FieldPodMutationClusterID                = "cluster_id"
+	FieldPodMutationName                     = "name"
+	FieldPodMutationEnabled                  = "enabled"
+	FieldPodMutationObjectFilterV2           = "object_filter_v2"
+	FieldPodMutationLabels                   = "labels"
+	FieldPodMutationAnnotations              = "annotations"
+	FieldPodMutationNodeSelector             = "node_selector"
+	FieldPodMutationNodeSelectorAdd          = "add"
+	FieldPodMutationNodeSelectorRemove       = "remove"
+	FieldPodMutationTolerations              = "tolerations"
+	FieldPodMutationTolerationKey            = "key"
+	FieldPodMutationTolerationOperator       = "operator"
+	FieldPodMutationTolerationValue          = "value"
+	FieldPodMutationTolerationEffect         = "effect"
+	FieldPodMutationTolerationSeconds        = "toleration_seconds"
+	FieldPodMutationAffinity                 = "affinity"
+	FieldPodMutationNodeAffinity             = "node_affinity"
+	FieldPodMutationPreferred                = "preferred_during_scheduling_ignored_during_execution"
+	FieldPodMutationWeight                   = "weight"
+	FieldPodMutationPreference               = "preference"
+	FieldPodMutationMatchExpressions         = "match_expressions"
+	FieldPodMutationMatchExpressionsKey      = "key"
+	FieldPodMutationMatchExpressionsOperator = "operator"
+	FieldPodMutationSpotType                 = "spot_type"
+	FieldPodMutationSpotDistributionPct      = "spot_distribution_percentage"
+	FieldPodMutationNodeTemplates            = "node_templates_to_consolidate"
+	FieldPodMutationRestartWorkloads         = "restart_matching_workloads"
+	FieldPodMutationPatch                    = "patch"
+	FieldPodMutationDistributionGroups       = "distribution_groups"
+	FieldPodMutationDistributionGroupName    = "name"
+	FieldPodMutationDistributionGroupPct     = "percentage"
+	FieldPodMutationDistributionGroupConfig  = "config"
+	FieldPodMutationSource                   = "source"
+	FieldPodMutationFilterNames              = "names"
+	FieldPodMutationFilterNamespaces         = "namespaces"
+	FieldPodMutationFilterKinds              = "kinds"
+	FieldPodMutationFilterLabelsFilter       = "labels_filter"
+	FieldPodMutationFilterExcludeNames       = "exclude_names"
+	FieldPodMutationFilterExcludeNamespaces  = "exclude_namespaces"
+	FieldPodMutationFilterExcludeKinds       = "exclude_kinds"
+	FieldPodMutationFilterExcludeLabels      = "exclude_labels_filter"
+	FieldPodMutationMatcherType              = "type"
+	FieldPodMutationMatcherValue             = "value"
+	FieldPodMutationLabelsFilterOperator     = "operator"
+	FieldPodMutationLabelsFilterMatchers     = "matchers"
+	FieldPodMutationLabelMatcherKey          = "key"
+	FieldPodMutationLabelMatcherValue        = "value"
+	FieldPodMutationValues                   = "values"
 )
 
 var spotTypeValues = []string{
@@ -156,7 +157,7 @@ var tolerationSchema = &schema.Resource{
 			Description: "Toleration effect.",
 		},
 		FieldPodMutationTolerationSeconds: {
-			Type:        schema.TypeString,
+			Type:        schema.TypeInt,
 			Optional:    true,
 			Description: "Toleration seconds.",
 		},
@@ -303,6 +304,7 @@ func resourcePodMutation() *schema.Resource {
 		FieldPodMutationOrganizationID: {
 			Type:             schema.TypeString,
 			Optional:         true,
+			Computed:         true,
 			Description:      "ID of the organization. If not provided, will be inferred from the API client.",
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IsUUID),
 		},
@@ -327,7 +329,7 @@ func resourcePodMutation() *schema.Resource {
 		},
 		FieldPodMutationObjectFilterV2: {
 			Type:        schema.TypeList,
-			Optional:    true,
+			Required:    true,
 			MaxItems:    1,
 			Description: "Advanced object filter with support for exact and regex matching.",
 			Elem: &schema.Resource{
@@ -883,8 +885,9 @@ func stateToTolerations(items []interface{}) []patching_engine.Toleration {
 		if v := m[FieldPodMutationTolerationEffect].(string); v != "" {
 			t.Effect = &v
 		}
-		if v := m[FieldPodMutationTolerationSeconds].(string); v != "" {
-			t.TolerationSeconds = &v
+		if v, ok := m[FieldPodMutationTolerationSeconds].(int); ok && v != 0 {
+			s := strconv.Itoa(v)
+			t.TolerationSeconds = &s
 		}
 		tolerations = append(tolerations, t)
 	}
@@ -1044,7 +1047,12 @@ func podMutationToState(mutation *patching_engine.PodMutation, d *schema.Resourc
 	}
 
 	if mutation.Tolerations != nil {
-		if err := d.Set(FieldPodMutationTolerations, flattenTolerations(*mutation.Tolerations)); err != nil {
+		flatTolerations, err := flattenTolerations(*mutation.Tolerations)
+		if err != nil {
+			return diag.Errorf("flattening tolerations: %v", err)
+		}
+
+		if err := d.Set(FieldPodMutationTolerations, flatTolerations); err != nil {
 			return diag.FromErr(err)
 		}
 	}
@@ -1200,18 +1208,36 @@ func flattenPodMutationNodeSelector(ns *patching_engine.PatchOptions) []map[stri
 	return []map[string]interface{}{m}
 }
 
-func flattenTolerations(tolerations []patching_engine.Toleration) []map[string]interface{} {
+func flattenTolerations(tolerations []patching_engine.Toleration) ([]map[string]interface{}, error) {
 	result := make([]map[string]interface{}, 0, len(tolerations))
 	for _, t := range tolerations {
+		tolerationSeconds, err := tolerationSecondsToInt(t.TolerationSeconds)
+		if err != nil {
+			return nil, fmt.Errorf("converting tolerationSeconds: %w", err)
+		}
+
 		result = append(result, map[string]interface{}{
 			FieldPodMutationTolerationKey:      lo.FromPtr(t.Key),
 			FieldPodMutationTolerationOperator: lo.FromPtr(t.Operator),
 			FieldPodMutationTolerationValue:    lo.FromPtr(t.Value),
 			FieldPodMutationTolerationEffect:   lo.FromPtr(t.Effect),
-			FieldPodMutationTolerationSeconds:  lo.FromPtr(t.TolerationSeconds),
+			FieldPodMutationTolerationSeconds:  tolerationSeconds,
 		})
 	}
-	return result
+	return result, nil
+}
+
+func tolerationSecondsToInt(s *string) (int, error) {
+	if s == nil {
+		return 0, nil
+	}
+
+	v, err := strconv.Atoi(*s)
+	if err != nil {
+		return 0, fmt.Errorf("atoi tolerationSeconds: %w", err)
+	}
+
+	return v, nil
 }
 
 func flattenAffinity(affinity *patching_engine.Affinity) []map[string]interface{} {
@@ -1275,7 +1301,12 @@ func flattenDistributionGroups(groups []patching_engine.DistributionGroup) ([]ma
 				configMap[FieldPodMutationNodeSelector] = flattenPodMutationNodeSelector(g.Config.NodeSelector)
 			}
 			if g.Config.Tolerations != nil {
-				configMap[FieldPodMutationTolerations] = flattenTolerations(*g.Config.Tolerations)
+				flatTolerations, err := flattenTolerations(*g.Config.Tolerations)
+				if err != nil {
+					return nil, fmt.Errorf("flattening tolerations: %w", err)
+				}
+
+				configMap[FieldPodMutationTolerations] = flatTolerations
 			}
 			if g.Config.Affinity != nil {
 				configMap[FieldPodMutationAffinity] = flattenAffinity(g.Config.Affinity)