Skip to content

Commit fa31ccf

Browse files
EspenAlbertlantoli
EspenAlbert
and
lantoli
authored
test: Refactors GetClusterInfo (#2426)
* test: support creating a datasource when using GetClusterInfo * test: Add documentation for cluster methods * refactor: move out config_cluster to its own file * refactor: move configClusterGlobal to the only usage file * refactor: remove ProjectIDStr field * test: update references for cluster_info fields * chore: missing whitespace * test: fix missing quotes around projectID * Update internal/testutil/acc/cluster.go Co-authored-by: Leo Antoli <[email protected]> --------- Co-authored-by: Leo Antoli <[email protected]>
1 parent f9a1809 commit fa31ccf

22 files changed

+739
-667
lines changed

‎internal/service/backupcompliancepolicy/resource_backup_compliance_policy_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ func configOverwriteIncompatibleBackupPoliciesError(projectName, orgID, projectO
380380
retention_value = 1
381381
}
382382
}
383-
`, info.ClusterTerraformStr, info.ClusterResourceName)
383+
`, info.TerraformStr, info.ResourceName)
384384
}
385385

386386
func configClusterWithBackupSchedule(projectName, orgID, projectOwnerID string, info *acc.ClusterInfo) string {
@@ -402,7 +402,7 @@ func configClusterWithBackupSchedule(projectName, orgID, projectOwnerID string,
402402
should_copy_oplogs = false
403403
}
404404
}
405-
`, info.ClusterTerraformStr, info.ClusterResourceName)
405+
`, info.TerraformStr, info.ResourceName)
406406
}
407407

