chore: Remove advancedcluster folder (#3698)

Author: lantoli

.github/workflows/acceptance-tests-runner.yml

@@ -277,7 +277,7 @@ jobs:
       with:
         filters: |
           advanced_cluster:
-            - 'internal/service/advancedclustertpf/*.go'
+            - 'internal/service/advancedcluster/*.go'
           assume_role:
             - 'internal/provider/*.go'
           autogen:
@@ -404,7 +404,7 @@ jobs:
           HTTP_MOCKER_CAPTURE: 'true'
           ACCTEST_REGEX_RUN: ${{ inputs.reduced_tests && '^TestAccMockable' || env.ACCTEST_REGEX_RUN }}
           ACCTEST_PACKAGES: |
-            ./internal/service/advancedclustertpf
+            ./internal/service/advancedcluster
         run: make testacc
 
   advanced_cluster_tpf_mig_from_sdkv2:
@@ -430,7 +430,7 @@ jobs:
           MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'true'
           ACCTEST_REGEX_RUN: '^TestV1xMig'
           ACCTEST_PACKAGES: |
-            ./internal/service/advancedclustertpf
+            ./internal/service/advancedcluster
         run: make testacc
 
   advanced_cluster_tpf_mig_from_tpf_preview:
@@ -457,7 +457,7 @@ jobs:
           MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'false'
           ACCTEST_REGEX_RUN: '^TestV1xMig'
           ACCTEST_PACKAGES: |
-            ./internal/service/advancedclustertpf
+            ./internal/service/advancedcluster
         run: make testacc
 
   assume_role:

contributing/testing-best-practices.md

@@ -136,10 +136,7 @@ It is advised to only run a **single** test at a time when a plural data source
 1. Import state with a fixed `.tf` file
 2. Run terraform plan with an updated `*.tf` file and perform plan checks, for example check for known/unknown values in the plan. The actual update is not performed. See [Hashicorp docs](https://pkg.go.dev/github.com/hashicorp/[email protected]/plancheck#PlanCheck) for plan check options.
 
-For a full example see [plan_modifier_test.go](../internal/service/advancedclustertpf/plan_modifier_test.go).
-
-### File generation
-For a full example of generation see [`http_mocker_plan_checks_test.go`](../internal/testutil/unit/http_mocker_plan_checks_test.go)
+For a full example see [plan_modifier_test.go](../internal/service/advancedcluster/plan_modifier_test.go).
 
 1. Stores the last `GET` response from an existing [MacT](#mact---mocked-acceptance-tests) test case step. For example the last GET of `/api/atlas/v2/groups/{groupId}/clusters/{clusterName}`
    1. ImportName: `ClusterTwoRepSpecsWithAutoScalingAndSpecs`

internal/common/update/patch_framework.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 )
 
-func PatchPayloadTpf[TFModel any, SDKRequest any](ctx context.Context, diags *diag.Diagnostics, state, plan *TFModel, converter func(ctx context.Context, input *TFModel, diags *diag.Diagnostics) *SDKRequest) *SDKRequest {
+func PatchPayloadCluster[TFModel any, SDKRequest any](ctx context.Context, diags *diag.Diagnostics, state, plan *TFModel, converter func(ctx context.Context, input *TFModel, diags *diag.Diagnostics) *SDKRequest) *SDKRequest {
 	stateReq := converter(ctx, state, diags)
 	planReq := converter(ctx, plan, diags)
 	if diags.HasError() {

internal/provider/provider.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"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/advancedclustertpf"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/apikeyprojectassignment"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/atlasuser"
@@ -495,8 +495,8 @@ func (p *MongodbtlasProvider) DataSources(context.Context) []func() datasource.D
 		teamprojectassignment.DataSource,
 		apikeyprojectassignment.DataSource,
 		apikeyprojectassignment.PluralDataSource,
-		advancedclustertpf.DataSource,
-		advancedclustertpf.PluralDataSource,
+		advancedcluster.DataSource,
+		advancedcluster.PluralDataSource,
 	}
 	return dataSources
 }
@@ -523,7 +523,7 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou
 		clouduserprojectassignment.Resource,
 		teamprojectassignment.Resource,
 		clouduserteamassignment.Resource,
-		advancedclustertpf.Resource,
+		advancedcluster.Resource,
 	}
 	return resources
 }

internal/service/advancedclustertpf/common.go renamed to internal/service/advancedcluster/common.go

@@ -1,6 +1,7 @@
-package advancedclustertpf
+package advancedcluster
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"time"
@@ -9,9 +10,11 @@ import (
 	"go.mongodb.org/atlas-sdk/v20250312007/admin"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/spf13/cast"
 
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/flexcluster"
 )
 
@@ -114,3 +117,35 @@ func GetPriorityOfFlexReplicationSpecs(replicationSpecs *[]admin.ReplicationSpec
 	}
 	return regionConfig.Priority
 }
+
+func ResourceClusterListAdvancedRefreshFunc(ctx context.Context, projectID string, clustersAPI admin.ClustersApi) retry.StateRefreshFunc {
+	return func() (any, string, error) {
+		clusters, resp, err := clustersAPI.ListClusters(ctx, projectID).Execute()
+
+		if err != nil && strings.Contains(err.Error(), "reset by peer") {
+			return nil, "REPEATING", nil
+		}
+
+		if err != nil && clusters == nil && resp == nil {
+			return nil, "", err
+		}
+
+		if err != nil {
+			if validate.StatusNotFound(resp) {
+				return "", "DELETED", nil
+			}
+			if validate.StatusServiceUnavailable(resp) {
+				return "", "PENDING", nil
+			}
+			return nil, "", err
+		}
+
+		for i := range clusters.GetResults() {
+			cluster := clusters.GetResults()[i]
+			if cluster.GetStateName() != "IDLE" {
+				return cluster, "PENDING", nil
+			}
+		}
+		return clusters, "IDLE", nil
+	}
+}

internal/service/advancedclustertpf/common_admin_sdk.go renamed to internal/service/advancedcluster/common_admin_sdk.go

@@ -1,4 +1,4 @@
-package advancedclustertpf
+package advancedcluster
 
 import (
 	"context"

internal/service/advancedclustertpf/common_await_changes.go renamed to internal/service/advancedcluster/common_await_changes.go

@@ -1,4 +1,4 @@
-package advancedclustertpf
+package advancedcluster
 
 import (
 	"context"

internal/service/advancedclustertpf/common_model_sdk_version_conversion.go renamed to internal/service/advancedcluster/common_model_sdk_version_conversion.go

@@ -1,4 +1,4 @@
-package advancedclustertpf
+package advancedcluster
 
 import (
 	admin20240530 "go.mongodb.org/atlas-sdk/v20240530005/admin"

internal/service/advancedclustertpf/common_model_sdk_version_conversion_test.go renamed to internal/service/advancedcluster/common_model_sdk_version_conversion_test.go

@@ -1,10 +1,10 @@
-package advancedclustertpf_test
+package advancedcluster_test
 
 import (
 	"testing"
 
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
-	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedclustertpf"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster"
 	"github.com/stretchr/testify/assert"
 	admin20240805 "go.mongodb.org/atlas-sdk/v20240805005/admin"
 	"go.mongodb.org/atlas-sdk/v20250312007/admin"
@@ -186,7 +186,7 @@ func TestConvertClusterDescription20241023to20240805(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			result := advancedclustertpf.ConvertClusterDescription20241023to20240805(tc.input)
+			result := advancedcluster.ConvertClusterDescription20241023to20240805(tc.input)
 			assert.Equal(t, tc.expectedOutput, result)
 		})
 	}