feat: Updates singular mongodbatlas_advanced_cluster data source to support independent shard scaling & updates relevant flattener methods
#2373
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -5,8 +5,12 @@ import ( | |
| "fmt" | ||
| "net/http" | ||
|
|
||
| admin20231115 "go.mongodb.org/atlas-sdk/v20231115014/admin" | ||
| "go.mongodb.org/atlas-sdk/v20240530001/admin" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/v2/diag" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
|
|
||
| "github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant" | ||
| "github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion" | ||
| "github.com/mongodb/terraform-provider-mongodbatlas/internal/config" | ||
|
|
@@ -20,6 +24,10 @@ func DataSource() *schema.Resource { | |
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "use_replication_spec_per_shard": { | ||
| Type: schema.TypeBool, | ||
| Optional: true, | ||
| }, | ||
| "advanced_configuration": SchemaAdvancedConfigDS(), | ||
| "backup_enabled": { | ||
| Type: schema.TypeBool, | ||
|
|
@@ -108,6 +116,14 @@ func DataSource() *schema.Resource { | |
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "zone_id": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "external_id": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "num_shards": { | ||
| Type: schema.TypeInt, | ||
| Computed: true, | ||
|
|
@@ -235,50 +251,119 @@ func DataSource() *schema.Resource { | |
|
|
||
| func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { | ||
| connV2 := meta.(*config.MongoDBClient).AtlasV2 | ||
| connLatest := meta.(*config.MongoDBClient).AtlasV2Preview | ||
|
|
||
| projectID := d.Get("project_id").(string) | ||
| clusterName := d.Get("name").(string) | ||
| useReplicationSpecPerShard := false | ||
| var replicationSpecs []map[string]any | ||
| var clusterID string | ||
|
|
||
| if v, ok := d.GetOk("use_replication_spec_per_shard"); ok { | ||
| useReplicationSpecPerShard = v.(bool) | ||
| } | ||
|
|
||
| if !useReplicationSpecPerShard { | ||
| clusterDescOld, resp, err := connV2.ClustersApi.GetCluster(ctx, projectID, clusterName).Execute() | ||
| if err != nil { | ||
| if resp != nil { | ||
| if resp.StatusCode == http.StatusNotFound { | ||
| return nil | ||
| } | ||
| if admin20231115.IsErrorCode(err, "ASYMMETRIC_SHARD_UNSUPPORTED") { | ||
| return diag.FromErr(fmt.Errorf("please add `use_replication_spec_per_shard = true` to your data source configuration to enable asymmetric shard support. Refer to documentation for more details. %s", err)) | ||
| } | ||
| } | ||
| return diag.FromErr(fmt.Errorf(errorRead, clusterName, err)) | ||
| } | ||
|
|
||
| clusterID = clusterDescOld.GetId() | ||
|
|
||
| if err := d.Set("disk_size_gb", clusterDescOld.GetDiskSizeGB()); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "disk_size_gb", clusterName, err)) | ||
| } | ||
|
|
||
| replicationSpecs, err = FlattenAdvancedReplicationSpecsOldSDK(ctx, clusterDescOld.GetReplicationSpecs(), clusterDescOld.GetDiskSizeGB(), d.Get("replication_specs").([]any), d, connLatest) | ||
| if err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "replication_specs", clusterName, err)) | ||
| } | ||
|
|
||
| diags := setCommonSchemaFields(d, convertClusterDescToLatestExcludeRepSpecs(clusterDescOld)) | ||
| if diags.HasError() { | ||
| return diags | ||
| } | ||
| } else { | ||
| clusterDescLatest, resp, err := connLatest.ClustersApi.GetCluster(ctx, projectID, clusterName).Execute() | ||
| if err != nil { | ||
| if resp != nil && resp.StatusCode == http.StatusNotFound { | ||
| return nil | ||
| } | ||
| return diag.FromErr(fmt.Errorf(errorRead, clusterName, err)) | ||
| } | ||
|
|
||
| clusterID = clusterDescLatest.GetId() | ||
|
|
||
| replicationSpecs, err = flattenAdvancedReplicationSpecsDS(ctx, clusterDescLatest.GetReplicationSpecs(), d, connLatest) | ||
| if err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "replication_specs", clusterName, err)) | ||
| } | ||
|
|
||
| diags := setCommonSchemaFields(d, clusterDescLatest) | ||
| if diags.HasError() { | ||
| return diags | ||
| } | ||
| } | ||
|
|
||
| if err := d.Set("replication_specs", replicationSpecs); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "replication_specs", clusterName, err)) | ||
| } | ||
|
|
||
| // TODO: update to use connLatest to call below API | ||
| processArgs, _, err := connV2.ClustersApi.GetClusterAdvancedConfiguration(ctx, projectID, clusterName).Execute() | ||
|
There was a problem hiding this comment. Looks like return type of There was a problem hiding this comment. will look more into this as part of https://jira.mongodb.org/browse/CLOUDP-258709, will continue using the old SDK for this API call for now |
||
| if err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorAdvancedConfRead, clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("advanced_configuration", flattenProcessArgs(processArgs)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "advanced_configuration", clusterName, err)) | ||
| } | ||
|
|
||
| d.SetId(clusterID) | ||
| return nil | ||
| } | ||
|
|
||
| func setCommonSchemaFields(d *schema.ResourceData, cluster *admin.ClusterDescription20240710) diag.Diagnostics { | ||
| clusterName := *cluster.Name | ||
|
|
||
| if err := d.Set("backup_enabled", cluster.GetBackupEnabled()); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "backup_enabled", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("bi_connector_config", flattenBiConnectorConfig(cluster.BiConnector)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "bi_connector_config", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("cluster_type", cluster.GetClusterType()); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "cluster_type", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("connection_strings", flattenConnectionStrings(*cluster.ConnectionStrings)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "connection_strings", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("create_date", conversion.TimePtrToStringPtr(cluster.CreateDate)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "create_date", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("encryption_at_rest_provider", cluster.GetEncryptionAtRestProvider()); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "encryption_at_rest_provider", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("labels", flattenLabels(*cluster.Labels)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "labels", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("tags", flattenTags(cluster.Tags)); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "tags", clusterName, err)) | ||
| } | ||
|
|
||
|
|
@@ -302,15 +387,6 @@ func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag. | |
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "pit_enabled", clusterName, err)) | ||
| } | ||
|
|
||
| if err := d.Set("root_cert_type", cluster.GetRootCertType()); err != nil { | ||
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "state_name", clusterName, err)) | ||
| } | ||
|
|
@@ -328,15 +404,5 @@ func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag. | |
| return diag.FromErr(fmt.Errorf(ErrorClusterAdvancedSetting, "global_cluster_self_managed_sharding", clusterName, err)) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains 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.
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.
within this path, would we need to also disk_size_gb by setting the value defined in the nested hardware spec object?
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.
you mean set the root level disk_size_gb based on the nested value?
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.
yes was thinking this case
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.
discussed offline, will keep as is for now