chore: Updates mongodbatlas_cluster to consume selected processArgs fields from the createCluster/updateCluster APIs

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/wI2L/jsondiff v0.6.1
 	github.com/zclconf/go-cty v1.16.2
-	go.mongodb.org/atlas v0.37.0
+	go.mongodb.org/atlas v0.37.1-0.20250402194754-dd09936138bc
 	go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
 	go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.1-0.20250402112219-2468c5354718 // uses api-bot-update-v20240805-backport-cluster to support AdvancedConfiguration in create/updateCluster APIs
 	go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0

go.sum

@@ -822,6 +822,8 @@ github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgK
 go.mongodb.org/atlas v0.12.0/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
 go.mongodb.org/atlas v0.37.0 h1:zQnO1o5+bVP9IotpAYpres4UjMD2F4nwNEFTZhNL4ck=
 go.mongodb.org/atlas v0.37.0/go.mod h1:DJYtM+vsEpPEMSkQzJnFHrT0sP7ev6cseZc/GGjJYG8=
+go.mongodb.org/atlas v0.37.1-0.20250402194754-dd09936138bc h1:tiJOadNekKrLNouqFW9gcH8Ywgy15Bw2Xhs24ddWafE=
+go.mongodb.org/atlas v0.37.1-0.20250402194754-dd09936138bc/go.mod h1:DJYtM+vsEpPEMSkQzJnFHrT0sP7ev6cseZc/GGjJYG8=
 go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0 h1:d/gbYJ+obR0EM/3DZf7+ZMi2QWISegm3mid7Or708cc=
 go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0/go.mod h1:O47ZrMMfcWb31wznNIq2PQkkdoFoK0ea2GlmRqGJC2s=
 go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.1-0.20250402112219-2468c5354718 h1:M2mNSBdTkP+paQ1qZ6FliiPdTEbDR9m9qvv4vsWoJAw=

internal/common/conversion/pointer.go

@@ -17,3 +17,10 @@ func StringPtr(v string) *string {
 	}
 	return nil
 }
+
+func SliceFromPtr[T any](slicePtr *[]T) []T {
+	if slicePtr == nil {
+		return []T{}
+	}
+	return *slicePtr
+}

internal/service/cluster/data_source_cluster.go

@@ -496,7 +496,13 @@ func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		return diag.FromErr(fmt.Errorf(advancedcluster.ErrorAdvancedConfRead, "", clusterName, err))
 	}
 