408408
func basicChecks() []resource.TestCheckFunc {

‎internal/service/cloudbackupschedule/resource_cloud_backup_schedule_migration_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func TestMigBackupRSCloudBackupSchedule_basic(t *testing.T) {
3030
Config: config,
3131
Check: resource.ComposeAggregateTestCheckFunc(
3232
checkExists(resourceName),
33-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
34-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
33+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
34+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
3535
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "0"),
3636
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "0"),
3737
resource.TestCheckResourceAttr(resourceName, "restore_window_days", "7"),

‎internal/service/cloudbackupschedule/resource_cloud_backup_schedule_test.go‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAccBackupRSCloudBackupSchedule_basic(t *testing.T) {
3636
}),
3737
Check: resource.ComposeAggregateTestCheckFunc(
3838
checkExists(resourceName),
39-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
39+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
4040
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "3"),
4141
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "45"),
4242
resource.TestCheckResourceAttr(resourceName, "restore_window_days", "4"),
@@ -45,7 +45,7 @@ func TestAccBackupRSCloudBackupSchedule_basic(t *testing.T) {
4545
resource.TestCheckResourceAttr(resourceName, "policy_item_weekly.#", "0"),
4646
resource.TestCheckResourceAttr(resourceName, "policy_item_monthly.#", "0"),
4747
resource.TestCheckResourceAttr(resourceName, "policy_item_yearly.#", "0"),
48-
resource.TestCheckResourceAttr(dataSourceName, "cluster_name", clusterInfo.ClusterName),
48+
resource.TestCheckResourceAttr(dataSourceName, "cluster_name", clusterInfo.Name),
4949
resource.TestCheckResourceAttrSet(dataSourceName, "reference_hour_of_day"),
5050
resource.TestCheckResourceAttrSet(dataSourceName, "reference_minute_of_hour"),
5151
resource.TestCheckResourceAttrSet(dataSourceName, "restore_window_days"),
@@ -64,7 +64,7 @@ func TestAccBackupRSCloudBackupSchedule_basic(t *testing.T) {
6464
}, true),
6565
Check: resource.ComposeAggregateTestCheckFunc(
6666
checkExists(resourceName),
67-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
67+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
6868
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "0"),
6969
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "0"),
7070
resource.TestCheckResourceAttr(resourceName, "restore_window_days", "7"),
@@ -93,7 +93,7 @@ func TestAccBackupRSCloudBackupSchedule_basic(t *testing.T) {
9393
resource.TestCheckResourceAttr(resourceName, "policy_item_yearly.0.frequency_interval", "1"),
9494
resource.TestCheckResourceAttr(resourceName, "policy_item_yearly.0.retention_unit", "years"),
9595
resource.TestCheckResourceAttr(resourceName, "policy_item_yearly.0.retention_value", "1"),
96-
resource.TestCheckResourceAttr(dataSourceName, "cluster_name", clusterInfo.ClusterName),
96+
resource.TestCheckResourceAttr(dataSourceName, "cluster_name", clusterInfo.Name),
9797
resource.TestCheckResourceAttrSet(dataSourceName, "reference_hour_of_day"),
9898
resource.TestCheckResourceAttrSet(dataSourceName, "reference_minute_of_hour"),
9999
resource.TestCheckResourceAttrSet(dataSourceName, "restore_window_days"),
@@ -107,7 +107,7 @@ func TestAccBackupRSCloudBackupSchedule_basic(t *testing.T) {
107107
}),
108108
Check: resource.ComposeAggregateTestCheckFunc(
109109
checkExists(resourceName),
110-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
110+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
111111
resource.TestCheckResourceAttr(resourceName, "auto_export_enabled", "false"),
112112
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "0"),
113113
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "0"),
@@ -167,7 +167,7 @@ func TestAccBackupRSCloudBackupSchedule_export(t *testing.T) {
167167
Config: configExportPolicies(&clusterInfo, policyName, roleName, bucketName),
168168
Check: resource.ComposeAggregateTestCheckFunc(
169169
checkExists(resourceName),
170-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
170+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
171171
resource.TestCheckResourceAttr(resourceName, "auto_export_enabled", "true"),
172172
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "20"),
173173
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "5"),
@@ -199,7 +199,7 @@ func TestAccBackupRSCloudBackupSchedule_onePolicy(t *testing.T) {
199199
}),
200200
Check: resource.ComposeAggregateTestCheckFunc(
201201
checkExists(resourceName),
202-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
202+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
203203
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "3"),
204204
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "45"),
205205
resource.TestCheckResourceAttr(resourceName, "restore_window_days", "4"),
@@ -233,7 +233,7 @@ func TestAccBackupRSCloudBackupSchedule_onePolicy(t *testing.T) {
233233
}),
234234
Check: resource.ComposeAggregateTestCheckFunc(
235235
checkExists(resourceName),
236-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
236+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
237237
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "0"),
238238
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "0"),
239239
resource.TestCheckResourceAttr(resourceName, "restore_window_days", "7"),
@@ -259,9 +259,9 @@ func TestAccBackupRSCloudBackupSchedule_copySettings(t *testing.T) {
259259
},
260260
PitEnabled: true, // you cannot copy oplogs when pit is not enabled
261261
})
262-
clusterName = clusterInfo.ClusterName
263-
terraformStr = clusterInfo.ClusterTerraformStr
264-
clusterResourceName = clusterInfo.ClusterResourceName
262+
clusterName = clusterInfo.Name
263+
terraformStr = clusterInfo.TerraformStr
264+
clusterResourceName = clusterInfo.ResourceName
265265
projectID = clusterInfo.ProjectID
266266
checkMap = map[string]string{
267267
"cluster_name": clusterName,
@@ -345,7 +345,7 @@ func TestAccBackupRSCloudBackupScheduleImport_basic(t *testing.T) {
345345
}),
346346
Check: resource.ComposeAggregateTestCheckFunc(
347347
checkExists(resourceName),
348-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
348+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
349349
resource.TestCheckResourceAttr(resourceName, "reference_hour_of_day", "3"),
350350
resource.TestCheckResourceAttr(resourceName, "reference_minute_of_hour", "45"),
351351
resource.TestCheckResourceAttr(resourceName, "restore_window_days", "4"),
@@ -400,7 +400,7 @@ func TestAccBackupRSCloudBackupSchedule_azure(t *testing.T) {
400400
}),
401401
Check: resource.ComposeAggregateTestCheckFunc(
402402
checkExists(resourceName),
403-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
403+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
404404
resource.TestCheckResourceAttr(resourceName, "policy_item_hourly.0.frequency_interval", "1"),
405405
resource.TestCheckResourceAttr(resourceName, "policy_item_hourly.0.retention_unit", "days"),
406406
resource.TestCheckResourceAttr(resourceName, "policy_item_hourly.0.retention_value", "1")),
@@ -413,7 +413,7 @@ func TestAccBackupRSCloudBackupSchedule_azure(t *testing.T) {
413413
}),
414414
Check: resource.ComposeAggregateTestCheckFunc(
415415
checkExists(resourceName),
416-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
416+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
417417
resource.TestCheckResourceAttr(resourceName, "policy_item_hourly.0.frequency_interval", "2"),
418418
resource.TestCheckResourceAttr(resourceName, "policy_item_hourly.0.retention_unit", "days"),
419419
resource.TestCheckResourceAttr(resourceName, "policy_item_hourly.0.retention_value", "3"),
@@ -473,10 +473,10 @@ func checkDestroy(s *terraform.State) error {
473473
}
474474

475475
func configNoPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule) string {
476-
return info.ClusterTerraformStr + fmt.Sprintf(`
476+
return info.TerraformStr + fmt.Sprintf(`
477477
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
478478
cluster_name = %[1]s
479-
project_id = %[2]s
479+
project_id = %[2]q
480480
481481
reference_hour_of_day = %[3]d
482482
reference_minute_of_hour = %[4]d
@@ -485,16 +485,16 @@ func configNoPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule
485485
486486
data "mongodbatlas_cloud_backup_schedule" "schedule_test" {
487487
cluster_name = %[1]s
488-
project_id = %[2]s
488+
project_id = %[2]q
489489
}
490-
`, info.ClusterNameStr, info.ProjectIDStr, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
490+
`, info.TerraformNameRef, info.ProjectID, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
491491
}
492492

493493
func configDefault(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule) string {
494-
return info.ClusterTerraformStr + fmt.Sprintf(`
494+
return info.TerraformStr + fmt.Sprintf(`
495495
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
496496
cluster_name = %[1]s
497-
project_id = %[2]s
497+
project_id = %[2]q
498498
499499
reference_hour_of_day = %[3]d
500500
reference_minute_of_hour = %[4]d
@@ -529,9 +529,9 @@ func configDefault(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule) s
529529
530530
data "mongodbatlas_cloud_backup_schedule" "schedule_test" {
531531
cluster_name = %[1]s
532-
project_id = %[2]s
532+
project_id = %[2]q
533533
}
534-
`, info.ClusterNameStr, info.ProjectIDStr, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
534+
`, info.TerraformNameRef, info.ProjectID, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
535535
}
536536

537537
func configCopySettings(terraformStr, projectID, clusterResourceName string, emptyCopySettings bool, p *admin.DiskBackupSnapshotSchedule) string {
@@ -592,10 +592,10 @@ func configCopySettings(terraformStr, projectID, clusterResourceName string, emp
592592
}
593593

594594
func configOnePolicy(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule) string {
595-
return info.ClusterTerraformStr + fmt.Sprintf(`
595+
return info.TerraformStr + fmt.Sprintf(`
596596
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
597597
cluster_name = %[1]s
598-
project_id = %[2]s
598+
project_id = %[2]q
599599
600600
reference_hour_of_day = %[3]d
601601
reference_minute_of_hour = %[4]d
@@ -607,7 +607,7 @@ func configOnePolicy(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule)
607607
retention_value = 1
608608
}
609609
}
610-
`, info.ClusterNameStr, info.ProjectIDStr, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
610+
`, info.TerraformNameRef, info.ProjectID, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
611611
}
612612

613613
func configNewPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule, useYearly bool) string {
@@ -622,10 +622,10 @@ func configNewPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedul
622622
`
623623
}
624624

625-
return info.ClusterTerraformStr + fmt.Sprintf(`
625+
return info.TerraformStr + fmt.Sprintf(`
626626
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
627627
cluster_name = %[1]s
628-
project_id = %[2]s
628+
project_id = %[2]q
629629
630630
reference_hour_of_day = %[3]d
631631
reference_minute_of_hour = %[4]d
@@ -656,16 +656,16 @@ func configNewPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedul
656656
657657
data "mongodbatlas_cloud_backup_schedule" "schedule_test" {
658658
cluster_name = %[1]s
659-
project_id = %[2]s
659+
project_id = %[2]q
660660
}
661-
`, info.ClusterNameStr, info.ProjectIDStr, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays(), strYearly)
661+
`, info.TerraformNameRef, info.ProjectID, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays(), strYearly)
662662
}
663663

664664
func configAzure(info *acc.ClusterInfo, policy *admin.DiskBackupApiPolicyItem) string {
665-
return info.ClusterTerraformStr + fmt.Sprintf(`
665+
return info.TerraformStr + fmt.Sprintf(`
666666
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
667667
cluster_name = %[1]s
668-
project_id = %[2]s
668+
project_id = %[2]q
669669
670670
policy_item_hourly {
671671
frequency_interval = %[3]d
@@ -676,16 +676,16 @@ func configAzure(info *acc.ClusterInfo, policy *admin.DiskBackupApiPolicyItem) s
676676
677677
data "mongodbatlas_cloud_backup_schedule" "schedule_test" {
678678
cluster_name = %[1]s
679-
project_id = %[2]s
679+
project_id = %[2]q
680680
}
681-
`, info.ClusterNameStr, info.ProjectIDStr, policy.GetFrequencyInterval(), policy.GetRetentionUnit(), policy.GetRetentionValue())
681+
`, info.TerraformNameRef, info.ProjectID, policy.GetFrequencyInterval(), policy.GetRetentionUnit(), policy.GetRetentionValue())
682682
}
683683

684684
func configAdvancedPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSchedule) string {
685-
return info.ClusterTerraformStr + fmt.Sprintf(`
685+
return info.TerraformStr + fmt.Sprintf(`
686686
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
687687
cluster_name = %[1]s
688-
project_id = %[2]s
688+
project_id = %[2]q
689689
690690
auto_export_enabled = false
691691
reference_hour_of_day = %[3]d
@@ -728,14 +728,14 @@ func configAdvancedPolicies(info *acc.ClusterInfo, p *admin.DiskBackupSnapshotSc
728728
retention_value = 1
729729
}
730730
}
731-
`, info.ClusterNameStr, info.ProjectIDStr, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
731+
`, info.TerraformNameRef, info.ProjectID, p.GetReferenceHourOfDay(), p.GetReferenceMinuteOfHour(), p.GetRestoreWindowDays())
732732
}
733733

734734
func configExportPolicies(info *acc.ClusterInfo, policyName, roleName, bucketName string) string {
735-
return info.ClusterTerraformStr + fmt.Sprintf(`
735+
return info.TerraformStr + fmt.Sprintf(`
736736
resource "mongodbatlas_cloud_backup_schedule" "schedule_test" {
737737
cluster_name = %[1]s
738-
project_id = %[2]s
738+
project_id = %[2]q
739739
auto_export_enabled = true
740740
reference_hour_of_day = 20
741741
reference_minute_of_hour = "05"
@@ -775,20 +775,20 @@ func configExportPolicies(info *acc.ClusterInfo, policyName, roleName, bucketNam
775775
}
776776
777777
resource "mongodbatlas_cloud_provider_access_setup" "setup_only" {
778-
project_id = %[2]s
778+
project_id = %[2]q
779779
provider_name = "AWS"
780780
}
781781
782782
resource "mongodbatlas_cloud_provider_access_authorization" "auth_role" {
783-
project_id = %[2]s
783+
project_id = %[2]q
784784
role_id = mongodbatlas_cloud_provider_access_setup.setup_only.role_id
785785
aws {
786786
iam_assumed_role_arn = aws_iam_role.test_role.arn
787787
}
788788
}
789789
790790
resource "mongodbatlas_cloud_backup_snapshot_export_bucket" "test" {
791-
project_id = %[2]s
791+
project_id = %[2]q
792792
iam_role_id = mongodbatlas_cloud_provider_access_authorization.auth_role.role_id
793793
bucket_name = aws_s3_bucket.backup.bucket
794794
cloud_provider = "AWS"
@@ -837,7 +837,7 @@ func configExportPolicies(info *acc.ClusterInfo, policyName, roleName, bucketNam
837837
}
838838
EOF
839839
}
840-
`, info.ClusterNameStr, info.ProjectIDStr, policyName, roleName, bucketName)
840+
`, info.TerraformNameRef, info.ProjectID, policyName, roleName, bucketName)
841841
}
842842

843843
func importStateIDFunc(resourceName string) resource.ImportStateIdFunc {

‎internal/service/cloudbackupsnapshot/resource_cloud_backup_snapshot_migration_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func TestMigBackupRSCloudBackupSnapshot_basic(t *testing.T) {
2929
resource.TestCheckResourceAttr(resourceName, "type", "replicaSet"),
3030
resource.TestCheckResourceAttr(resourceName, "members.#", "0"),
3131
resource.TestCheckResourceAttr(resourceName, "snapshot_ids.#", "0"),
32-
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.ClusterName),
33-
resource.TestCheckResourceAttr(resourceName, "replica_set_name", clusterInfo.ClusterName),
32+
resource.TestCheckResourceAttr(resourceName, "cluster_name", clusterInfo.Name),
33+
resource.TestCheckResourceAttr(resourceName, "replica_set_name", clusterInfo.Name),
3434
resource.TestCheckResourceAttr(resourceName, "cloud_provider", "AWS"),
3535
resource.TestCheckResourceAttr(resourceName, "description", description),
3636
resource.TestCheckResourceAttr(resourceName, "retention_in_days", retentionInDays),

0 commit comments

Comments
 (0)