fix: Sets replication_specs IDs when updating them. (#1876)

* fix: sets replication_specs IDs when updating them.

* change test value type.

* fix resource name for tests.

* fix resource_cluster test expectations.

Author: marcosuma

internal/service/advancedcluster/resource_advanced_cluster.go

@@ -850,6 +850,10 @@ func expandAdvancedReplicationSpec(tfMap map[string]any) *matlas.AdvancedReplica
 		RegionConfigs: expandRegionConfigs(tfMap["region_configs"].([]any)),
 	}
 
+	if tfMap["id"].(string) != "" {
+		apiObject.ID = tfMap["id"].(string)
+	}
+
 	return apiObject
 }
 

internal/service/advancedcluster/resource_advanced_cluster_test.go

@@ -599,6 +599,44 @@ func TestAccClusterAdvancedClusterConfig_ReplicationSpecsAnalyticsAutoScaling(t
 	})
 }
 
+func TestAccClusterAdvancedClusterConfig_ReplicationSpecsAndShardUpdating(t *testing.T) {
+	var (
+		cluster          matlas.AdvancedCluster
+		resourceName     = "mongodbatlas_advanced_cluster.test"
+		orgID            = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		projectName      = acctest.RandomWithPrefix("test-acc")
+		rName            = acctest.RandomWithPrefix("test-acc")
+		numShards        = "1"
+		numShardsUpdated = "2"
+	)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acc.PreCheckBasic(t) },
+		ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
+		CheckDestroy:             acc.CheckDestroyTeamAdvancedCluster,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMongoDBAtlasAdvancedClusterConfigMultiZoneWithShards(orgID, projectName, rName, numShards, numShards),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMongoDBAtlasAdvancedClusterExists(resourceName, &cluster),
+					testAccCheckMongoDBAtlasAdvancedClusterAttributes(&cluster, rName),
+					resource.TestCheckResourceAttr(resourceName, "replication_specs.0.num_shards", "1"),
+					resource.TestCheckResourceAttr(resourceName, "replication_specs.1.num_shards", "1"),
+				),
+			},
+			{
+				Config: testAccMongoDBAtlasAdvancedClusterConfigMultiZoneWithShards(orgID, projectName, rName, numShardsUpdated, numShards),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMongoDBAtlasAdvancedClusterExists(resourceName, &cluster),
+					testAccCheckMongoDBAtlasAdvancedClusterAttributes(&cluster, rName),
+					resource.TestCheckResourceAttr(resourceName, "replication_specs.0.num_shards", "2"),
+					resource.TestCheckResourceAttr(resourceName, "replication_specs.1.num_shards", "1"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccClusterAdvancedCluster_WithTags(t *testing.T) {
 	var (
 		cluster                matlas.AdvancedCluster
@@ -1142,3 +1180,59 @@ resource "mongodbatlas_advanced_cluster" "test" {
 
 	`, orgID, projectName, name, *p.Compute.Enabled, *p.DiskGBEnabled, p.Compute.MaxInstanceSize)
 }
+
+func testAccMongoDBAtlasAdvancedClusterConfigMultiZoneWithShards(orgID, projectName, name, numShardsFirstZone, numShardsSecondZone string) string {
+	return fmt.Sprintf(`
+
+	resource "mongodbatlas_project" "cluster_project" {
+		name   = %[2]q
+		org_id = %[1]q
+	}
+
+	resource "mongodbatlas_advanced_cluster" "test" {
+		project_id = mongodbatlas_project.cluster_project.id
+		name = %[3]q
+		backup_enabled = false
+		mongo_db_major_version = "6.0"
+		cluster_type   = "GEOSHARDED"
+
+		replication_specs {
+		  zone_name  = "zone n1"
+		  num_shards = %[4]q
+
+		  region_configs {
+			electable_specs {
+			  instance_size = "M10"
+			  node_count    = 3
+			}
+			analytics_specs {
+			  instance_size = "M10"
+			  node_count    = 0
+			}
+			provider_name = "AWS"
+			priority      = 7
+			region_name   = "US_EAST_1"
+		  }
+		}
+
+		replication_specs {
+		  zone_name  = "zone n2"
+		  num_shards = %[5]q
+
+		  region_configs {
+			electable_specs {
+			  instance_size = "M10"
+			  node_count    = 3
+			}
+			analytics_specs {
+			  instance_size = "M10"
+			  node_count    = 0
+			}
+			provider_name = "AWS"
+			priority      = 7
+			region_name   = "EU_WEST_1"
+		  }
+		}
+	  }
+	`, orgID, projectName, name, numShardsFirstZone, numShardsSecondZone)
+}

internal/service/cluster/resource_cluster_test.go

@@ -1380,6 +1380,28 @@ func TestAccClusterRSCluster_RegionsConfig(t *testing.T) {
 		}
 	}`
 
+	replicationsShardsUpdate := `replication_specs {
+		num_shards = 2
+		zone_name = "us2"
+		regions_config{
+			region_name     = "US_WEST_2"
+			electable_nodes = 3
+			priority        = 7
+			read_only_nodes = 0
+		}
+	  }
+
+	 replication_specs {
+		num_shards = 1
+		zone_name = "us1"
+		regions_config{
+			region_name     = "US_WEST_1"
+			electable_nodes = 3
+			priority        = 7
+			read_only_nodes = 0
+		}
+	}`
+
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acc.PreCheckBasic(t) },
 		ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
@@ -1401,6 +1423,19 @@ func TestAccClusterRSCluster_RegionsConfig(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "replication_specs.#", "2"),
 				),
 			},
+			{
+				Config: testAccMongoDBAtlasClusterConfigRegions(orgID, projectName, clusterName, replicationsShardsUpdate),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "project_id"),
+					resource.TestCheckResourceAttr(resourceName, "name", clusterName),
+					// Note: replication_specs is a set for the cluster resource, therefore the order does not
+					// necessarily match the one used to insert the configuration in the .tf file.
+					// In fact, the num_shards field is used in the custom hash algorithm hence it affects the ordering.
+					// https://github.com/mongodb/terraform-provider-mongodbatlas/blob/059cd565e7aafd59eb8be30bbc9372b56ce2ffa4/internal/service/cluster/resource_cluster.go#L274
+					resource.TestCheckResourceAttr(resourceName, "replication_specs.0.num_shards", "1"),
+					resource.TestCheckResourceAttr(resourceName, "replication_specs.1.num_shards", "2"),
+				),
+			},
 		},
 	})
 }