-	if err := d.Set("advanced_configuration", flattenProcessArgs(processArgs20240530, processArgs)); err != nil {
+	p := &ProcessArgs{
+		argsDefault:           processArgs,
+		argsLegacy:            processArgs20240530,
+		clusterAdvancedConfig: cluster.AdvancedConfiguration,
+	}
+
+	if err := d.Set("advanced_configuration", flattenProcessArgs(p)); err != nil {
 		return diag.FromErr(fmt.Errorf(advancedcluster.ErrorClusterSetting, "advanced_configuration", clusterName, err))
 	}
 

internal/service/cluster/data_source_clusters.go

@@ -407,8 +407,13 @@ func flattenClusters(ctx context.Context, d *schema.ResourceData, conn *matlas.C
 
 			containerID = getContainerID(containers, &clusters[i])
 		}
+		p := &ProcessArgs{
+			argsDefault:           processArgs,
+			argsLegacy:            processArgs20240530,
+			clusterAdvancedConfig: clusters[i].AdvancedConfiguration,
+		}
 		result := map[string]any{
-			"advanced_configuration":                  flattenProcessArgs(processArgs20240530, processArgs),
+			"advanced_configuration":                  flattenProcessArgs(p),
 			"auto_scaling_compute_enabled":            clusters[i].AutoScaling.Compute.Enabled,
 			"auto_scaling_compute_scale_down_enabled": clusters[i].AutoScaling.Compute.ScaleDownEnabled,
 			"auto_scaling_disk_gb_enabled":            clusters[i].AutoScaling.DiskGBEnabled,

internal/service/cluster/model_cluster.go

@@ -19,6 +19,12 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster"
 )
 
+type ProcessArgs struct {
+	argsDefault           *admin.ClusterDescriptionProcessArgs20240805
+	clusterAdvancedConfig *matlas.AdvancedConfiguration
+	argsLegacy            *admin20240530.ClusterDescriptionProcessArgs
+}
+
 func flattenCloudProviderSnapshotBackupPolicy(ctx context.Context, d *schema.ResourceData, conn *matlas.Client, projectID, clusterName string) ([]map[string]any, error) {
 	backupPolicy, res, err := conn.CloudProviderSnapshotBackupPolicies.Get(ctx, projectID, clusterName)
 	if err != nil {
@@ -73,32 +79,38 @@ func flattenPolicyItems(items []matlas.PolicyItem) []map[string]any {
 	return policyItems
 }
 
-func flattenProcessArgs(p20240530 *admin20240530.ClusterDescriptionProcessArgs, p *admin.ClusterDescriptionProcessArgs20240805) []map[string]any {
+func flattenProcessArgs(p *ProcessArgs) []map[string]any {
 	flattenedProcessArgs := []map[string]any{
 		{
 			// default_read_concern and fail_index_key_too_long have been deprecated, hence using the older SDK
-			"default_read_concern":                 p20240530.DefaultReadConcern,
-			"fail_index_key_too_long":              cast.ToBool(p20240530.FailIndexKeyTooLong),
-			"default_write_concern":                p.DefaultWriteConcern,
-			"javascript_enabled":                   cast.ToBool(p.JavascriptEnabled),
-			"minimum_enabled_tls_protocol":         p.MinimumEnabledTlsProtocol,
-			"no_table_scan":                        cast.ToBool(p.NoTableScan),
-			"oplog_size_mb":                        p.OplogSizeMB,
-			"oplog_min_retention_hours":            p.OplogMinRetentionHours,
-			"sample_size_bi_connector":             p.SampleSizeBIConnector,
-			"sample_refresh_interval_bi_connector": p.SampleRefreshIntervalBIConnector,
-			"transaction_lifetime_limit_seconds":   p.TransactionLifetimeLimitSeconds,
-			"tls_cipher_config_mode":               p.TlsCipherConfigMode,
-			"custom_openssl_cipher_config_tls12":   p.GetCustomOpensslCipherConfigTls12(),
+			"default_read_concern":                 p.argsLegacy.DefaultReadConcern,
+			"fail_index_key_too_long":              cast.ToBool(p.argsLegacy.FailIndexKeyTooLong),
+			"default_write_concern":                p.argsDefault.DefaultWriteConcern,
+			"javascript_enabled":                   cast.ToBool(p.argsDefault.JavascriptEnabled),
+			"no_table_scan":                        cast.ToBool(p.argsDefault.NoTableScan),
+			"oplog_size_mb":                        p.argsDefault.OplogSizeMB,
+			"oplog_min_retention_hours":            p.argsDefault.OplogMinRetentionHours,
+			"sample_size_bi_connector":             p.argsDefault.SampleSizeBIConnector,
+			"sample_refresh_interval_bi_connector": p.argsDefault.SampleRefreshIntervalBIConnector,
+			"transaction_lifetime_limit_seconds":   p.argsDefault.TransactionLifetimeLimitSeconds,
+			"minimum_enabled_tls_protocol":         p.argsDefault.MinimumEnabledTlsProtocol,
+			"tls_cipher_config_mode":               p.argsDefault.TlsCipherConfigMode,
+			"custom_openssl_cipher_config_tls12":   conversion.SliceFromPtr(p.argsDefault.CustomOpensslCipherConfigTls12),
 		},
 	}
 
-	if p.ChangeStreamOptionsPreAndPostImagesExpireAfterSeconds != nil {
-		flattenedProcessArgs[0]["change_stream_options_pre_and_post_images_expire_after_seconds"] = p.ChangeStreamOptionsPreAndPostImagesExpireAfterSeconds
+	if p.argsDefault.ChangeStreamOptionsPreAndPostImagesExpireAfterSeconds != nil {
+		flattenedProcessArgs[0]["change_stream_options_pre_and_post_images_expire_after_seconds"] = p.argsDefault.ChangeStreamOptionsPreAndPostImagesExpireAfterSeconds
 	} else {
 		flattenedProcessArgs[0]["change_stream_options_pre_and_post_images_expire_after_seconds"] = -1 // default in schema, otherwise user gets drift detection
 	}
 
+	if p.clusterAdvancedConfig != nil { // For TENANT cluster type, advancedConfiguration field may not be returned from cluster APIs
+		flattenedProcessArgs[0]["minimum_enabled_tls_protocol"] = p.clusterAdvancedConfig.MinimumEnabledTLSProtocol
+		flattenedProcessArgs[0]["tls_cipher_config_mode"] = p.clusterAdvancedConfig.TLSCipherConfigMode
+		flattenedProcessArgs[0]["custom_openssl_cipher_config_tls12"] = conversion.SliceFromPtr(p.clusterAdvancedConfig.CustomOpensslCipherConfigTLS12)
+	}
+
 	return flattenedProcessArgs
 }
 
@@ -228,6 +240,29 @@ func expandTagSliceFromSetSchema(d *schema.ResourceData) []*matlas.Tag {
 	return res
 }
 
+func expandClusterAdvancedConfiguration(d *schema.ResourceData) *matlas.AdvancedConfiguration {
+	ac := d.Get("advanced_configuration")
+	if aclist, ok1 := ac.([]any); ok1 && len(aclist) > 0 {
+		p := aclist[0].(map[string]any)
+		res := matlas.AdvancedConfiguration{}
+
+		if _, ok := d.GetOkExists("advanced_configuration.0.minimum_enabled_tls_protocol"); ok {
+			res.MinimumEnabledTLSProtocol = conversion.StringPtr(cast.ToString(p["minimum_enabled_tls_protocol"]))
+		}
+
+		if _, ok := d.GetOkExists("advanced_configuration.0.tls_cipher_config_mode"); ok {
+			res.TLSCipherConfigMode = conversion.StringPtr(cast.ToString(p["tls_cipher_config_mode"]))
+		}
+
+		if _, ok := d.GetOkExists("advanced_configuration.0.custom_openssl_cipher_config_tls12"); ok {
+			tmp := conversion.ExpandStringListFromSetSchema(d.Get("advanced_configuration.0.custom_openssl_cipher_config_tls12").(*schema.Set))
+			res.CustomOpensslCipherConfigTLS12 = &tmp
+		}
+		return &res
+	}
+	return nil
+}
+
 func expandProcessArgs(d *schema.ResourceData, p map[string]any, mongodbMajorVersion *string) (admin20240530.ClusterDescriptionProcessArgs, admin.ClusterDescriptionProcessArgs20240805) {
 	res20240530 := admin20240530.ClusterDescriptionProcessArgs{}
 	res := admin.ClusterDescriptionProcessArgs20240805{}
@@ -248,10 +283,6 @@ func expandProcessArgs(d *schema.ResourceData, p map[string]any, mongodbMajorVer
 		res.JavascriptEnabled = conversion.Pointer(cast.ToBool(p["javascript_enabled"]))
 	}
 
-	if _, ok := d.GetOkExists("advanced_configuration.0.minimum_enabled_tls_protocol"); ok {
-		res.MinimumEnabledTlsProtocol = conversion.StringPtr(cast.ToString(p["minimum_enabled_tls_protocol"]))
-	}
-
 	if _, ok := d.GetOkExists("advanced_configuration.0.no_table_scan"); ok {
 		res.NoTableScan = conversion.Pointer(cast.ToBool(p["no_table_scan"]))
 	}
@@ -292,15 +323,6 @@ func expandProcessArgs(d *schema.ResourceData, p map[string]any, mongodbMajorVer
 		res.ChangeStreamOptionsPreAndPostImagesExpireAfterSeconds = conversion.Pointer(cast.ToInt(p["change_stream_options_pre_and_post_images_expire_after_seconds"]))
 	}
 
-	if _, ok := d.GetOkExists("advanced_configuration.0.tls_cipher_config_mode"); ok {
-		res.TlsCipherConfigMode = conversion.StringPtr(cast.ToString(p["tls_cipher_config_mode"]))
-	}
-
-	if _, ok := d.GetOkExists("advanced_configuration.0.custom_openssl_cipher_config_tls12"); ok {
-		tmp := conversion.ExpandStringListFromSetSchema(d.Get("advanced_configuration.0.custom_openssl_cipher_config_tls12").(*schema.Set))
-		res.CustomOpensslCipherConfigTls12 = &tmp
-	}
-
 	return res20240530, res
 }
 

internal/service/cluster/resource_cluster.go

@@ -508,6 +508,7 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		AutoScaling:              autoScaling,
 		ProviderSettings:         providerSettings,
 		ReplicationSpecs:         replicationSpecs,
+		AdvancedConfiguration:    expandClusterAdvancedConfiguration(d),
 	}
 	if v, ok := d.GetOk("cloud_backup"); ok {
 		clusterRequest.ProviderBackupEnabled = conversion.Pointer(v.(bool))
@@ -798,7 +799,13 @@ func resourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Di
 		return diag.FromErr(fmt.Errorf(advancedcluster.ErrorAdvancedConfRead, "", clusterName, err))
 	}
 
-	if err := d.Set("advanced_configuration", flattenProcessArgs(processArgs20240530, processArgs)); err != nil {
+	p := &ProcessArgs{
+		argsDefault:           processArgs,
+		argsLegacy:            processArgs20240530,
+		clusterAdvancedConfig: cluster.AdvancedConfiguration,
+	}
+
+	if err := d.Set("advanced_configuration", flattenProcessArgs(p)); err != nil {
 		return diag.FromErr(fmt.Errorf(advancedcluster.ErrorClusterSetting, "advanced_configuration", clusterName, err))
 	}
 
@@ -1009,6 +1016,10 @@ func resourceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 					return diag.FromErr(fmt.Errorf(errorAdvancedConfUpdate, "", clusterName, err))
 				}
 			}
+			clusterAdvConfig := expandClusterAdvancedConfiguration(d)
+			if !reflect.DeepEqual(cluster.AdvancedConfiguration, matlas.AdvancedConfiguration{}) {
+				cluster.AdvancedConfiguration = clusterAdvConfig
+			}
 		}
 	}