chore: Updates mongodbatlas_advanced_cluster (SDKv2 & TPF) to consume selected processArgs fields from the createCluster/updateCluster APIs
#3231
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -458,9 +458,10 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag. | |
| } | ||
|
|
||
| params := &admin.ClusterDescription20240805{ | ||
| Name: conversion.StringPtr(cast.ToString(d.Get("name"))), | ||
| ClusterType: conversion.StringPtr(cast.ToString(d.Get("cluster_type"))), | ||
| ReplicationSpecs: replicationSpecs, | ||
| AdvancedConfiguration: expandClusterAdvancedConfiguration(d), | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("backup_enabled"); ok { | ||
|
|
@@ -688,7 +689,7 @@ func resourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Di | |
| return diag.FromErr(fmt.Errorf(errorConfigRead, clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("advanced_configuration", flattenProcessArgs(processArgs20240530, processArgs, cluster.AdvancedConfiguration)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "advanced_configuration", clusterName, err)) | ||
| } | ||
|
|
||
|
|
@@ -819,6 +820,11 @@ func setRootFields(d *schema.ResourceData, cluster *admin.ClusterDescription2024 | |
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "pinned_fcv", clusterName, err)) | ||
| } | ||
|
|
||
| // TODO: set adv_config | ||
| // if err := d.Set("pinned_fcv", FlattenPinnedFCV(cluster)); err != nil { | ||
| // return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "pinned_fcv", clusterName, err)) | ||
| // } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -939,7 +945,7 @@ func resourceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag. | |
| } | ||
| waitOnUpdate = true | ||
| } | ||
| if d.HasChange("replica_set_scaling_strategy") || d.HasChange("redact_client_log_data") || d.HasChange("config_server_management_mode") || d.HasChange("advanced_configuration") { | ||
|
There was a problem hiding this comment. @AgustinBettati can you confirm if this should be okay or we should update this in the above call (connV220240530.ClustersApi.UpdateCluster #L943)? In that case, will need the SDK for that to be updated as well to support the new AdvancedConfiguration attribute. There was a problem hiding this comment. I don't see a concern here, as we are still respecting what the comment below mentions when calling the latest API version.
In this case I understand we only add the advancedConfiguration property but no replicationSpecs, meaning no risk. |
||
| request := new(admin.ClusterDescription20240805) | ||
| if d.HasChange("replica_set_scaling_strategy") { | ||
| request.ReplicaSetScalingStrategy = conversion.Pointer(d.Get("replica_set_scaling_strategy").(string)) | ||
|
|
@@ -950,6 +956,12 @@ func resourceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag. | |
| if d.HasChange("config_server_management_mode") { | ||
| request.ConfigServerManagementMode = conversion.StringPtr(d.Get("config_server_management_mode").(string)) | ||
| } | ||
| if d.HasChange("advanced_configuration") { | ||
| if aclist, ok := d.Get("advanced_configuration").([]any); ok && len(aclist) > 0 { | ||
| request.AdvancedConfiguration = expandClusterAdvancedConfiguration(d) | ||
| } | ||
| } | ||
|
|
||
| // can call latest API (2024-10-23 or newer) as replications specs (with nested autoscaling property) is not specified | ||
| if _, _, err := connV2.ClustersApi.UpdateCluster(ctx, projectID, clusterName, request).Execute(); err != nil { | ||
| return diag.FromErr(fmt.Errorf(errorUpdate, clusterName, err)) | ||
|
|
@@ -1148,6 +1160,11 @@ func updateRequest(ctx context.Context, d *schema.ResourceData, projectID, clust | |
| if d.HasChange("config_server_management_mode") { | ||
| cluster.ConfigServerManagementMode = conversion.StringPtr(d.Get("config_server_management_mode").(string)) | ||
| } | ||
| if d.HasChange("advanced_configuration") { | ||
| if aclist, ok := d.Get("advanced_configuration").([]any); ok && len(aclist) > 0 { | ||
|
There was a problem hiding this comment. This means that removing advanced_configuration from the config will never update? There was a problem hiding this comment. That's the behavior today as well right? since it's O/C, or did you mean something else? |
||
| cluster.AdvancedConfiguration = expandClusterAdvancedConfiguration(d) | ||
| } | ||
| } | ||
|
|
||
| return cluster, nil | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
although not an absolute requirement for Read, but still fetching these from cluster response (instead of /processArgs) for consistency.