chore: Takes electable_specs in TPF adv_cluster from state if it was in config (#3203)

* electableSpecs

* add test removing electable_specs

* Revert "add test removing electable_specs"

This reverts commit 296bca2.

* test: Enhance PlanChecks with specInstanceSizeNodeCount for read_only_specs and electable_specs

---------

Co-authored-by: Espen Albert <[email protected]>

Author: lantoli

internal/service/advancedcluster/resource_advanced_cluster_test.go

@@ -1500,7 +1500,7 @@ func configSharded(t *testing.T, projectID, clusterName string, withUpdate bool)
 
 func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, defineBlocks bool) string {
 	t.Helper()
-	var extraConfig0, extraConfig1 string
+	var extraConfig0, extraConfig1, electableSpecs0 string
 	autoScalingBlocks := `
 		auto_scaling {
 			disk_gb_enabled            = true
@@ -1518,6 +1518,12 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
 		}
 	`
 	if defineBlocks {
+		electableSpecs0 = `
+			electable_specs {
+				instance_size   = "M10"
+				node_count      = 5
+			}
+		`
 		// read only + autoscaling blocks
 		extraConfig0 = `
 			read_only_specs {
@@ -1549,10 +1555,7 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
 					provider_name = "AWS"
 					priority      = 7
 					region_name   = "US_EAST_1"
-					electable_specs {
-						instance_size   = "M10"
-						node_count      = 5
-					}
+					%[6]s
 					%[4]s
 				}
 			}
@@ -1577,7 +1580,7 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
 				}
 			}
 		}
-	`, projectID, clusterName, instanceSize, extraConfig0, extraConfig1))
+	`, projectID, clusterName, instanceSize, extraConfig0, extraConfig1, electableSpecs0))
 }
 
 func checkBlocks(instanceSize string) resource.TestCheckFunc {

internal/service/advancedclustertpf/plan_modifier.go

@@ -119,9 +119,14 @@ func AdjustRegionConfigsChildren(ctx context.Context, diags *diag.Diagnostics, s
 			return
 		}
 		for j := range minLen(planRegionConfigsTF, stateRegionConfigsTF) {
+			stateElectableSpecs := TFModelObject[TFSpecsModel](ctx, stateRegionConfigsTF[j].ElectableSpecs)
+			planElectableSpecs := TFModelObject[TFSpecsModel](ctx, planRegionConfigsTF[j].ElectableSpecs)
+			if planElectableSpecs == nil && stateElectableSpecs != nil && stateElectableSpecs.NodeCount.ValueInt64() > 0 {
+				planRegionConfigsTF[j].ElectableSpecs = stateRegionConfigsTF[j].ElectableSpecs
+				planElectableSpecs = stateElectableSpecs
+			}
 			stateReadOnlySpecs := TFModelObject[TFSpecsModel](ctx, stateRegionConfigsTF[j].ReadOnlySpecs)
 			planReadOnlySpecs := TFModelObject[TFSpecsModel](ctx, planRegionConfigsTF[j].ReadOnlySpecs)
-			planElectableSpecs := TFModelObject[TFSpecsModel](ctx, planRegionConfigsTF[j].ElectableSpecs)
 			if stateReadOnlySpecs != nil { // read_only_specs is present in state
 				// logic below ensures that if read only specs is present in state but not in the plan, plan will be populated so that read only spec configuration is not removed on update operations
 				newPlanReadOnlySpecs := planReadOnlySpecs

internal/service/advancedclustertpf/plan_modifier_test.go

@@ -27,6 +27,13 @@ func autoScalingKnownValue(computeEnabled, diskEnabled, scaleDown bool, minInsta
 	})
 }
 
+func specInstanceSizeNodeCount(instanceSize string, nodeCount int) knownvalue.Check {
+	return knownvalue.ObjectPartial(map[string]knownvalue.Check{
+		"instance_size": knownvalue.StringExact(instanceSize),
+		"node_count":    knownvalue.Int64Exact(int64(nodeCount)),
+	})
+}
+
 func TestPlanChecksClusterTwoRepSpecsWithAutoScalingAndSpecs(t *testing.T) {
 	var (
 		baseConfig         = unit.NewMockPlanChecksConfig(t, &mockConfig, unit.ImportNameClusterTwoRepSpecsWithAutoScalingAndSpecs)
@@ -43,15 +50,20 @@ func TestPlanChecksClusterTwoRepSpecsWithAutoScalingAndSpecs(t *testing.T) {
 				ConfigFilename: "main_removed_blocks_from_config_and_instance_change.tf",
 				Checks: []plancheck.PlanCheck{
 					plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
-					plancheck.ExpectKnownValue(resourceName, regionConfig0.AtMapKey("read_only_specs").AtMapKey("instance_size"), knownvalue.StringExact("M10")),
-					plancheck.ExpectKnownValue(resourceName, regionConfig1.AtMapKey("read_only_specs").AtMapKey("instance_size"), knownvalue.StringExact("M20")),
+					// checks regionConfig0
+					plancheck.ExpectKnownValue(resourceName, regionConfig0.AtMapKey("read_only_specs"), specInstanceSizeNodeCount("M10", 2)),
+					plancheck.ExpectKnownValue(resourceName, regionConfig0.AtMapKey("electable_specs"), specInstanceSizeNodeCount("M10", 5)),
 					plancheck.ExpectKnownValue(resourceName, regionConfig0.AtMapKey("auto_scaling"), autoScalingEnabled),
 					plancheck.ExpectKnownValue(resourceName, regionConfig0.AtMapKey("analytics_auto_scaling"), autoScalingEnabled),
+					plancheck.ExpectUnknownValue(resourceName, regionConfig0.AtMapKey("analytics_specs")), // analytics specs was defined in region_configs.0 but not in region_configs.1
+					plancheck.ExpectUnknownValue(resourceName, repSpec0.AtMapKey("id")),
+
+					// checks regionConfig1
+					plancheck.ExpectKnownValue(resourceName, regionConfig1.AtMapKey("read_only_specs"), specInstanceSizeNodeCount("M20", 1)),
+					plancheck.ExpectKnownValue(resourceName, regionConfig1.AtMapKey("electable_specs"), specInstanceSizeNodeCount("M20", 3)),
 					plancheck.ExpectKnownValue(resourceName, regionConfig1.AtMapKey("auto_scaling"), autoScalingEnabled),
 					plancheck.ExpectKnownValue(resourceName, regionConfig1.AtMapKey("analytics_auto_scaling"), autoScalingEnabled),
-					plancheck.ExpectUnknownValue(resourceName, regionConfig0.AtMapKey("analytics_specs")), // analytics specs was defined in region_configs.0 but not in region_configs.1
 					plancheck.ExpectKnownValue(resourceName, regionConfig1.AtMapKey("analytics_specs"), knownvalue.NotNull()),
-					plancheck.ExpectUnknownValue(resourceName, repSpec0.AtMapKey("id")),
 					plancheck.ExpectUnknownValue(resourceName, repSpec1.AtMapKey("id")),
 				},
 			},

internal/service/advancedclustertpf/testdata/ClusterTwoRepSpecsWithAutoScalingAndSpecs/main_removed_blocks_from_config_and_instance_change.tf

@@ -6,10 +6,6 @@ resource "mongodbatlas_advanced_cluster" "test" {
 
   replication_specs = [{
     region_configs = [{
-      electable_specs = {
-        instance_size = "M10"
-        node_count    = 5
-      }
       priority      = 7
       provider_name = "AWS"
       region_name   = "US_EAST_1"