feat: Supports `config_server_type` and `config_server_management_mode` in advanced_cluster #2670

EspenAlbert · 2024-10-09T13:16:05Z

Description

Link to any related issue(s): CLOUDP-228611

Doc updates done in #2677

Type of change:

Bug fix (non-breaking change which fixes an issue). Please, add the "bug" label to the PR.
New feature (non-breaking change which adds functionality). Please, add the "enhancement" label to the PR. A migration guide must be created or updated if the new feature will go in a major version.
Breaking change (fix or feature that would cause existing functionality to not work as expected). Please, add the "breaking change" label to the PR. A migration guide must be created or updated.
This change requires a documentation update
Documentation fix/enhancement

Required Checklist:

I have signed the MongoDB CLA
I have read the contributing guides
I have checked that this change does not generate any credentials and that they are NOT accidentally logged anywhere.
I have added tests that prove my fix is effective or that my feature works per HashiCorp requirements
I have added any necessary documentation (if appropriate)
I have run make fmt and formatted my code
If changes include deprecations or removals I have added appropriate changelog entries.
If changes include removal or addition of 3rd party GitHub actions, I updated our internal document. Reach out to the APIx Integration slack channel to get access to the internal document.

Further comments

…e` in advanced_cluster

…_server_type

…al data source

EspenAlbert · 2024-10-10T09:57:26Z

internal/service/advancedcluster/resource_advanced_cluster.go

-		} else if d.HasChange("replica_set_scaling_strategy") || d.HasChange("redact_client_log_data") {
+			waitOnUpdate = true
+		}
+		if d.HasChange("replica_set_scaling_strategy") || d.HasChange("redact_client_log_data") || d.HasChange("config_server_management_mode") {


fix: supports updating both old cluster attributes and new attributes when using old SDK

EspenAlbert · 2024-10-10T09:58:58Z

internal/service/advancedcluster/resource_advanced_cluster.go

 			if _, _, err := connV2.ClustersApi.UpdateCluster(ctx, projectID, clusterName, request).Execute(); err != nil {
 				return diag.FromErr(fmt.Errorf(errorUpdate, clusterName, err))
 			}
+			waitOnUpdate = true
+		}
+		if waitOnUpdate {


use waitOnUpdateToFinish at the end instead of doing it twice inside each if

EspenAlbert · 2024-10-10T10:00:18Z

internal/service/advancedcluster/resource_advanced_cluster_test.go

@@ -555,12 +560,12 @@ func TestAccClusterAdvancedClusterConfig_symmetricShardedOldSchema(t *testing.T)
 		CheckDestroy:             acc.CheckDestroyCluster,
 		Steps: []resource.TestStep{
 			{
-				Config: configShardedOldSchemaMultiCloud(orgID, projectName, clusterName, 2, "M10"),
-				Check:  checkShardedOldSchemaMultiCloud(clusterName, 2, "M10", false),
+				Config: configShardedOldSchemaMultiCloud(orgID, projectName, clusterName, 2, "M10", &configServerManagementModeFixedToDedicated),


Choosing to only test for the old schema as there is extra logic there.

Choosing to re-use existing test as we need a sharded cluster (also picked a test without migration tests since we are introducing a new field)

github-actions · 2024-10-10T12:58:29Z

APIx bot: a message has been sent to Docs Slack channel

kyuan-mongodb

LGTM!

lantoli · 2024-10-10T14:21:11Z

.changelog/2670.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/mongodbatlas_advanced_cluster: Adds new `config_server_management_mode` and `config_server_type` fields


knit: I think it's ok although in other occasions we've added a line per field

internal/service/advancedcluster/resource_advanced_cluster.go

internal/service/advancedcluster/resource_advanced_cluster_test.go

AgustinBettati

LGTM

AgustinBettati · 2024-10-11T08:40:53Z

internal/service/advancedcluster/resource_advanced_cluster.go

+	if cluster.ConfigServerManagementMode != nil {
+		if err := d.Set("config_server_management_mode", *cluster.ConfigServerManagementMode); err != nil {


can we simplify this by using SDK getter functions? Same for above

You were right. Changed in c38307c
I thought we didn't want to update state when the user hasn't set those fields before

AgustinBettati · 2024-10-11T08:46:30Z

internal/service/advancedcluster/resource_advanced_cluster_test.go

+		  mongo_db_major_version = "8"
+		  config_server_management_mode = %[1]q


should we clarify in docs that this attribute requires mongodb version > 8 and cluster must be sharded?

You can find the doc updates here: #2677 it mentions sharded.
About version > 8, that is only for embedded, so the field is still valid on earlier versions but it will always be direct.

…nd `config_server_type` (#2677) * chore: add docs for `config_server_management_mode` and `config_server_type` * Update docs/data-sources/advanced_cluster.md Co-authored-by: kyuan-mongodb <[email protected]> * Update docs/data-sources/advanced_clusters.md Co-authored-by: kyuan-mongodb <[email protected]> * Update docs/resources/advanced_cluster.md Co-authored-by: kyuan-mongodb <[email protected]> --------- Co-authored-by: kyuan-mongodb <[email protected]>

…_config

* master: (44 commits) Remove RemoveResource from Create and Update (#2694) sleep first time only (#2696) fix: Ensures event_trigger `disabled` is included in the PUT payload (#2690) chore: Bump srvaroa/labeler from 1.11.0 to 1.11.1 (#2695) build(deps): bump go.mongodb.org/atlas-sdk (#2686) fix: Avoids setting organization id to empty when the USER_IS_NOT_FOUND (#2684) doc: Corrects default value of `auto_scaling_disk_gb_enabled` (#2683) chore: Reminder to log test failures (#2688) chore: Updates CHANGELOG.md for #2670 feat: Supports `config_server_type` and `config_server_management_mode` in advanced_cluster (#2670) chore: Creates `advancedclustertpf` package for new implementation (#2679) chore: Removes deprecation warnings for `labels` in cluster/adv_cluster (#2678) doc: Adjusts `redact_client_log_data` doc (#2676) chore: Adds sleep in tests to avoid out of capacity errors (#2674) refactor: Adjust type of set structure in team update logic (#2675) chore: Updates CHANGELOG.md header for v1.21.1 release chore: Updates examples link in index.md for v1.21.1 release build(deps): bump go.mongodb.org/atlas-sdk (#2672) doc: Fixes Public -> Private Preview and adds contact link. (#2671) chore: Updates CHANGELOG.md for #2669 ...

feat: Supports config_server_type and `config_server_management_mod…

