Merge branch 'master' into CLOUDP-288865_read_data_source

* master: chore: Supports legacy API in create when using old schema with num_shards (#2892)
mongodb · Dec 14, 2024 · c47d920 · c47d920
2 parents 7b30241 + b59c241
commit c47d920
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/internal/service/advancedclustertpf/resource.go b/internal/service/advancedclustertpf/resource.go
@@ -188,6 +188,7 @@ func (r *rs) createCluster(ctx context.Context, plan *TFModel, diags *diag.Diagn
 	var (
 		projectID   = plan.ProjectID.ValueString()
 		clusterName = plan.Name.ValueString()
+		api20240805 = r.Client.AtlasV220240805.ClustersApi
 		api20240530 = r.Client.AtlasV220240530.ClustersApi
 		api         = r.Client.AtlasV2.ClustersApi
 		err         error
@@ -196,7 +197,12 @@ func (r *rs) createCluster(ctx context.Context, plan *TFModel, diags *diag.Diagn
 	if pauseAfter {
 		latestReq.Paused = nil
 	}
-	_, _, err = api.CreateCluster(ctx, projectID, latestReq).Execute()
+	if usingLegacySchema(ctx, plan.ReplicationSpecs, diags) {
+		legacyReq := newLegacyModel(latestReq)
+		_, _, err = api20240805.CreateCluster(ctx, projectID, legacyReq).Execute()
+	} else {
+		_, _, err = api.CreateCluster(ctx, projectID, latestReq).Execute()
+	}
 	if err != nil {
 		diags.AddError("errorCreate", fmt.Sprintf(errorCreate, err.Error()))
 		return nil

diff --git a/...advancedclustertpf/testdata/TestAccMockableAdvancedCluster_symmetricShardedOldSchema.yaml b/...advancedclustertpf/testdata/TestAccMockableAdvancedCluster_symmetricShardedOldSchema.yaml
@@ -5,7 +5,7 @@ steps:
   - diff_requests:
       - path: /api/atlas/v2/groups/{groupId}/clusters
         method: POST
-        version: '2024-10-23'
+        version: '2024-08-05'
         text: "{\n \"clusterType\": \"SHARDED\",\n \"configServerManagementMode\": \"FIXED_TO_DEDICATED\",\n \"labels\": [],\n \"mongoDBMajorVersion\": \"8.0\",\n \"name\": \"{clusterName}\",\n \"replicationSpecs\": [\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 1\n     },\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"EU_WEST_1\"\n    },\n    {\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 2\n     },\n     \"priority\": 6,\n     \"providerName\": \"AZURE\",\n     \"regionName\": \"US_EAST_2\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  },\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 1\n     },\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"EU_WEST_1\"\n    },\n    {\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 2\n     },\n     \"priority\": 6,\n     \"providerName\": \"AZURE\",\n     \"regionName\": \"US_EAST_2\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  }\n ],\n \"tags\": []\n}"
         responses:
           - response_index: 10
@@ -90,7 +90,7 @@ steps:
             text: "true"
       - path: /api/atlas/v2/groups/{groupId}/clusters
         method: POST
-        version: '2024-10-23'
+        version: '2024-08-05'
         text: "{\n \"clusterType\": \"SHARDED\",\n \"configServerManagementMode\": \"FIXED_TO_DEDICATED\",\n \"labels\": [],\n \"mongoDBMajorVersion\": \"8.0\",\n \"name\": \"{clusterName}\",\n \"replicationSpecs\": [\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 1\n     },\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"EU_WEST_1\"\n    },\n    {\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 2\n     },\n     \"priority\": 6,\n     \"providerName\": \"AZURE\",\n     \"regionName\": \"US_EAST_2\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  },\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 1\n     },\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"EU_WEST_1\"\n    },\n    {\n     \"electableSpecs\": {\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 2\n     },\n     \"priority\": 6,\n     \"providerName\": \"AZURE\",\n     \"regionName\": \"US_EAST_2\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  }\n ],\n \"tags\": []\n}"
         responses:
           - response_index: 10

diff --git a/...groups_{groupId}_clusters_2024-10-23.json → ...groups_{groupId}_clusters_2024-08-05.json b/...groups_{groupId}_clusters_2024-10-23.json → ...groups_{groupId}_clusters_2024-08-05.json
diff --git a/...a/TestAccMockableAdvancedCluster_symmetricShardedOldSchemaDiskSizeGBAtElectableLevel.yaml b/...a/TestAccMockableAdvancedCluster_symmetricShardedOldSchemaDiskSizeGBAtElectableLevel.yaml
@@ -5,7 +5,7 @@ steps:
   - diff_requests:
       - path: /api/atlas/v2/groups/{groupId}/clusters
         method: POST
-        version: '2024-10-23'
+        version: '2024-08-05'
         text: "{\n \"backupEnabled\": false,\n \"clusterType\": \"SHARDED\",\n \"labels\": [],\n \"mongoDBMajorVersion\": \"7.0\",\n \"name\": \"{clusterName}\",\n \"replicationSpecs\": [\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 0\n     },\n     \"electableSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"US_EAST_1\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  },\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 0\n     },\n     \"electableSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"US_EAST_1\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  }\n ],\n \"tags\": []\n}"
         responses:
           - response_index: 10
@@ -90,7 +90,7 @@ steps:
             text: "true"
       - path: /api/atlas/v2/groups/{groupId}/clusters
         method: POST
-        version: '2024-10-23'
+        version: '2024-08-05'
         text: "{\n \"backupEnabled\": false,\n \"clusterType\": \"SHARDED\",\n \"labels\": [],\n \"mongoDBMajorVersion\": \"7.0\",\n \"name\": \"{clusterName}\",\n \"replicationSpecs\": [\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 0\n     },\n     \"electableSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"US_EAST_1\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  },\n  {\n   \"regionConfigs\": [\n    {\n     \"analyticsSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 0\n     },\n     \"electableSpecs\": {\n      \"diskSizeGB\": 50,\n      \"instanceSize\": \"M10\",\n      \"nodeCount\": 3\n     },\n     \"priority\": 7,\n     \"providerName\": \"AWS\",\n     \"regionName\": \"US_EAST_1\"\n    }\n   ],\n   \"zoneName\": \"ZoneName managed by Terraform\"\n  }\n ],\n \"tags\": []\n}"
         responses:
           - response_index: 10

diff --git a/...groups_{groupId}_clusters_2024-10-23.json → ...groups_{groupId}_clusters_2024-08-05.json b/...groups_{groupId}_clusters_2024-10-23.json → ...groups_{groupId}_clusters_2024-08-05.json