fix: Avoid error when removing read only spec in region config that does not define electable specs #3162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:bug | ||
| resource/mongodbatlas_advanced_cluster (preview provider 2.0.0): Avoid error when removing `read_only_specs` in `region_configs` that does not define `electable_specs` | ||
AgustinBettati marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ``` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -213,14 +213,23 @@ func replicaSetAWSProviderTestCase(t *testing.T, isAcc bool) resource.TestCase { | |
| }), | ||
| Check: checkReplicaSetAWSProvider(isAcc, projectID, clusterName, 60, 3, true, true), | ||
| }, | ||
| // empty plan when analytics block is removed | ||
| acc.TestStepCheckEmptyPlan(configAWSProvider(t, isAcc, ReplicaSetAWSConfig{ | ||
| ProjectID: projectID, | ||
| ClusterName: clusterName, | ||
| ClusterType: "REPLICASET", | ||
| DiskSizeGB: 60, | ||
| NodeCountElectable: 3, | ||
| WithAnalyticsSpecs: false, | ||
| })), | ||
| { | ||
| Config: configAWSProvider(t, isAcc, ReplicaSetAWSConfig{ | ||
| ProjectID: projectID, | ||
| ClusterName: clusterName, | ||
| ClusterType: "REPLICASET", | ||
| DiskSizeGB: 50, | ||
| NodeCountElectable: 5, | ||
| WithAnalyticsSpecs: false, // other update made after removed analytics block, computed value is expected to be the same | ||
| }), | ||
| Check: checkReplicaSetAWSProvider(isAcc, projectID, clusterName, 50, 5, true, true), | ||
| }, | ||
|
|
@@ -557,8 +566,10 @@ func TestAccClusterAdvancedClusterConfig_replicationSpecsAutoScaling(t *testing. | |
| acc.TestCheckResourceAttrPreviewProviderV2(true, resourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_size_gb", "10"), // modified disk size gb in config is ignored | ||
| ), | ||
| }, | ||
| // empty plan when auto_scaling block is removed | ||
| acc.TestStepCheckEmptyPlan(configReplicationSpecsAutoScaling(t, true, projectID, clusterName, nil, "M20", 20, 1)), | ||
| { | ||
| Config: configReplicationSpecsAutoScaling(t, true, projectID, clusterName, nil, "M10", 10, 2), // other change after autoscaling block removed, preserves previous state | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| acc.CheckExistsCluster(resourceName), | ||
| acc.TestCheckResourceAttrPreviewProviderV2(true, resourceName, "name", clusterName), | ||
|
|
@@ -611,8 +622,10 @@ func TestAccClusterAdvancedClusterConfig_replicationSpecsAnalyticsAutoScaling(t | |
| acc.TestCheckResourceAttrPreviewProviderV2(true, resourceName, "replication_specs.0.region_configs.0.analytics_auto_scaling.0.compute_enabled", "true"), | ||
| ), | ||
| }, | ||
| // empty plan when analytics_auto_scaling block is removed | ||
| acc.TestStepCheckEmptyPlan(configReplicationSpecsAnalyticsAutoScaling(t, true, projectID, clusterNameUpdated, nil, 1)), | ||
| { | ||
| Config: configReplicationSpecsAnalyticsAutoScaling(t, true, projectID, clusterNameUpdated, nil, 2), // other changes after analytics_auto_scaling block removed, preserves previous state | ||
| Check: resource.ComposeAggregateTestCheckFunc( | ||
| acc.CheckExistsCluster(resourceName), | ||
| acc.TestCheckResourceAttrPreviewProviderV2(true, resourceName, "name", clusterNameUpdated), | ||
|
|
@@ -1375,23 +1388,25 @@ func TestAccMockableAdvancedCluster_shardedAddAnalyticsAndAutoScaling(t *testing | |
| }) | ||
| } | ||
|
|
||
| func TestAccAdvancedCluster_removeBlocksFromConfig(t *testing.T) { | ||
|
There was a problem hiding this comment. refactored |
||
| if !config.PreviewProviderV2AdvancedCluster() { // SDKv2 don't set "computed" specs in the state | ||
| t.Skip("This test is not applicable for SDKv2") | ||
| } | ||
| var ( | ||
| projectID, clusterName = acc.ProjectIDExecutionWithCluster(t, 15) | ||
| ) | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| ProtoV6ProviderFactories: acc.TestAccProviderV6Factories, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: configBlocks(t, projectID, clusterName, "M10", true), | ||
| Check: checkBlocks("M10"), | ||
| }, | ||
| // removing blocks generates an empty plan | ||
| acc.TestStepCheckEmptyPlan(configBlocks(t, projectID, clusterName, "M10", false)), | ||
| { | ||
| Config: configBlocks(t, projectID, clusterName, "M20", false), // applying a change after removing blocks preserves previous state | ||
| Check: checkBlocks("M20"), | ||
| }, | ||
| acc.TestStepImportCluster(resourceName), | ||
| }, | ||
|
|
@@ -1491,10 +1506,10 @@ func configSharded(t *testing.T, projectID, clusterName string, withUpdate bool) | |
| `, projectID, clusterName, autoScaling, analyticsSpecs, analyticsSpecsForSpec2)) + dataSourcesTFNewSchema | ||
| } | ||
|
|
||
| func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, defineBlocks bool) string { | ||
| t.Helper() | ||
| var extraConfig0, extraConfig1 string | ||
| autoScalingBlocks := ` | ||
| auto_scaling { | ||
| disk_gb_enabled = true | ||
| compute_enabled = true | ||
|
|
@@ -1510,15 +1525,15 @@ func configBlocks(t *testing.T, projectID, clusterName string, firstStep bool) s | |
| compute_scale_down_enabled = true | ||
| } | ||
| ` | ||
| if defineBlocks { | ||
| // read only + autoscaling blocks | ||
| extraConfig0 = ` | ||
| read_only_specs { | ||
| instance_size = "M10" | ||
| node_count = 2 | ||
| } | ||
| ` + autoScalingBlocks | ||
| // read only + analytics + autoscaling blocks | ||
| extraConfig1 = ` | ||
| read_only_specs { | ||
| instance_size = "M10" | ||
|
|
@@ -1528,7 +1543,7 @@ func configBlocks(t *testing.T, projectID, clusterName string, firstStep bool) s | |
| instance_size = "M10" | ||
| node_count = 4 | ||
| } | ||
| ` + autoScalingBlocks | ||
| } | ||
| return acc.ConvertAdvancedClusterToPreviewProviderV2(t, true, fmt.Sprintf(` | ||
| resource "mongodbatlas_advanced_cluster" "test" { | ||
|
|
@@ -1562,29 +1577,34 @@ func configBlocks(t *testing.T, projectID, clusterName string, firstStep bool) s | |
| } | ||
| %[5]s | ||
| } | ||
| region_configs { // region with no electable specs | ||
| provider_name = "AWS" | ||
| priority = 0 | ||
| region_name = "US_EAST_1" | ||
| %[4]s | ||
| } | ||
| } | ||
| } | ||
| `, projectID, clusterName, instanceSize, extraConfig0, extraConfig1)) | ||
| } | ||
|
|
||
| func checkBlocks(instanceSize string) resource.TestCheckFunc { | ||
| checksMap := map[string]string{ | ||
| "replication_specs.0.region_configs.0.electable_specs.0.instance_size": "M10", | ||
| "replication_specs.0.region_configs.0.electable_specs.0.node_count": "5", | ||
| "replication_specs.0.region_configs.0.read_only_specs.0.instance_size": "M10", | ||
| "replication_specs.0.region_configs.0.read_only_specs.0.node_count": "2", | ||
| "replication_specs.0.region_configs.0.analytics_specs.0.node_count": "0", | ||
|
|
||
| "replication_specs.1.region_configs.0.electable_specs.0.instance_size": instanceSize, | ||
| "replication_specs.1.region_configs.0.electable_specs.0.node_count": "3", | ||
| "replication_specs.1.region_configs.0.read_only_specs.0.instance_size": instanceSize, | ||
| "replication_specs.1.region_configs.0.read_only_specs.0.node_count": "1", | ||
| "replication_specs.1.region_configs.0.analytics_specs.0.instance_size": "M10", | ||
| "replication_specs.1.region_configs.0.analytics_specs.0.node_count": "4", | ||
|
|
||
| "replication_specs.1.region_configs.1.read_only_specs.0.instance_size": "M10", | ||
| "replication_specs.1.region_configs.1.read_only_specs.0.node_count": "2", | ||
| } | ||
| for repSpecsIdx := range 2 { | ||
| for _, block := range []string{"auto_scaling", "analytics_auto_scaling"} { | ||
|
|
||
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
using
mongodbatlas_advanced_cluster (preview provider 2.0.0)in the changelog