fix: Supporting upgrade with NMVe instance

internal/service/advancedcluster/model_flex.go

@@ -39,9 +39,13 @@ func GetUpgradeToDedicatedClusterRequest(d *schema.ResourceData) *admin.AtlasTen
 	if v, ok := d.GetOk("disk_size_gb"); ok {
 		rootDiskSizeGB = conversion.Pointer(v.(float64))
 	}
-	return &admin.AtlasTenantClusterUpgradeRequest20240805{
+	req := admin.AtlasTenantClusterUpgradeRequest20240805{
 		Name:             clusterName,
 		ClusterType:      conversion.Pointer(d.Get("cluster_type").(string)),
 		ReplicationSpecs: expandAdvancedReplicationSpecs(d.Get("replication_specs").([]any), rootDiskSizeGB),
 	}
+	if d.Get("backup_enabled").(bool) {
+		req.BackupEnabled = conversion.Pointer(true)
+	}
+	return &req
 }

internal/service/advancedcluster/resource_advanced_cluster.go

@@ -1511,13 +1511,18 @@ func getUpgradeRequest(d *schema.ResourceData) *admin.LegacyAtlasTenantClusterUp
 		return nil
 	}
 
-	return &admin.LegacyAtlasTenantClusterUpgradeRequest{
+	req := admin.LegacyAtlasTenantClusterUpgradeRequest{
 		ProviderSettings: &admin.ClusterProviderSettings{
 			ProviderName:     updatedRegion.GetProviderName(),
 			InstanceSizeName: updatedRegion.ElectableSpecs.InstanceSize,
 			RegionName:       updatedRegion.RegionName,
 		},
 	}
+	if d.Get("backup_enabled").(bool) {
+		// ProviderBackupEnabled must be used instead of BackupEnabled for tenant upgrade request, details in CLOUDP-327109
+		req.ProviderBackupEnabled = conversion.Pointer(true)
+	}
+	return &req
 }
 
 func waitForUpdateToFinish(ctx context.Context, connV2 *admin.APIClient, projectID, name string, timeout time.Duration) error {

internal/service/advancedcluster/resource_advanced_cluster_test.go

@@ -174,8 +174,8 @@ func TestAccMockableAdvancedCluster_tenantUpgrade(t *testing.T) {
 				Check:  checkTenant(true, projectID, clusterName),
 			},
 			{
-				Config: acc.ConvertAdvancedClusterToPreviewProviderV2(t, true, acc.ConfigBasicDedicated(projectID, clusterName, defaultZoneName)),
-				Check:  checksBasicDedicated(projectID, clusterName),
+				Config: acc.ConvertAdvancedClusterToPreviewProviderV2(t, true, acc.ConfigDedicatedNVMeBackupEnabled(projectID, clusterName, defaultZoneName)),
+				Check:  checksDedicatedNVMeBackupEnabled(projectID, clusterName),
 			},
 			acc.TestStepImportCluster(resourceName),
 		},
@@ -1790,6 +1790,18 @@ func checksBasicDedicated(projectID, name string) resource.TestCheckFunc {
 	return checkAggr(true, nil, checkMap, originalChecks)
 }
 
