Skip to content

Commit 391a3f8

Browse files
authored
chore: Makes test checks valid for SDKv2 and TPF (#2882)
* enable data source tests removing calls to AdvancedClusterV2Schema * schemav2 helper check funcs * skip data sources checks in tpf * rename funcs to use schemav2 naming * implement check funcs for schema v2 * testCheckFuncAlwaysPass * move ConvertAdvancedClusterToSchemaV2 to config funcs
1 parent d5e162a commit 391a3f8

File tree

6 files changed

+420
-397
lines changed

6 files changed

+420
-397
lines changed

internal/service/advancedcluster/resource_advanced_cluster_migration_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ func TestMigAdvancedCluster_replicaSetAWSProviderUpdate(t *testing.T) {
6464
Steps: []resource.TestStep{
6565
{
6666
ExternalProviders: acc.ExternalProviders(versionBeforeISSRelease),
67-
Config: configReplicaSetAWSProvider(projectID, clusterName, 60, 3),
68-
Check: checkReplicaSetAWSProvider(projectID, clusterName, 60, 3, false, false),
67+
Config: configReplicaSetAWSProvider(t, false, projectID, clusterName, 60, 3),
68+
Check: checkReplicaSetAWSProvider(false, projectID, clusterName, 60, 3, false, false),
6969
},
7070
{
7171
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
72-
Config: configReplicaSetAWSProvider(projectID, clusterName, 60, 5),
73-
Check: checkReplicaSetAWSProvider(projectID, clusterName, 60, 5, true, true),
72+
Config: configReplicaSetAWSProvider(t, false, projectID, clusterName, 60, 5),
73+
Check: checkReplicaSetAWSProvider(false, projectID, clusterName, 60, 5, true, true),
7474
},
7575
},
7676
})
@@ -90,13 +90,13 @@ func TestMigAdvancedCluster_geoShardedOldSchemaUpdate(t *testing.T) {
9090
Steps: []resource.TestStep{
9191
{
9292
ExternalProviders: acc.ExternalProviders(versionBeforeISSRelease),
93-
Config: configGeoShardedOldSchema(orgID, projectName, clusterName, 2, 2, false),
94-
Check: checkGeoShardedOldSchema(clusterName, 2, 2, false, false),
93+
Config: configGeoShardedOldSchema(t, false, orgID, projectName, clusterName, 2, 2, false),
94+
Check: checkGeoShardedOldSchema(false, clusterName, 2, 2, false, false),
9595
},
9696
{
9797
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
98-
Config: configGeoShardedOldSchema(orgID, projectName, clusterName, 2, 1, false),
99-
Check: checkGeoShardedOldSchema(clusterName, 2, 1, true, false),
98+
Config: configGeoShardedOldSchema(t, false, orgID, projectName, clusterName, 2, 1, false),
99+
Check: checkGeoShardedOldSchema(false, clusterName, 2, 1, true, false),
100100
},
101101
},
102102
})
@@ -116,13 +116,13 @@ func TestMigAdvancedCluster_shardedMigrationFromOldToNewSchema(t *testing.T) {
116116
Steps: []resource.TestStep{
117117
{
118118
ExternalProviders: acc.ExternalProviders(versionBeforeISSRelease),
119-
Config: configShardedTransitionOldToNewSchema(orgID, projectName, clusterName, false),
120-
Check: checkShardedTransitionOldToNewSchema(false),
119+
Config: configShardedTransitionOldToNewSchema(t, false, orgID, projectName, clusterName, false),
120+
Check: checkShardedTransitionOldToNewSchema(false, false),
121121
},
122122
{
123123
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
124-
Config: configShardedTransitionOldToNewSchema(orgID, projectName, clusterName, true),
125-
Check: checkShardedTransitionOldToNewSchema(true),
124+
Config: configShardedTransitionOldToNewSchema(t, false, orgID, projectName, clusterName, true),
125+
Check: checkShardedTransitionOldToNewSchema(false, true),
126126
},
127127
},
128128
})
@@ -142,13 +142,13 @@ func TestMigAdvancedCluster_geoShardedMigrationFromOldToNewSchema(t *testing.T)
142142
Steps: []resource.TestStep{
143143
{
144144
ExternalProviders: acc.ExternalProviders(versionBeforeISSRelease),
145-
Config: configGeoShardedTransitionOldToNewSchema(orgID, projectName, clusterName, false),
146-
Check: checkGeoShardedTransitionOldToNewSchema(false),
145+
Config: configGeoShardedTransitionOldToNewSchema(t, false, orgID, projectName, clusterName, false),
146+
Check: checkGeoShardedTransitionOldToNewSchema(false, false),
147147
},
148148
{
149149
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
150-
Config: configGeoShardedTransitionOldToNewSchema(orgID, projectName, clusterName, true),
151-
Check: checkGeoShardedTransitionOldToNewSchema(true),
150+
Config: configGeoShardedTransitionOldToNewSchema(t, false, orgID, projectName, clusterName, true),
151+
Check: checkGeoShardedTransitionOldToNewSchema(false, true),
152152
},
153153
},
154154
})

0 commit comments

Comments
 (0)