1d7eef3

…e` in advanced_cluster

github-actions bot added the enhancement label Oct 9, 2024

EspenAlbert added 4 commits October 9, 2024 18:07

test: Modifies test case for config_server_management_mode and config…

5d57d37

…_server_type

chore: add changelog entry

6e858a9

fix: use config_server_management_mode and config_server_type in plur…

c90ecc7

…al data source

fix: supports updating both old cluster attributes and new attributes

2b34bef

EspenAlbert commented Oct 10, 2024

View reviewed changes

test: Use explicit depends_on to ensure reads happens after update

3102af7

EspenAlbert marked this pull request as ready for review October 10, 2024 12:58

EspenAlbert requested review from a team as code owners October 10, 2024 12:58

kyuan-mongodb approved these changes Oct 10, 2024

View reviewed changes

lantoli reviewed Oct 10, 2024

View reviewed changes

internal/service/advancedcluster/resource_advanced_cluster.go Outdated Show resolved Hide resolved

lantoli reviewed Oct 10, 2024

View reviewed changes

internal/service/advancedcluster/resource_advanced_cluster.go Show resolved Hide resolved

lantoli reviewed Oct 10, 2024

View reviewed changes

internal/service/advancedcluster/resource_advanced_cluster_test.go Show resolved Hide resolved

lantoli approved these changes Oct 10, 2024

View reviewed changes

AgustinBettati approved these changes Oct 11, 2024

View reviewed changes

EspenAlbert and others added 3 commits October 11, 2024 10:34

refactor: simplify setter logic for new fields

c38307c

Merge branch 'master' into CLOUDP-228611_adv_cluster_sharded_embedded…

9e0c17a

…_config

EspenAlbert merged commit a0be718 into master Oct 14, 2024
38 checks passed

EspenAlbert deleted the CLOUDP-228611_adv_cluster_sharded_embedded_config branch October 14, 2024 15:09

svc-apix-Bot added a commit that referenced this pull request Oct 14, 2024

chore: Updates CHANGELOG.md for #2670

4f1cb01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Supports `config_server_type` and `config_server_management_mode` in advanced_cluster #2670

feat: Supports `config_server_type` and `config_server_management_mode` in advanced_cluster #2670

EspenAlbert commented Oct 9, 2024 •

edited

Loading

EspenAlbert Oct 10, 2024

EspenAlbert Oct 10, 2024

EspenAlbert Oct 10, 2024

github-actions bot commented Oct 10, 2024

kyuan-mongodb left a comment

lantoli Oct 10, 2024

AgustinBettati left a comment

AgustinBettati Oct 11, 2024

EspenAlbert Oct 11, 2024

AgustinBettati Oct 11, 2024

EspenAlbert Oct 11, 2024 •

edited

Loading

		@@ -0,0 +1,11 @@
		```release-note:enhancement
		resource/mongodbatlas_advanced_cluster: Adds new `config_server_management_mode` and `config_server_type` fields

		if cluster.ConfigServerManagementMode != nil {
		if err := d.Set("config_server_management_mode", *cluster.ConfigServerManagementMode); err != nil {

		mongo_db_major_version = "8"
		config_server_management_mode = %[1]q

feat: Supports config_server_type and config_server_management_mode in advanced_cluster #2670

feat: Supports config_server_type and config_server_management_mode in advanced_cluster #2670

Conversation

EspenAlbert commented Oct 9, 2024 • edited Loading

Description

Type of change:

Required Checklist:

Further comments

EspenAlbert Oct 10, 2024

Choose a reason for hiding this comment

EspenAlbert Oct 10, 2024

Choose a reason for hiding this comment

EspenAlbert Oct 10, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 10, 2024

kyuan-mongodb left a comment

Choose a reason for hiding this comment

lantoli Oct 10, 2024

Choose a reason for hiding this comment

AgustinBettati left a comment

Choose a reason for hiding this comment

AgustinBettati Oct 11, 2024

Choose a reason for hiding this comment

EspenAlbert Oct 11, 2024

Choose a reason for hiding this comment

AgustinBettati Oct 11, 2024

Choose a reason for hiding this comment

EspenAlbert Oct 11, 2024 • edited Loading

Choose a reason for hiding this comment

feat: Supports `config_server_type` and `config_server_management_mode` in advanced_cluster #2670

feat: Supports `config_server_type` and `config_server_management_mode` in advanced_cluster #2670

EspenAlbert commented Oct 9, 2024 •

edited

Loading

EspenAlbert Oct 11, 2024 •

edited

Loading