+func checksDedicatedNVMeBackupEnabled(projectID, name string) resource.TestCheckFunc {
+	originalChecks := checkTenant(true, projectID, name)
+	checkMap := map[string]string{
+		"backup_enabled": "true",
+		"replication_specs.0.region_configs.0.electable_specs.0.node_count":      "3",
+		"replication_specs.0.region_configs.0.electable_specs.0.instance_size":   "M40_NVME",
+		"replication_specs.0.region_configs.0.electable_specs.0.ebs_volume_type": "PROVISIONED",
+		"replication_specs.0.region_configs.0.provider_name":                     "AWS",
+	}
+	return checkAggr(true, nil, checkMap, originalChecks)
+}
+
 func configWithKeyValueBlocks(t *testing.T, usePreviewProvider bool, orgID, projectName, clusterName, blockName string, blocks ...map[string]string) string {
 	t.Helper()
 	var extraConfig string

internal/service/advancedcluster/testdata/TestAccMockableAdvancedCluster_tenantUpgrade/02_01_POST__api_atlas_v2_groups_{groupId}_clusters_tenantUpgrade_2023-01-01.json

@@ -1,7 +1,8 @@
 {
  "name": "{clusterName}",
+ "providerBackupEnabled": true,
  "providerSettings": {
-  "instanceSizeName": "M10",
+  "instanceSizeName": "M40_NVME",
   "providerName": "AWS",
   "regionName": "US_EAST_1"
  }

internal/service/advancedclustertpf/resource_upgrade.go

@@ -2,6 +2,7 @@ package advancedclustertpf
 
 import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/flexcluster"
 	"go.mongodb.org/atlas-sdk/v20250312005/admin"
 )
@@ -17,14 +18,20 @@ func getUpgradeTenantRequest(state, patch *admin.ClusterDescription20240805) *ad
 	if oldProviderName != constant.TENANT || newProviderName == constant.TENANT {
 		return nil
 	}
-	return &admin.LegacyAtlasTenantClusterUpgradeRequest{
+
+	req := admin.LegacyAtlasTenantClusterUpgradeRequest{
 		Name: state.GetName(),
 		ProviderSettings: &admin.ClusterProviderSettings{
 			ProviderName:     newProviderName,
 			RegionName:       newRegion.RegionName,
 			InstanceSizeName: newRegion.GetElectableSpecs().InstanceSize,
 		},
 	}
+	if patch.GetBackupEnabled() {
+		// ProviderBackupEnabled must be used instead of BackupEnabled for tenant upgrade request, details in CLOUDP-327109
+		req.ProviderBackupEnabled = conversion.Pointer(true)
+	}
+	return &req
 }
 
 func getUpgradeFlexToDedicatedRequest(state, patch *admin.ClusterDescription20240805) *admin.AtlasTenantClusterUpgradeRequest20240805 {
@@ -40,9 +47,18 @@ func getUpgradeFlexToDedicatedRequest(state, patch *admin.ClusterDescription2024
 	if oldProviderName != flexcluster.FlexClusterType || newProviderName == flexcluster.FlexClusterType {
 		return nil
 	}
-	return &admin.AtlasTenantClusterUpgradeRequest20240805{
+	req := admin.AtlasTenantClusterUpgradeRequest20240805{
 		Name:             state.GetName(),
 		ClusterType:      state.ClusterType,
 		ReplicationSpecs: patch.ReplicationSpecs,
 	}
+
+	backupEnabled := state.BackupEnabled // a flex cluster can already have backup enabled
+	if patch.BackupEnabled != nil {
+		backupEnabled = patch.BackupEnabled
+	}
+	if backupEnabled != nil && *backupEnabled {
+		req.BackupEnabled = conversion.Pointer(true)
+	}
+	return &req
 }

internal/testutil/acc/advanced_cluster.go

@@ -207,21 +207,56 @@ func ConfigBasicDedicated(projectID, name, zoneName string) string {
 			%[3]s
 		}
 	}
-	data "mongodbatlas_advanced_cluster" "test" {
-		project_id = mongodbatlas_advanced_cluster.test.project_id
-		name 	     = mongodbatlas_advanced_cluster.test.name
-		use_replication_spec_per_shard = true
-		depends_on = [mongodbatlas_advanced_cluster.test]
-	}
-
-	data "mongodbatlas_advanced_clusters" "test" {
-		use_replication_spec_per_shard = true
-		project_id = mongodbatlas_advanced_cluster.test.project_id
-		depends_on = [mongodbatlas_advanced_cluster.test]
-	}
-	`, projectID, name, zoneNameLine)
+	%[4]s
+	`, projectID, name, zoneNameLine, advancedClusterDataSources)
 }
 
+func ConfigDedicatedNVMeBackupEnabled(projectID, name, zoneName string) string {
+	zoneNameLine := ""
+	if zoneName != "" {
+		zoneNameLine = fmt.Sprintf("zone_name = %q", zoneName)
+	}
+	return fmt.Sprintf(`
+	resource "mongodbatlas_advanced_cluster" "test" {
+		project_id   = %[1]q
+		name         = %[2]q
+		cluster_type = "REPLICASET"
+
+		backup_enabled = true
+
+		replication_specs {
+			region_configs {
+				priority        = 7
+				provider_name = "AWS"
+				region_name     = "US_EAST_1"
+				electable_specs {
+					instance_size   = "M40_NVME"
+        			ebs_volume_type = "PROVISIONED"
+        			node_count      = 3
+				}
+			}
+			%[3]s
+		}
+	}
+	%[4]s
+	`, projectID, name, zoneNameLine, advancedClusterDataSources)
+}
+
+const advancedClusterDataSources = `
+data "mongodbatlas_advanced_cluster" "test" {
+	project_id = mongodbatlas_advanced_cluster.test.project_id
+	name 	     = mongodbatlas_advanced_cluster.test.name
+	use_replication_spec_per_shard = true
+	depends_on = [mongodbatlas_advanced_cluster.test]
+}
+
+data "mongodbatlas_advanced_clusters" "test" {
+	use_replication_spec_per_shard = true
+	project_id = mongodbatlas_advanced_cluster.test.project_id
+	depends_on = [mongodbatlas_advanced_cluster.test]
+}
+`
+
 func JoinQuotedStrings(list []string) string {
 	quoted := make([]string, len(list))
 	for i, item := range list {