remove: Removes mongodbatlas_advanced_cluster deprecated params (#3635)

Author: maastha

.changelog/3635.txt

@@ -0,0 +1,23 @@
+```release-note:breaking-change
+resource/mongodbatlas_advanced_cluster: Removes deprecated attributes `id`, `disk_size_gb`, `replication_specs.#.id`, `replication_specs.#.num_shards`
+```
+
+```release-note:breaking-change
+data-source/mongodbatlas_advanced_cluster: Removes deprecated attributes `use_replication_spec_per_shard`, `id`, `disk_size_gb`, `replication_specs.#.id`,  `replication_specs.#.num_shards`
+```
+
+```release-note:breaking-change
+data-source/mongodbatlas_advanced_clusters: Removes deprecated attributes `use_replication_spec_per_shard`, `results.#.id`, `results.#.disk_size_gb`, `results.#.replication_specs.#.id`,  `results.#.replication_specs.#.num_shards`
+```
+
+```release-note:breaking-change
+resource/mongodbatlas_advanced_cluster: Removes deprecated attributes `advanced_configuration.default_read_concern` and `advanced_configuration.fail_index_key_too_long`
+```
+
+```release-note:breaking-change
+data-source/mongodbatlas_advanced_cluster: Removes deprecated attributes `advanced_configuration.default_read_concern` and `advanced_configuration.fail_index_key_too_long`
+```
+
+```release-note:breaking-change
+data-source/mongodbatlas_advanced_clusters: Removes deprecated attributes `results.#.advanced_configuration.default_read_concern` and `results.#.advanced_configuration.fail_index_key_too_long`
+```

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

@@ -398,7 +398,6 @@ jobs:
       - name: Acceptance Tests
         env:
           MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
-          MONGODB_ATLAS_LAST_1X_VERSION: ${{ inputs.mongodb_atlas_last_1x_version }}
           HTTP_MOCKER_CAPTURE: 'true'
           ACCTEST_REGEX_RUN: ${{ inputs.reduced_tests && '^TestAccMockable' || env.ACCTEST_REGEX_RUN }}
           ACCTEST_PACKAGES: |
@@ -408,8 +407,6 @@ jobs:
   advanced_cluster_tpf_mig_from_sdkv2:
     needs: [ change-detection, get-provider-version ]
     if: ${{ inputs.reduced_tests == false && (needs.change-detection.outputs.advanced_cluster == 'true' || inputs.test_group == 'advanced_cluster') }}
-    env:
-      MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'true'
     runs-on: ubuntu-latest
     permissions: {}
     steps:
@@ -427,7 +424,35 @@ jobs:
         env:
           MONGODB_ATLAS_LAST_VERSION: ${{ inputs.mongodb_atlas_last_1x_version }}
           MONGODB_ATLAS_LAST_1X_VERSION: ${{ inputs.mongodb_atlas_last_1x_version }}
-          ACCTEST_REGEX_RUN: '^TestMig'
+          MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'true'
+          ACCTEST_REGEX_RUN: '^TestV1xMig'
+          ACCTEST_PACKAGES: |
+            ./internal/service/advancedclustertpf
+        run: make testacc
+
+  advanced_cluster_tpf_mig_from_tpf_preview:
+    needs: [ change-detection, get-provider-version ]
+    if: ${{ inputs.reduced_tests == false && (needs.change-detection.outputs.advanced_cluster == 'true' || inputs.test_group == 'advanced_cluster') }}
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        with:
+          ref: ${{ inputs.ref || github.ref }}
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        with:
+          go-version-file: 'go.mod'
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
+        with:
+          terraform_version: ${{ inputs.terraform_version }}
+          terraform_wrapper: false  
+      - name: Acceptance Tests
+        env:
+          MONGODB_ATLAS_LAST_VERSION: ${{ inputs.mongodb_atlas_last_1x_version }}
+          MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: 'true' # required for migration tests that use provider version < 2.0.0
+          MONGODB_ATLAS_LAST_1X_VERSION: ${{ inputs.mongodb_atlas_last_1x_version }}
+          MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'false'
+          ACCTEST_REGEX_RUN: '^TestV1xMig'
           ACCTEST_PACKAGES: |
             ./internal/service/advancedclustertpf
         run: make testacc

.github/workflows/code-health.yml

@@ -91,4 +91,4 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/acceptance-tests.yml
     with:
-        reduced_tests: true
+        reduced_tests: false

docs/resources/advanced_cluster.md

@@ -612,6 +612,8 @@ Key-value pairs that categorize the cluster. Each key and value has a maximum le
 
 ### replication_specs
 
+~> **NOTE:**  We recommend reviewing our [Best Practices](#remove-or-disable-functionality) before disabling or removing any elements of replication_specs.
+
 ```terraform
 //Example Multicloud
 replication_specs = [
@@ -655,6 +657,8 @@ If you are upgrading a replica set to a sharded cluster, you cannot increase the
 
 ### region_configs
 
+~> **NOTE:**  We recommend reviewing our [Best Practices](#remove-or-disable-functionality) before disabling or removing any elements of region_configs.
+
 * `analytics_specs` - (Optional) Hardware specifications for [analytics nodes](https://docs.atlas.mongodb.com/reference/faq/deployment/#std-label-analytics-nodes-overview) needed in the region. Analytics nodes handle analytic data such as reporting queries from BI Connector for Atlas. Analytics nodes are read-only and can never become the [primary](https://docs.atlas.mongodb.com/reference/glossary/#std-term-primary). If you don't specify this parameter, no analytics nodes deploy to this region. See [below](#specs).
 * `auto_scaling` - (Optional) Configuration for the collection of settings that configures auto-scaling information for the cluster. The values for the `auto_scaling` attribute must be the same for all `region_configs` of a cluster. See [below](#auto_scaling).
 * `analytics_auto_scaling` - (Optional) Configuration for the Collection of settings that configures analytics-auto-scaling information for the cluster. The values for the `analytics_auto_scaling` attribute must be the same for all `region_configs` of a cluster. See [below](#analytics_auto_scaling).

internal/service/advancedclustertpf/common_admin_sdk.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"net/http"
 
-	admin20240530 "go.mongodb.org/atlas-sdk/v20240530005/admin"
-	admin20240805 "go.mongodb.org/atlas-sdk/v20240805005/admin"
 	"go.mongodb.org/atlas-sdk/v20250312006/admin"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -18,20 +16,15 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/flexcluster"
 )
 
-func CreateCluster(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, req *admin.ClusterDescription20240805, waitParams *ClusterWaitParams, usingNewShardingConfig bool) *admin.ClusterDescription20240805 {
+func CreateCluster(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, req *admin.ClusterDescription20240805, waitParams *ClusterWaitParams) *admin.ClusterDescription20240805 {
 	var (
 		pauseAfter  = req.GetPaused()
 		clusterResp *admin.ClusterDescription20240805
 	)
 	if pauseAfter {
 		req.Paused = nil
 	}
-	if usingNewShardingConfig {
-		clusterResp = createClusterLatest(ctx, diags, client, req, waitParams)
-	} else {
-		oldReq := ConvertClusterDescription20241023to20240805(req)
-		clusterResp = createCluster20240805(ctx, diags, client, oldReq, waitParams)
-	}
+	clusterResp = createClusterLatest(ctx, diags, client, req, waitParams)
 	if diags.HasError() {
 		return nil
 	}
@@ -41,15 +34,6 @@ func CreateCluster(ctx context.Context, diags *diag.Diagnostics, client *config.
 	return clusterResp
 }
 
-func createCluster20240805(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, req *admin20240805.ClusterDescription20240805, waitParams *ClusterWaitParams) *admin.ClusterDescription20240805 {
-	_, _, err := client.AtlasV220240805.ClustersApi.CreateCluster(ctx, waitParams.ProjectID, req).Execute()
-	if err != nil {
-		addErrorDiag(diags, operationCreate20240805, defaultAPIErrorDetails(waitParams.ClusterName, err))
-		return nil
-	}
-	return AwaitChanges(ctx, client, waitParams, operationCreate20240805, diags)
-}
-
 func createClusterLatest(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, req *admin.ClusterDescription20240805, waitParams *ClusterWaitParams) *admin.ClusterDescription20240805 {
 	_, _, err := client.AtlasV2.ClustersApi.CreateCluster(ctx, waitParams.ProjectID, req).Execute()
 	if err != nil {
@@ -70,62 +54,41 @@ func updateCluster(ctx context.Context, diags *diag.Diagnostics, client *config.
 
 // ProcessArgs.ClusterAdvancedConfig is managed through create/updateCluster APIs instead of /processArgs APIs but since corresponding TF attributes
 // belong in the advanced_configuration attribute we still need to check for any changes
-func UpdateAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, p *ProcessArgs, waitParams *ClusterWaitParams) (legacy *admin20240530.ClusterDescriptionProcessArgs, latest *admin.ClusterDescriptionProcessArgs20240805, changed bool) {
+func UpdateAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, p *ProcessArgs, waitParams *ClusterWaitParams) (latest *admin.ClusterDescriptionProcessArgs20240805, changed bool) {
 	var (
-		err             error
-		advConfig       *admin.ClusterDescriptionProcessArgs20240805
-		legacyAdvConfig *admin20240530.ClusterDescriptionProcessArgs
-		projectID       = waitParams.ProjectID
-		clusterName     = waitParams.ClusterName
+		err         error
+		advConfig   *admin.ClusterDescriptionProcessArgs20240805
+		projectID   = waitParams.ProjectID
+		clusterName = waitParams.ClusterName
 	)
 	if !update.IsZeroValues(p.ArgsDefault) {
 		changed = true
 		advConfig, _, err = client.AtlasV2.ClustersApi.UpdateClusterAdvancedConfiguration(ctx, projectID, clusterName, p.ArgsDefault).Execute()
 		if err != nil {
 			addErrorDiag(diags, operationAdvancedConfigurationUpdate, defaultAPIErrorDetails(clusterName, err))
-			return nil, nil, false
+			return nil, false
 		}
 		_ = AwaitChanges(ctx, client, waitParams, operationAdvancedConfigurationUpdate, diags)
 		if diags.HasError() {
-			return nil, nil, false
-		}
-	}
-	if !update.IsZeroValues(p.ArgsLegacy) {
-		changed = true
-		legacyAdvConfig, _, err = client.AtlasV220240530.ClustersApi.UpdateClusterAdvancedConfiguration(ctx, projectID, clusterName, p.ArgsLegacy).Execute()
-		if err != nil {
-			addErrorDiag(diags, operationAdvancedConfigurationUpdate20240530, defaultAPIErrorDetails(clusterName, err))
-			diags.AddError(errorAdvancedConfUpdateLegacy, defaultAPIErrorDetails(clusterName, err))
-			return nil, nil, false
-		}
-		_ = AwaitChanges(ctx, client, waitParams, operationAdvancedConfigurationUpdate20240530, diags)
-		if diags.HasError() {
-			return nil, nil, false
+			return nil, false
 		}
 	}
 	if !update.IsZeroValues(p.ClusterAdvancedConfig) {
 		changed = true
 	}
-	return legacyAdvConfig, advConfig, changed
+	return advConfig, changed
 }
 
-func ReadIfUnsetAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, projectID, clusterName string, configLegacy *admin20240530.ClusterDescriptionProcessArgs, configNew *admin.ClusterDescriptionProcessArgs20240805) (legacy *admin20240530.ClusterDescriptionProcessArgs, latest *admin.ClusterDescriptionProcessArgs20240805) {
+func ReadIfUnsetAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, projectID, clusterName string, configNew *admin.ClusterDescriptionProcessArgs20240805) (latest *admin.ClusterDescriptionProcessArgs20240805) {
 	var err error
-	if configLegacy == nil {
-		configLegacy, _, err = client.AtlasV220240530.ClustersApi.GetClusterAdvancedConfiguration(ctx, projectID, clusterName).Execute()
-		if err != nil {
-			diags.AddError(errorAdvancedConfReadLegacy, defaultAPIErrorDetails(clusterName, err))
-			return
-		}
-	}
 	if configNew == nil {
 		configNew, _, err = client.AtlasV2.ClustersApi.GetClusterAdvancedConfiguration(ctx, projectID, clusterName).Execute()
 		if err != nil {
 			diags.AddError(errorAdvancedConfRead, defaultAPIErrorDetails(clusterName, err))
 			return
 		}
 	}
-	return configLegacy, configNew
+	return configNew
 }
 
 func UpgradeTenant(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, waitParams *ClusterWaitParams, req *admin.LegacyAtlasTenantClusterUpgradeRequest) *admin.ClusterDescription20240805 {

internal/service/advancedclustertpf/data_source.go

@@ -2,7 +2,6 @@ package advancedclustertpf
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -14,12 +13,6 @@ import (
 var _ datasource.DataSource = &ds{}
 var _ datasource.DataSourceWithConfigure = &ds{}
 
-const (
-	errorReadDatasource                      = "Error reading  advanced cluster datasource"
-	errorReadDatasourceForceAsymmetric       = "Error reading advanced cluster datasource, was expecting symmetric shards but found asymmetric shards"
-	errorReadDatasourceForceAsymmetricDetail = "Cluster name %s. Please add `use_replication_spec_per_shard = true` to your data source configuration to enable asymmetric shard support. %s"
-)
-
 func DataSource() datasource.DataSource {
 	return &ds{
 		DSCommon: config.DSCommon{
@@ -52,7 +45,6 @@ func (d *ds) Read(ctx context.Context, req datasource.ReadRequest, resp *datasou
 func (d *ds) readCluster(ctx context.Context, diags *diag.Diagnostics, modelDS *TFModelDS) *TFModelDS {
 	clusterName := modelDS.Name.ValueString()
 	projectID := modelDS.ProjectID.ValueString()
-	useReplicationSpecPerShard := modelDS.UseReplicationSpecPerShard.ValueBool()
 	clusterResp, flexClusterResp := GetClusterDetails(ctx, diags, projectID, clusterName, d.Client, false)
 	if diags.HasError() {
 		return nil
@@ -67,23 +59,17 @@ func (d *ds) readCluster(ctx context.Context, diags *diag.Diagnostics, modelDS *
 		}
 		return conversion.CopyModel[TFModelDS](modelOut)
 	}
-	modelOut, extraInfo := getBasicClusterModel(ctx, diags, d.Client, clusterResp, useReplicationSpecPerShard)
+	modelOut := getBasicClusterModel(ctx, diags, d.Client, clusterResp)
 	if diags.HasError() {
 		return nil
 	}
-	if extraInfo.UseOldShardingConfigFailed {
-		diags.AddError(errorReadDatasourceForceAsymmetric, fmt.Sprintf(errorReadDatasourceForceAsymmetricDetail, clusterName, DeprecationOldSchemaAction))
-		return nil
-	}
 	updateModelAdvancedConfig(ctx, diags, d.Client, modelOut, &ProcessArgs{
-		ArgsLegacy:            nil,
 		ArgsDefault:           nil,
 		ClusterAdvancedConfig: clusterResp.AdvancedConfiguration,
 	})
 	if diags.HasError() {
 		return nil
 	}
 	modelOutDS := conversion.CopyModel[TFModelDS](modelOut)
-	modelOutDS.UseReplicationSpecPerShard = modelDS.UseReplicationSpecPerShard // attrs not in resource model
 	return modelOutDS
 }