all dynamic blocks in replication_specs

Author: lantoli

internal/convert/convert.go

@@ -37,7 +37,7 @@ const (
 )
 
 var (
-	dynamicBlockAllowList = []string{nTags, nLabels, nConfigSrc}
+	dynamicBlockAllowList = []string{nTags, nLabels, nConfigSrc, nRepSpecs}
 )
 
 type attrVals struct {
@@ -91,17 +91,22 @@ func convertResource(block *hclwrite.Block) (bool, error) {
 	}
 
 	var err error
-	if blockb.FirstMatchingBlock(nRepSpecs, nil) != nil {
-		err = fillCluster(blockb)
-	} else {
+	if isFreeTierCluster(blockb) {
 		err = fillFreeTierCluster(blockb)
+	} else {
+		err = fillCluster(blockb)
 	}
 	if err != nil {
 		return false, err
 	}
 	return true, nil
 }
 
+func isFreeTierCluster(resourceb *hclwrite.Body) bool {
+	d, _ := getDynamicBlock(resourceb, nRepSpecs)
+	return resourceb.FirstMatchingBlock(nRepSpecs, nil) == nil && !d.IsPresent()
+}
+
 func convertDataSource(block *hclwrite.Block) bool {
 	if block.Type() != dataSourceType {
 		return false

internal/convert/testdata/clu2adv/dynamic_replication_specs.out.tf

@@ -1,17 +1,16 @@
 # Based on https://github.com/mongodb/terraform-provider-mongodbatlas/blob/master/examples/migrate_cluster_to_advanced_cluster/module_maintainer/v1/main.tf
-resource "mongodbatlas_advanced_cluster" "dynamic_regions_config" {
+resource "mongodbatlas_advanced_cluster" "this" {
   lifecycle {
     precondition {
       condition     = !(var.auto_scaling_disk_gb_enabled && var.disk_size > 0)
       error_message = "Must use either auto_scaling_disk_gb_enabled or disk_size, not both."
     }
   }
 
-  project_id                   = var.project_id
-  name                         = var.cluster_name
-  auto_scaling_disk_gb_enabled = var.auto_scaling_disk_gb_enabled
-  cluster_type                 = var.cluster_type
-  mongo_db_major_version       = var.mongo_db_major_version
+  project_id             = var.project_id
+  name                   = var.cluster_name
+  cluster_type           = var.cluster_type
+  mongo_db_major_version = var.mongo_db_major_version
 
   replication_specs = flatten([
     for spec in var.replication_specs : [

internal/convert/testdata/clu2adv/errors.json

@@ -1,10 +1,9 @@
 {
+	"autoscaling_missing_attribute": "setting replication_specs: attribute provider_instance_size_name not found",
 	"configuration_file_error": "failed to parse Terraform config file",
 	"free_cluster_missing_attribute": "free cluster (because no replication_specs): attribute backing_provider_name not found",
-	"autoscaling_missing_attribute": "setting replication_specs: attribute provider_instance_size_name not found",
-	"replication_specs_missing_regions_config": "setting replication_specs: regions_config not found",
 	"regions_config_missing_priority": "setting replication_specs: attribute priority not found",
-	"replication_specs_unsupported_dynamic": "dynamic blocks are not supported",
-	"replication_specs_non_literal_num_shards": "setting num_shards: failed to evaluate number",
-	"replication_specs_missing_num_shards": "num_shards not found"
+	"replication_specs_missing_num_shards": "num_shards not found",
+	"replication_specs_missing_regions_config": "setting replication_specs: regions_config not found",
+	"replication_specs_non_literal_num_shards": "setting num_shards: failed to evaluate number"
 }