Skip to content

Commit 9709558

Browse files
fix removeBlocksFromConfig by using node_count instead of instance_size for triggering a change
1 parent 86f5706 commit 9709558

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

internal/service/advancedcluster/resource_advanced_cluster_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -1399,14 +1399,14 @@ func TestAccAdvancedCluster_removeBlocksFromConfig(t *testing.T) {
13991399
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
14001400
Steps: []resource.TestStep{
14011401
{
1402-
Config: configBlocks(t, projectID, clusterName, "M10", true),
1403-
Check: checkBlocks("M10"),
1402+
Config: configBlocks(t, projectID, clusterName, 3, true),
1403+
Check: checkBlocks(3),
14041404
},
14051405
// removing blocks generates an empty plan
1406-
acc.TestStepCheckEmptyPlan(configBlocks(t, projectID, clusterName, "M10", false)),
1406+
acc.TestStepCheckEmptyPlan(configBlocks(t, projectID, clusterName, 3, false)),
14071407
{
1408-
Config: configBlocks(t, projectID, clusterName, "M20", false), // applying a change after removing blocks preserves previous state
1409-
Check: checkBlocks("M20"),
1408+
Config: configBlocks(t, projectID, clusterName, 5, false), // applying a change after removing blocks preserves previous state
1409+
Check: checkBlocks(5),
14101410
},
14111411
acc.TestStepImportCluster(resourceName),
14121412
},
@@ -1506,7 +1506,7 @@ func configSharded(t *testing.T, projectID, clusterName string, withUpdate bool)
15061506
`, projectID, clusterName, autoScaling, analyticsSpecs, analyticsSpecsForSpec2)) + dataSourcesTFNewSchema
15071507
}
15081508

1509-
func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, defineBlocks bool) string {
1509+
func configBlocks(t *testing.T, projectID, clusterName string, nodeCount int, defineBlocks bool) string {
15101510
t.Helper()
15111511
var extraConfig0, extraConfig1 string
15121512
autoScalingBlocks := `
@@ -1572,8 +1572,8 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
15721572
priority = 7
15731573
region_name = "US_WEST_2"
15741574
electable_specs {
1575-
instance_size = %[3]q
1576-
node_count = 3
1575+
instance_size = "M10"
1576+
node_count = %[3]d
15771577
}
15781578
%[5]s
15791579
}
@@ -1585,20 +1585,20 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
15851585
}
15861586
}
15871587
}
1588-
`, projectID, clusterName, instanceSize, extraConfig0, extraConfig1))
1588+
`, projectID, clusterName, nodeCount, extraConfig0, extraConfig1))
15891589
}
15901590

1591-
func checkBlocks(instanceSize string) resource.TestCheckFunc {
1591+
func checkBlocks(nodeCount int) resource.TestCheckFunc {
15921592
checksMap := map[string]string{
15931593
"replication_specs.0.region_configs.0.electable_specs.0.instance_size": "M10",
15941594
"replication_specs.0.region_configs.0.electable_specs.0.node_count": "5",
15951595
"replication_specs.0.region_configs.0.read_only_specs.0.instance_size": "M10",
15961596
"replication_specs.0.region_configs.0.read_only_specs.0.node_count": "2",
15971597
"replication_specs.0.region_configs.0.analytics_specs.0.node_count": "0",
15981598

1599-
"replication_specs.1.region_configs.0.electable_specs.0.instance_size": instanceSize,
1600-
"replication_specs.1.region_configs.0.electable_specs.0.node_count": "3",
1601-
"replication_specs.1.region_configs.0.read_only_specs.0.instance_size": instanceSize,
1599+
"replication_specs.1.region_configs.0.electable_specs.0.instance_size": "M10",
1600+
"replication_specs.1.region_configs.0.electable_specs.0.node_count": fmt.Sprintf("%d", nodeCount),
1601+
"replication_specs.1.region_configs.0.read_only_specs.0.instance_size": "M10",
16021602
"replication_specs.1.region_configs.0.read_only_specs.0.node_count": "1",
16031603
"replication_specs.1.region_configs.0.analytics_specs.0.instance_size": "M10",
16041604
"replication_specs.1.region_configs.0.analytics_specs.0.node_count": "4",

0 commit comments

Comments
 (0)