Skip to content

Commit 25a317b

Browse files
maasthamaastha
committed
Merge branch 'CLOUDP-334497-disable_adv_clusterSDKv2-b' into CLOUDP-333684-rem-deprecated-backup-global
2 parents c38cc58 + 74b581e commit 25a317b

File tree

6 files changed

+92
-104
lines changed

6 files changed

+92
-104
lines changed

‎internal/service/advancedcluster/resource_advanced_cluster_migration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func migTest(t *testing.T, testCaseFunc func(t *testing.T, useSDKv2 ...bool) res
100100

101101
// Step 1: SDKv2 config with external provider (latest v1.x.x version)
102102
// Step 2: Converted TPF config with current provider (latest v2.x.x version)
103-
mig.CreateAndRunTest(t, &sdkv2TestCase)
103+
mig.CreateAndRunTest(t, &sdkv2TestCase, true)
104104
} else {
105105
mig.SkipIfVersionBelow(t, "2.0.0")
106106
t.Log("Running migration test: TPF to TPF")

‎internal/service/advancedcluster/resource_advanced_cluster_test.go‎

Lines changed: 43 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/stretchr/testify/mock"
2121

2222
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
23-
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
2423
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster"
2524
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedclustertpf"
2625
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
@@ -1354,6 +1353,8 @@ func TestAccMockableAdvancedCluster_shardedAddAnalyticsAndAutoScaling(t *testing
13541353
"state_name": "IDLE",
13551354
"project_id": projectID,
13561355
"name": clusterName,
1356+
"replication_specs.0.region_configs.0.electable_specs.instance_size": "M30",
1357+
"replication_specs.0.region_configs.0.analytics_specs.node_count": "0",
13571358
}
13581359
checksUpdatedMap = map[string]string{
13591360
"replication_specs.0.region_configs.0.auto_scaling.disk_gb_enabled": "true",
@@ -1369,10 +1370,7 @@ func TestAccMockableAdvancedCluster_shardedAddAnalyticsAndAutoScaling(t *testing
13691370
}
13701371
checksUpdated = checkAggr(nil, checksUpdatedMap)
13711372
)
1372-
if config.PreviewProviderV2AdvancedCluster() { // SDKv2 don't set "computed" specs in the state
1373-
checksMap["replication_specs.0.region_configs.0.electable_specs.instance_size"] = "M30"
1374-
checksMap["replication_specs.0.region_configs.0.analytics_specs.node_count"] = "0"
1375-
}
1373+
13761374
checks := checkAggr(nil, checksMap)
13771375
checksMap["replication_specs.0.region_configs.0.analytics_specs.node_count"] = "1" // analytics_specs is kept even if it's removed from the config
13781376
checksAfter := checkAggr(nil, checksMap)
@@ -1397,9 +1395,6 @@ func TestAccMockableAdvancedCluster_shardedAddAnalyticsAndAutoScaling(t *testing
13971395
}
13981396

13991397
func TestAccAdvancedCluster_removeBlocksFromConfig(t *testing.T) {
1400-
if !config.PreviewProviderV2AdvancedCluster() { // SDKv2 don't set "computed" specs in the state
1401-
t.Skip("This test is not applicable for SDKv2")
1402-
}
14031398
var (
14041399
projectID, clusterName = acc.ProjectIDExecutionWithCluster(t, 15)
14051400
)
@@ -1450,7 +1445,7 @@ func createCleanupTest(t *testing.T, configCall func(t *testing.T, timeoutSectio
14501445
t.Helper()
14511446
var (
14521447
timeoutsStrShort = `
1453-
timeouts {
1448+
timeouts = {
14541449
create = "2s"
14551450
}
14561451
delete_on_create_timeout = true
@@ -1484,17 +1479,12 @@ func createCleanupTest(t *testing.T, configCall func(t *testing.T, timeoutSectio
14841479
},
14851480
)
14861481
deleteOnCreateTimeoutRemoved := configCall(t, "")
1487-
if config.PreviewProviderV2AdvancedCluster() {
1488-
steps = append(steps,
1489-
resource.TestStep{
1490-
Config: deleteOnCreateTimeoutRemoved,
1491-
Check: resource.TestCheckNoResourceAttr(resourceName, "delete_on_create_timeout"),
1492-
})
1493-
} else {
1494-
// removing an optional false value has no affect in SDKv2, as false==null and no-plan-change
1495-
steps = append(steps, acc.TestStepCheckEmptyPlan(deleteOnCreateTimeoutRemoved))
1496-
}
1497-
steps = append(steps, acc.TestStepImportCluster(resourceName))
1482+
steps = append(steps,
1483+
resource.TestStep{
1484+
Config: deleteOnCreateTimeoutRemoved,
1485+
Check: resource.TestCheckNoResourceAttr(resourceName, "delete_on_create_timeout"),
1486+
},
1487+
acc.TestStepImportCluster(resourceName))
14981488
}
14991489
return &resource.TestCase{
15001490
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
@@ -1627,7 +1617,7 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
16271617
`
16281618
// read only + autoscaling blocks
16291619
extraConfig0 = `
1630-
read_only_specs {
1620+
read_only_specs = {
16311621
instance_size = "M10"
16321622
node_count = 2
16331623
}
@@ -1652,13 +1642,13 @@ func configBlocks(t *testing.T, projectID, clusterName, instanceSize string, def
16521642
16531643
replication_specs = [{
16541644
zone_name = "Zone 1"
1655-
region_configs {
1645+
region_configs = [{
16561646
provider_name = "AWS"
16571647
priority = 7
16581648
region_name = "US_EAST_1"
16591649
%[6]s
16601650
%[4]s
1661-
}
1651+
}]
16621652
},
16631653
{
16641654
zone_name = "Zone 2"
@@ -1710,7 +1700,7 @@ func checkBlocks(instanceSize string) resource.TestCheckFunc {
17101700
checksMap[fmt.Sprintf("replication_specs.%d.region_configs.0.%s.compute_max_instance_size", repSpecsIdx, block)] = "M30"
17111701
}
17121702
}
1713-
return resource.ComposeAggregateTestCheckFunc(acc.AddAttrChecksMig(true, resourceName, nil, checksMap)...)
1703+
return resource.ComposeAggregateTestCheckFunc(acc.AddAttrChecksMigTPF(true, resourceName, nil, checksMap)...)
17141704
}
17151705

17161706
func checkAggr(attrsSet []string, attrsMap map[string]string, extra ...resource.TestCheckFunc) resource.TestCheckFunc {
@@ -1928,11 +1918,11 @@ func configAWSProvider(t *testing.T, configInfo ReplicaSetAWSConfig, useSDKv2 ..
19281918

19291919
func checkReplicaSetAWSProvider(isTPF bool, projectID, name string, diskSizeGB, nodeCountElectable int, checkDiskSizeGBInnerLevel, checkExternalID bool) resource.TestCheckFunc {
19301920
additionalChecks := []resource.TestCheckFunc{
1931-
acc.TestCheckResourceAttrMig(isTPF, resourceName, "retain_backups_enabled", "true"),
1921+
acc.TestCheckResourceAttrMigTPF(isTPF, resourceName, "retain_backups_enabled", "true"),
19321922
}
19331923
additionalChecks = append(additionalChecks,
1934-
acc.TestCheckResourceAttrWithMig(isTPF, resourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
1935-
acc.TestCheckResourceAttrWithMig(isTPF, dataSourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)))
1924+
acc.TestCheckResourceAttrWithMigTPF(isTPF, resourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
1925+
acc.TestCheckResourceAttrWithMigTPF(isTPF, dataSourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)))
19361926

19371927
if checkDiskSizeGBInnerLevel {
19381928
additionalChecks = append(additionalChecks,
@@ -1944,7 +1934,7 @@ func checkReplicaSetAWSProvider(isTPF bool, projectID, name string, diskSizeGB,
19441934
}
19451935

19461936
if checkExternalID {
1947-
additionalChecks = append(additionalChecks, acc.TestCheckResourceAttrSetMig(isTPF, resourceName, "replication_specs.0.external_id"))
1937+
additionalChecks = append(additionalChecks, acc.TestCheckResourceAttrSetMigTPF(isTPF, resourceName, "replication_specs.0.external_id"))
19481938
}
19491939

19501940
return checkAggrMig(isTPF,
@@ -2093,14 +2083,14 @@ func configReplicaSetMultiCloud(t *testing.T, orgID, projectName, name string, u
20932083

20942084
func checkReplicaSetMultiCloud(isTPF bool, name string, regionConfigs int) resource.TestCheckFunc {
20952085
additionalChecks := []resource.TestCheckFunc{
2096-
acc.TestCheckResourceAttrMig(isTPF, resourceName, "retain_backups_enabled", "false"),
2097-
acc.TestCheckResourceAttrWithMig(isTPF, resourceName, "replication_specs.0.region_configs.#", acc.JSONEquals(strconv.Itoa(regionConfigs))),
2098-
acc.TestCheckResourceAttrSetMig(isTPF, resourceName, "replication_specs.0.external_id"),
2099-
acc.TestCheckResourceAttrWithMig(isTPF, dataSourceName, "replication_specs.0.region_configs.#", acc.JSONEquals(strconv.Itoa(regionConfigs))),
2100-
acc.TestCheckResourceAttrWithMig(isTPF, dataSourcePluralName, "results.0.replication_specs.0.region_configs.#", acc.JSONEquals(strconv.Itoa(regionConfigs))),
2101-
acc.TestCheckResourceAttrSetMig(isTPF, dataSourcePluralName, "results.#"),
2102-
acc.TestCheckResourceAttrSetMig(isTPF, dataSourcePluralName, "results.0.replication_specs.#"),
2103-
acc.TestCheckResourceAttrSetMig(isTPF, dataSourcePluralName, "results.0.name"),
2086+
acc.TestCheckResourceAttrMigTPF(isTPF, resourceName, "retain_backups_enabled", "false"),
2087+
acc.TestCheckResourceAttrWithMigTPF(isTPF, resourceName, "replication_specs.0.region_configs.#", acc.JSONEquals(strconv.Itoa(regionConfigs))),
2088+
acc.TestCheckResourceAttrSetMigTPF(isTPF, resourceName, "replication_specs.0.external_id"),
2089+
acc.TestCheckResourceAttrWithMigTPF(isTPF, dataSourceName, "replication_specs.0.region_configs.#", acc.JSONEquals(strconv.Itoa(regionConfigs))),
2090+
acc.TestCheckResourceAttrWithMigTPF(isTPF, dataSourcePluralName, "results.0.replication_specs.0.region_configs.#", acc.JSONEquals(strconv.Itoa(regionConfigs))),
2091+
acc.TestCheckResourceAttrSetMigTPF(isTPF, dataSourcePluralName, "results.#"),
2092+
acc.TestCheckResourceAttrSetMigTPF(isTPF, dataSourcePluralName, "results.0.replication_specs.#"),
2093+
acc.TestCheckResourceAttrSetMigTPF(isTPF, dataSourcePluralName, "results.0.name"),
21042094
}
21052095
return checkAggrMig(isTPF,
21062096
[]string{"project_id", "replication_specs.#", "replication_specs.0.id"},
@@ -2202,24 +2192,24 @@ func configShardedOldSchemaMultiCloud(t *testing.T, projectID, name string, numS
22022192

22032193
func checkShardedOldSchemaMultiCloud(isTPF bool, name string, numShards int, analyticsSize string, verifyExternalID bool, configServerManagementMode *string) resource.TestCheckFunc {
22042194
additionalChecks := []resource.TestCheckFunc{
2205-
acc.TestCheckResourceAttrWithMig(isTPF, resourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2206-
acc.TestCheckResourceAttrWithMig(isTPF, resourceName, "replication_specs.0.region_configs.0.analytics_specs.0.disk_iops", acc.IntGreatThan(0)),
2207-
acc.TestCheckResourceAttrWithMig(isTPF, resourceName, "replication_specs.0.region_configs.1.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2208-
acc.TestCheckResourceAttrWithMig(isTPF, dataSourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2209-
acc.TestCheckResourceAttrWithMig(isTPF, dataSourceName, "replication_specs.0.region_configs.0.analytics_specs.0.disk_iops", acc.IntGreatThan(0)),
2210-
acc.TestCheckResourceAttrWithMig(isTPF, dataSourceName, "replication_specs.0.region_configs.1.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2195+
acc.TestCheckResourceAttrWithMigTPF(isTPF, resourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2196+
acc.TestCheckResourceAttrWithMigTPF(isTPF, resourceName, "replication_specs.0.region_configs.0.analytics_specs.0.disk_iops", acc.IntGreatThan(0)),
2197+
acc.TestCheckResourceAttrWithMigTPF(isTPF, resourceName, "replication_specs.0.region_configs.1.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2198+
acc.TestCheckResourceAttrWithMigTPF(isTPF, dataSourceName, "replication_specs.0.region_configs.0.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
2199+
acc.TestCheckResourceAttrWithMigTPF(isTPF, dataSourceName, "replication_specs.0.region_configs.0.analytics_specs.0.disk_iops", acc.IntGreatThan(0)),
2200+
acc.TestCheckResourceAttrWithMigTPF(isTPF, dataSourceName, "replication_specs.0.region_configs.1.electable_specs.0.disk_iops", acc.IntGreatThan(0)),
22112201
}
22122202
if verifyExternalID {
22132203
additionalChecks = append(
22142204
additionalChecks,
2215-
acc.TestCheckResourceAttrSetMig(isTPF, resourceName, "replication_specs.0.external_id"))
2205+
acc.TestCheckResourceAttrSetMigTPF(isTPF, resourceName, "replication_specs.0.external_id"))
22162206
}
22172207
if configServerManagementMode != nil {
22182208
additionalChecks = append(additionalChecks,
2219-
acc.TestCheckResourceAttrMig(isTPF, resourceName, "config_server_management_mode", *configServerManagementMode),
2220-
acc.TestCheckResourceAttrSetMig(isTPF, resourceName, "config_server_type"),
2221-
acc.TestCheckResourceAttrMig(isTPF, dataSourceName, "config_server_management_mode", *configServerManagementMode),
2222-
acc.TestCheckResourceAttrSetMig(isTPF, dataSourceName, "config_server_type"),
2209+
acc.TestCheckResourceAttrMigTPF(isTPF, resourceName, "config_server_management_mode", *configServerManagementMode),
2210+
acc.TestCheckResourceAttrSetMigTPF(isTPF, resourceName, "config_server_type"),
2211+
acc.TestCheckResourceAttrMigTPF(isTPF, dataSourceName, "config_server_management_mode", *configServerManagementMode),
2212+
acc.TestCheckResourceAttrSetMigTPF(isTPF, dataSourceName, "config_server_type"),
22232213
)
22242214
}
22252215

@@ -2648,14 +2638,14 @@ func configGeoShardedOldSchema(t *testing.T, projectID, name string, numShardsFi
26482638
func checkAggrMig(isTPF bool, attrsSet []string, attrsMap map[string]string, extra ...resource.TestCheckFunc) resource.TestCheckFunc {
26492639
extraChecks := extra
26502640
extraChecks = append(extraChecks, acc.CheckExistsCluster(resourceName))
2651-
return acc.CheckRSAndDSPreviewProviderV2(isTPF, resourceName, admin.PtrString(dataSourceName), nil, attrsSet, attrsMap, extraChecks...)
2641+
return acc.CheckRSAndDSMigTPF(isTPF, resourceName, admin.PtrString(dataSourceName), nil, attrsSet, attrsMap, extraChecks...)
26522642
}
26532643

26542644
func checkGeoShardedOldSchema(isTPF bool, name string, numShardsFirstZone, numShardsSecondZone int, isLatestProviderVersion, verifyExternalID bool) resource.TestCheckFunc {
26552645
additionalChecks := []resource.TestCheckFunc{}
26562646

26572647
if verifyExternalID {
2658-
additionalChecks = append(additionalChecks, acc.TestCheckResourceAttrSetMig(isTPF, resourceName, "replication_specs.0.external_id"))
2648+
additionalChecks = append(additionalChecks, acc.TestCheckResourceAttrSetMigTPF(isTPF, resourceName, "replication_specs.0.external_id"))
26592649
}
26602650

26612651
if isLatestProviderVersion { // checks that will not apply if doing migration test with older version
@@ -2949,22 +2939,22 @@ func checkShardedNewSchema(isTPF bool, diskSizeGB int, firstInstanceSize, lastIn
29492939
}
29502940

29512941
// plural data source checks
2952-
pluralChecks := acc.AddAttrSetChecksPreviewProviderV2(isTPF, dataSourcePluralName, nil,
2942+
pluralChecks := acc.AddAttrSetChecksMigTPF(isTPF, dataSourcePluralName, nil,
29532943
[]string{"results.#", "results.0.replication_specs.#", "results.0.replication_specs.0.region_configs.#", "results.0.name", "results.0.termination_protection_enabled", "results.0.global_cluster_self_managed_sharding"}...)
29542944

2955-
pluralChecks = acc.AddAttrChecksPrefixPreviewProviderV2(isTPF, dataSourcePluralName, pluralChecks, clusterChecks, "results.0")
2945+
pluralChecks = acc.AddAttrChecksPrefixMigTPF(isTPF, dataSourcePluralName, pluralChecks, clusterChecks, "results.0")
29562946
if isAsymmetricCluster {
29572947
pluralChecks = append(pluralChecks, checkAggrMig(isTPF, []string{}, map[string]string{
29582948
"replication_specs.0.id": "",
29592949
"replication_specs.1.id": "",
29602950
}))
2961-
pluralChecks = acc.AddAttrChecksMig(isTPF, dataSourcePluralName, pluralChecks, map[string]string{
2951+
pluralChecks = acc.AddAttrChecksMigTPF(isTPF, dataSourcePluralName, pluralChecks, map[string]string{
29622952
"results.0.replication_specs.0.id": "",
29632953
"results.0.replication_specs.1.id": "",
29642954
})
29652955
} else {
29662956
pluralChecks = append(pluralChecks, checkAggrMig(isTPF, []string{"replication_specs.0.id", "replication_specs.1.id"}, map[string]string{}))
2967-
pluralChecks = acc.AddAttrSetChecksPreviewProviderV2(isTPF, dataSourcePluralName, pluralChecks, "results.0.replication_specs.0.id", "results.0.replication_specs.1.id")
2957+
pluralChecks = acc.AddAttrSetChecksMigTPF(isTPF, dataSourcePluralName, pluralChecks, "results.0.replication_specs.0.id", "results.0.replication_specs.1.id")
29682958
}
29692959
return checkAggrMig(isTPF,
29702960
[]string{"replication_specs.0.external_id", "replication_specs.0.zone_id", "replication_specs.1.external_id", "replication_specs.1.zone_id"},

0 commit comments

Comments
 (0)