refactor: use providerName to retry when the upgrade is not completed (#3148)

Author: EspenAlbert

internal/service/advancedclustertpf/common.go

@@ -76,11 +76,15 @@ func GenerateFCVPinningWarningForRead(fcvPresentInState bool, apiRespFCVExpirati
 }
 
 func IsFlex(replicationSpecs *[]admin.ReplicationSpec20240805) bool {
+	return getProviderName(replicationSpecs) == flexcluster.FlexClusterType
+}
+
+func getProviderName(replicationSpecs *[]admin.ReplicationSpec20240805) string {
 	regionConfig := getRegionConfig(replicationSpecs)
 	if regionConfig == nil {
-		return false
+		return ""
 	}
-	return regionConfig.GetProviderName() == flexcluster.FlexClusterType
+	return regionConfig.GetProviderName()
 }
 
 func getRegionConfig(replicationSpecs *[]admin.ReplicationSpec20240805) *admin.CloudRegionConfig20240805 {

internal/service/advancedclustertpf/common_admin_sdk.go

@@ -128,7 +128,7 @@ func UpgradeTenant(ctx context.Context, diags *diag.Diagnostics, client *config.
 		addErrorDiag(diags, operationTenantUpgrade, defaultAPIErrorDetails(waitParams.ClusterName, err))
 		return nil
 	}
-	return AwaitChanges(ctx, client, waitParams, operationTenantUpgrade, diags)
+	return AwaitChangesUpgrade(ctx, client, waitParams, operationTenantUpgrade, diags)
 }
 
 func UpgradeFlexToDedicated(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, waitParams *ClusterWaitParams, req *admin.AtlasTenantClusterUpgradeRequest20240805) *admin.ClusterDescription20240805 {
@@ -137,7 +137,7 @@ func UpgradeFlexToDedicated(ctx context.Context, diags *diag.Diagnostics, client
 		addErrorDiag(diags, operationFlexUpgrade, defaultAPIErrorDetails(waitParams.ClusterName, err))
 		return nil
 	}
-	return AwaitChanges(ctx, client, waitParams, operationFlexUpgrade, diags)
+	return AwaitChangesUpgrade(ctx, client, waitParams, operationFlexUpgrade, diags)
 }
 
 func PinFCV(ctx context.Context, api admin.ClustersApi, projectID, clusterName, expirationDateStr string) error {

internal/service/advancedclustertpf/common_await_changes.go

@@ -10,11 +10,14 @@ import (
 	"go.mongodb.org/atlas-sdk/v20250219001/admin"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/retrystrategy"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/flexcluster"
 )
 
 var (
@@ -30,6 +33,19 @@ type ClusterWaitParams struct {
 	IsDelete    bool
 }
 
+func AwaitChangesUpgrade(ctx context.Context, client *config.MongoDBClient, waitParams *ClusterWaitParams, errorLocator string, diags *diag.Diagnostics) *admin.ClusterDescription20240805 {
+	upgraded := AwaitChanges(ctx, client, waitParams, errorLocator, diags)
+	if diags.HasError() || upgraded == nil {
+		return nil
+	}
+	providerName := getProviderName(upgraded.ReplicationSpecs)
+	if slices.Contains([]string{flexcluster.FlexClusterType, constant.TENANT}, providerName) {
+		tflog.Warn(ctx, fmt.Sprintf("cluster upgrade unexpected provider %s, retrying", providerName))
+		return AwaitChanges(ctx, client, waitParams, errorLocator, diags)
+	}
+	return upgraded
+}
+
 func AwaitChanges(ctx context.Context, client *config.MongoDBClient, waitParams *ClusterWaitParams, errorLocator string, diags *diag.Diagnostics) *admin.ClusterDescription20240805 {
 	api := client.AtlasV2.ClustersApi
 	targetState := retrystrategy.RetryStrategyIdleState